Commit 8a86b00a authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-next-5.5-2019-11-01' of git://people.freedesktop.org/~agd5f/linux into drm-next 



drm-next-5.5-2019-11-01:

amdgpu:
- Add EEPROM support for Arcturus
- Enable VCN encode support for Arcturus
- Misc PSP fixes
- Misc DC fixes
- swSMU cleanup

amdkfd:
- Misc cleanups
- Fix typo in cu bitmap parsing

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Alex Deucher <alexdeucher@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191101190607.3763-1-alexander.deucher@amd.com
parents 2ef4144d 5ab5e4e6

drivers/gpu/drm/amd/amdgpu/amdgpu.h

+3 −2
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ struct amdgpu_mgpu_info 
	uint32_t			num_apu;

};



#define AMDGPU_MAX_TIMEOUT_PARAM_LENTH	256

#define AMDGPU_MAX_TIMEOUT_PARAM_LENGTH	256



/*

 * Modules parameters.
@@ -125,7 +125,7 @@ extern int amdgpu_disp_priority; 
extern int amdgpu_hw_i2c;

extern int amdgpu_pcie_gen2;

extern int amdgpu_msi;

extern char amdgpu_lockup_timeout[AMDGPU_MAX_TIMEOUT_PARAM_LENTH];

extern char amdgpu_lockup_timeout[AMDGPU_MAX_TIMEOUT_PARAM_LENGTH];

extern int amdgpu_dpm;

extern int amdgpu_fw_load_type;

extern int amdgpu_aspm;
@@ -139,6 +139,7 @@ extern int amdgpu_vm_fragment_size; 
extern int amdgpu_vm_fault_stop;

extern int amdgpu_vm_debug;

extern int amdgpu_vm_update_mode;

extern int amdgpu_exp_hw_support;

extern int amdgpu_dc;

extern int amdgpu_sched_jobs;

extern int amdgpu_sched_hw_submission;

drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c

+0 −8
Original line number Diff line number Diff line
@@ -130,14 +130,6 @@ void amdgpu_amdkfd_device_init(struct amdgpu_device *adev) 
				  adev->gfx.mec.queue_bitmap,

				  KGD_MAX_QUEUES);



		/* remove the KIQ bit as well */

		if (adev->gfx.kiq.ring.sched.ready)

			clear_bit(amdgpu_gfx_mec_queue_to_bit(adev,

							  adev->gfx.kiq.ring.me - 1,

							  adev->gfx.kiq.ring.pipe,

							  adev->gfx.kiq.ring.queue),

				  gpu_resources.queue_bitmap);



		/* According to linux/bitmap.h we shouldn't use bitmap_clear if

		 * nbits is not compile time constant

		 */

drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c

+0 −4
Original line number Diff line number Diff line
@@ -19,10 +19,6 @@ 
 * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

 * OTHER DEALINGS IN THE SOFTWARE.

 */



#undef pr_fmt

#define pr_fmt(fmt) "kfd2kgd: " fmt



#include <linux/module.h>

#include <linux/fdtable.h>

#include <linux/uaccess.h>

drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c

+0 −3
Original line number Diff line number Diff line
@@ -19,9 +19,6 @@ 
 * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

 * OTHER DEALINGS IN THE SOFTWARE.

 */

#undef pr_fmt

#define pr_fmt(fmt) "kfd2kgd: " fmt



#include <linux/mmu_context.h>

#include "amdgpu.h"

#include "amdgpu_amdkfd.h"

drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c

+0 −3
Original line number Diff line number Diff line
@@ -19,9 +19,6 @@ 
 * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

 * OTHER DEALINGS IN THE SOFTWARE.

 */



#define pr_fmt(fmt) "kfd2kgd: " fmt



#include <linux/mmu_context.h>



#include "amdgpu.h"

CRA Git | Maintained and supported by SUSTech CRA and CCSE