History

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

Dave Airlie committed 8 years ago

Commit 4fcb7f82 parents 618cc15 44d8cc611 files · +49 −18Browse files

Unified · Split

11 files
  1. drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c +5 −1
  2. drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h +1 −1
  3. drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c +1 −1
  4. drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c +8 −6
  5. drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +1 −0
  6. drivers/gpu/drm/amd/amdkfd/kfd_device.c +2 −1
  7. drivers/gpu/drm/amd/amdkfd/kfd_iommu.c +12 −1
  8. drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c +1 −1
  9. drivers/gpu/drm/amd/amdkfd/kfd_priv.h +1 −0
  10. drivers/gpu/drm/amd/amdkfd/kfd_topology.c +16 −5
  11. drivers/gpu/drm/amd/include/kgd_kfd_interface.h +1 −1
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c+5−1
@@ -272,7 +272,7 @@ void amdgpu_amdkfd_gpu_reset(struct kgd_dev *kgd) · 271 unmodified lines
272 272
273int alloc_gtt_mem(struct kgd_dev *kgd, size_t size,273int alloc_gtt_mem(struct kgd_dev *kgd, size_t size,
274 void **mem_obj, uint64_t *gpu_addr,274 void **mem_obj, uint64_t *gpu_addr,
275 void **cpu_ptr)275 void **cpu_ptr, bool mqd_gfx9)
276{276{
277 struct amdgpu_device *adev = (struct amdgpu_device *)kgd;277 struct amdgpu_device *adev = (struct amdgpu_device *)kgd;
278 struct amdgpu_bo *bo = NULL;278 struct amdgpu_bo *bo = NULL;
@@ -287,6 +287,10 @@ int alloc_gtt_mem(struct kgd_dev *kgd, size_t size, · 8 unmodified lines
287 bp.flags = AMDGPU_GEM_CREATE_CPU_GTT_USWC;287 bp.flags = AMDGPU_GEM_CREATE_CPU_GTT_USWC;
288 bp.type = ttm_bo_type_kernel;288 bp.type = ttm_bo_type_kernel;
289 bp.resv = NULL;289 bp.resv = NULL;
290
291 if (mqd_gfx9)
292 bp.flags |= AMDGPU_GEM_CREATE_MQD_GFX9;
293
290 r = amdgpu_bo_create(adev, &bp, &bo);294 r = amdgpu_bo_create(adev, &bp, &bo);
291 if (r) {295 if (r) {
292 dev_err(adev->dev,296 dev_err(adev->dev,
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h+1−1
@@ -136,7 +136,7 @@ void amdgpu_amdkfd_gpu_reset(struct kgd_dev *kgd); · 135 unmodified lines
136/* Shared API */136/* Shared API */
137int alloc_gtt_mem(struct kgd_dev *kgd, size_t size,137int alloc_gtt_mem(struct kgd_dev *kgd, size_t size,
138 void **mem_obj, uint64_t *gpu_addr,138 void **mem_obj, uint64_t *gpu_addr,
139 void **cpu_ptr);139 void **cpu_ptr, bool mqd_gfx9);
140void free_gtt_mem(struct kgd_dev *kgd, void *mem_obj);140void free_gtt_mem(struct kgd_dev *kgd, void *mem_obj);
141void get_local_mem_info(struct kgd_dev *kgd,141void get_local_mem_info(struct kgd_dev *kgd,
142 struct kfd_local_mem_info *mem_info);142 struct kfd_local_mem_info *mem_info);
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c+1−1
@@ -685,7 +685,7 @@ static int kgd_hqd_sdma_destroy(struct kgd_dev *kgd, void *mqd, · 684 unmodified lines
685 685
686 while (true) {686 while (true) {
687 temp = RREG32(sdma_base_addr + mmSDMA0_RLC0_CONTEXT_STATUS);687 temp = RREG32(sdma_base_addr + mmSDMA0_RLC0_CONTEXT_STATUS);
688 if (temp & SDMA0_STATUS_REG__RB_CMD_IDLE__SHIFT)688 if (temp & SDMA0_RLC0_CONTEXT_STATUS__IDLE_MASK)
689 break;689 break;
690 if (time_after(jiffies, end_jiffies))690 if (time_after(jiffies, end_jiffies))
691 return -ETIME;691 return -ETIME;
drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c+8−6
@@ -367,12 +367,14 @@ static int amdgpu_cgs_get_firmware_info(struct cgs_device *cgs_device, · 366 unmodified lines
367 break;367 break;
368 case CHIP_POLARIS10:368 case CHIP_POLARIS10:
369 if (type == CGS_UCODE_ID_SMU) {369 if (type == CGS_UCODE_ID_SMU) {
370 if ((adev->pdev->device == 0x67df) &&370 if (((adev->pdev->device == 0x67df) &&
371 ((adev->pdev->revision == 0xe0) ||371 ((adev->pdev->revision == 0xe0) ||
372 (adev->pdev->revision == 0xe3) ||372 (adev->pdev->revision == 0xe3) ||
373 (adev->pdev->revision == 0xe4) ||373 (adev->pdev->revision == 0xe4) ||
374 (adev->pdev->revision == 0xe5) ||374 (adev->pdev->revision == 0xe5) ||
375 (adev->pdev->revision == 0xe7) ||375 (adev->pdev->revision == 0xe7) ||
376 (adev->pdev->revision == 0xef))) ||
377 ((adev->pdev->device == 0x6fdf) &&
376 (adev->pdev->revision == 0xef))) {378 (adev->pdev->revision == 0xef))) {
377 info->is_kicker = true;379 info->is_kicker = true;
378 strcpy(fw_name, "amdgpu/polaris10_k_smc.bin");380 strcpy(fw_name, "amdgpu/polaris10_k_smc.bin");
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c+1−0
@@ -740,6 +740,7 @@ static const struct pci_device_id pciidlist[] = { · 739 unmodified lines
740 {0x1002, 0x67CA, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_POLARIS10},740 {0x1002, 0x67CA, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_POLARIS10},
741 {0x1002, 0x67CC, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_POLARIS10},741 {0x1002, 0x67CC, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_POLARIS10},
742 {0x1002, 0x67CF, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_POLARIS10},742 {0x1002, 0x67CF, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_POLARIS10},
743 {0x1002, 0x6FDF, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_POLARIS10},
743 /* Polaris12 */744 /* Polaris12 */
744 {0x1002, 0x6980, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_POLARIS12},745 {0x1002, 0x6980, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_POLARIS12},
745 {0x1002, 0x6981, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_POLARIS12},746 {0x1002, 0x6981, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_POLARIS12},
drivers/gpu/drm/amd/amdkfd/kfd_device.c+2−1
@@ -457,7 +457,8 @@ bool kgd2kfd_device_init(struct kfd_dev *kfd, · 456 unmodified lines
457 457
458 if (kfd->kfd2kgd->init_gtt_mem_allocation(458 if (kfd->kfd2kgd->init_gtt_mem_allocation(
459 kfd->kgd, size, &kfd->gtt_mem,459 kfd->kgd, size, &kfd->gtt_mem,
460 &kfd->gtt_start_gpu_addr, &kfd->gtt_start_cpu_ptr)){460 &kfd->gtt_start_gpu_addr, &kfd->gtt_start_cpu_ptr,
461 false)) {
461 dev_err(kfd_device, "Could not allocate %d bytes\n", size);462 dev_err(kfd_device, "Could not allocate %d bytes\n", size);
462 goto out;463 goto out;
463 }464 }
drivers/gpu/drm/amd/amdkfd/kfd_iommu.c+12−1
@@ -62,9 +62,20 @@ int kfd_iommu_device_init(struct kfd_dev *kfd) · 61 unmodified lines
62 struct amd_iommu_device_info iommu_info;62 struct amd_iommu_device_info iommu_info;
63 unsigned int pasid_limit;63 unsigned int pasid_limit;
64 int err;64 int err;
65 struct kfd_topology_device *top_dev;
65 66
66 if (!kfd->device_info->needs_iommu_device)67 top_dev = kfd_topology_device_by_id(kfd->id);
68
69 /*
70 * Overwrite ATS capability according to needs_iommu_device to fix
71 * potential missing corresponding bit in CRAT of BIOS.
72 */
73 if (!kfd->device_info->needs_iommu_device) {
74 top_dev->node_props.capability &= ~HSA_CAP_ATS_PRESENT;
67 return 0;75 return 0;
76 }
77
78 top_dev->node_props.capability |= HSA_CAP_ATS_PRESENT;
68 79
69 iommu_info.flags = 0;80 iommu_info.flags = 0;
70 err = amd_iommu_device_info(kfd->pdev, &iommu_info);81 err = amd_iommu_device_info(kfd->pdev, &iommu_info);
drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c+1−1
@@ -88,7 +88,7 @@ static int init_mqd(struct mqd_manager *mm, void **mqd, · 87 unmodified lines
88 ALIGN(sizeof(struct v9_mqd), PAGE_SIZE),88 ALIGN(sizeof(struct v9_mqd), PAGE_SIZE),
89 &((*mqd_mem_obj)->gtt_mem),89 &((*mqd_mem_obj)->gtt_mem),
90 &((*mqd_mem_obj)->gpu_addr),90 &((*mqd_mem_obj)->gpu_addr),
91 (void *)&((*mqd_mem_obj)->cpu_ptr));91 (void *)&((*mqd_mem_obj)->cpu_ptr), true);
92 } else92 } else
93 retval = kfd_gtt_sa_allocate(mm->dev, sizeof(struct v9_mqd),93 retval = kfd_gtt_sa_allocate(mm->dev, sizeof(struct v9_mqd),
94 mqd_mem_obj);94 mqd_mem_obj);
drivers/gpu/drm/amd/amdkfd/kfd_priv.h+1−0
@@ -806,6 +806,7 @@ int kfd_topology_add_device(struct kfd_dev *gpu); · 805 unmodified lines
806int kfd_topology_remove_device(struct kfd_dev *gpu);806int kfd_topology_remove_device(struct kfd_dev *gpu);
807struct kfd_topology_device *kfd_topology_device_by_proximity_domain(807struct kfd_topology_device *kfd_topology_device_by_proximity_domain(
808 uint32_t proximity_domain);808 uint32_t proximity_domain);
809struct kfd_topology_device *kfd_topology_device_by_id(uint32_t gpu_id);
809struct kfd_dev *kfd_device_by_id(uint32_t gpu_id);810struct kfd_dev *kfd_device_by_id(uint32_t gpu_id);
810struct kfd_dev *kfd_device_by_pci_dev(const struct pci_dev *pdev);811struct kfd_dev *kfd_device_by_pci_dev(const struct pci_dev *pdev);
811int kfd_topology_enum_kfd_devices(uint8_t idx, struct kfd_dev **kdev);812int kfd_topology_enum_kfd_devices(uint8_t idx, struct kfd_dev **kdev);
drivers/gpu/drm/amd/amdkfd/kfd_topology.c+16−5
@@ -63,22 +63,33 @@ struct kfd_topology_device *kfd_topology_device_by_proximity_domain( · 62 unmodified lines
63 return device;63 return device;
64}64}
65 65
66struct kfd_dev *kfd_device_by_id(uint32_t gpu_id)66struct kfd_topology_device *kfd_topology_device_by_id(uint32_t gpu_id)
67{67{
68 struct kfd_topology_device *top_dev;68 struct kfd_topology_device *top_dev = NULL;
69 struct kfd_dev *device = NULL;69 struct kfd_topology_device *ret = NULL;
70 70
71 down_read(&topology_lock);71 down_read(&topology_lock);
72 72
73 list_for_each_entry(top_dev, &topology_device_list, list)73 list_for_each_entry(top_dev, &topology_device_list, list)
74 if (top_dev->gpu_id == gpu_id) {74 if (top_dev->gpu_id == gpu_id) {
75 device = top_dev->gpu;75 ret = top_dev;
76 break;76 break;
77 }77 }
78 78
79 up_read(&topology_lock);79 up_read(&topology_lock);
80 80
81 return device;81 return ret;
82}
83
84struct kfd_dev *kfd_device_by_id(uint32_t gpu_id)
85{
86 struct kfd_topology_device *top_dev;
87
88 top_dev = kfd_topology_device_by_id(gpu_id);
89 if (!top_dev)
90 return NULL;
91
92 return top_dev->gpu;
82}93}
83 94
84struct kfd_dev *kfd_device_by_pci_dev(const struct pci_dev *pdev)95struct kfd_dev *kfd_device_by_pci_dev(const struct pci_dev *pdev)
drivers/gpu/drm/amd/include/kgd_kfd_interface.h+1−1
@@ -292,7 +292,7 @@ struct tile_config { · 291 unmodified lines
292struct kfd2kgd_calls {292struct kfd2kgd_calls {
293 int (*init_gtt_mem_allocation)(struct kgd_dev *kgd, size_t size,293 int (*init_gtt_mem_allocation)(struct kgd_dev *kgd, size_t size,
294 void **mem_obj, uint64_t *gpu_addr,294 void **mem_obj, uint64_t *gpu_addr,
295 void **cpu_ptr);295 void **cpu_ptr, bool mqd_gfx9);
296 296
297 void (*free_gtt_mem)(struct kgd_dev *kgd, void *mem_obj);297 void (*free_gtt_mem)(struct kgd_dev *kgd, void *mem_obj);
298 298

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t