Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4fcb7f8b authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'drm-fixes-4.19' of git://people.freedesktop.org/~agd5f/linux into drm-fixes 



A few fixes for 4.19:
- Add a new polaris pci id
- KFD fixes for raven and gfx7

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Alex Deucher <alexdeucher@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180920155850.5455-1-alexander.deucher@amd.com
parents 618cc151 44d8cc6f

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

+5 −1
Original line number Diff line number Diff line
@@ -272,7 +272,7 @@ void amdgpu_amdkfd_gpu_reset(struct kgd_dev *kgd) 


int alloc_gtt_mem(struct kgd_dev *kgd, size_t size,

			void **mem_obj, uint64_t *gpu_addr,

			void **cpu_ptr)

			void **cpu_ptr, bool mqd_gfx9)

{

	struct amdgpu_device *adev = (struct amdgpu_device *)kgd;

	struct amdgpu_bo *bo = NULL;
@@ -287,6 +287,10 @@ int alloc_gtt_mem(struct kgd_dev *kgd, size_t size, 
	bp.flags = AMDGPU_GEM_CREATE_CPU_GTT_USWC;

	bp.type = ttm_bo_type_kernel;

	bp.resv = NULL;



	if (mqd_gfx9)

		bp.flags |= AMDGPU_GEM_CREATE_MQD_GFX9;



	r = amdgpu_bo_create(adev, &bp, &bo);

	if (r) {

		dev_err(adev->dev,

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

+1 −1
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ void amdgpu_amdkfd_gpu_reset(struct kgd_dev *kgd); 
/* Shared API */

int alloc_gtt_mem(struct kgd_dev *kgd, size_t size,

			void **mem_obj, uint64_t *gpu_addr,

			void **cpu_ptr);

			void **cpu_ptr, bool mqd_gfx9);

void free_gtt_mem(struct kgd_dev *kgd, void *mem_obj);

void get_local_mem_info(struct kgd_dev *kgd,

			struct kfd_local_mem_info *mem_info);

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

+1 −1
Original line number Diff line number Diff line
@@ -685,7 +685,7 @@ static int kgd_hqd_sdma_destroy(struct kgd_dev *kgd, void *mqd, 


	while (true) {

		temp = RREG32(sdma_base_addr + mmSDMA0_RLC0_CONTEXT_STATUS);

		if (temp & SDMA0_STATUS_REG__RB_CMD_IDLE__SHIFT)

		if (temp & SDMA0_RLC0_CONTEXT_STATUS__IDLE_MASK)

			break;

		if (time_after(jiffies, end_jiffies))

			return -ETIME;

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

+8 −6
Original line number Diff line number Diff line
@@ -367,12 +367,14 @@ static int amdgpu_cgs_get_firmware_info(struct cgs_device *cgs_device, 
				break;

			case CHIP_POLARIS10:

				if (type == CGS_UCODE_ID_SMU) {

					if ((adev->pdev->device == 0x67df) &&

					if (((adev->pdev->device == 0x67df) &&

					     ((adev->pdev->revision == 0xe0) ||

					      (adev->pdev->revision == 0xe3) ||

					      (adev->pdev->revision == 0xe4) ||

					      (adev->pdev->revision == 0xe5) ||

					      (adev->pdev->revision == 0xe7) ||

					      (adev->pdev->revision == 0xef))) ||

					    ((adev->pdev->device == 0x6fdf) &&

					     (adev->pdev->revision == 0xef))) {

						info->is_kicker = true;

						strcpy(fw_name, "amdgpu/polaris10_k_smc.bin");

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

+1 −0
Original line number Diff line number Diff line
@@ -740,6 +740,7 @@ static const struct pci_device_id pciidlist[] = { 
	{0x1002, 0x67CA, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_POLARIS10},

	{0x1002, 0x67CC, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_POLARIS10},

	{0x1002, 0x67CF, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_POLARIS10},

	{0x1002, 0x6FDF, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_POLARIS10},

	/* Polaris12 */

	{0x1002, 0x6980, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_POLARIS12},

	{0x1002, 0x6981, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_POLARIS12},