Skip to content

Commit bb61cf4

Browse files
airliedairlied
committed
Merge tag 'amd-drm-fixes-6.10-2024-05-30' of https://gitlab.freedesktop.org/agd5f/linux into drm-fixes
amd-drm-fixes-6.10-2024-05-30: amdgpu: - RAS fix - Fix colorspace property for MST connectors - Fix for PCIe DPM - Silence UBSAN warning - GPUVM robustness fix - Partition fix - Drop deprecated I2C_CLASS_SPD amdkfd: - Revert unused changes for certain 11.0.3 devices - Simplify APU VRAM handling Signed-off-by: Dave Airlie <airlied@redhat.com> From: Alex Deucher <alexander.deucher@amd.com> Link: https://patchwork.freedesktop.org/patch/msgid/20240530202316.2246826-1-alexander.deucher@amd.com
2 parents c301c3d + 67c7d4f commit bb61cf4

File tree

12 files changed

+36
-35
lines changed

12 files changed

+36
-35
lines changed

‎drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ int amdgpu_amdkfd_reserve_mem_limit(struct amdgpu_device *adev,
196196
return -EINVAL;
197197

198198
vram_size = KFD_XCP_MEMORY_SIZE(adev, xcp_id);
199-
if (adev->gmc.is_app_apu || adev->flags & AMD_IS_APU) {
199+
if (adev->flags & AMD_IS_APU) {
200200
system_mem_needed = size;
201201
ttm_mem_needed = size;
202202
}
@@ -233,7 +233,7 @@ int amdgpu_amdkfd_reserve_mem_limit(struct amdgpu_device *adev,
233233
if (adev && xcp_id >= 0) {
234234
adev->kfd.vram_used[xcp_id] += vram_needed;
235235
adev->kfd.vram_used_aligned[xcp_id] +=
236-
(adev->gmc.is_app_apu || adev->flags & AMD_IS_APU) ?
236+
(adev->flags & AMD_IS_APU) ?
237237
vram_needed :
238238
ALIGN(vram_needed, VRAM_AVAILABLITY_ALIGN);
239239
}
@@ -261,7 +261,7 @@ void amdgpu_amdkfd_unreserve_mem_limit(struct amdgpu_device *adev,
261261

262262
if (adev) {
263263
adev->kfd.vram_used[xcp_id] -= size;
264-
if (adev->gmc.is_app_apu || adev->flags & AMD_IS_APU) {
264+
if (adev->flags & AMD_IS_APU) {
265265
adev->kfd.vram_used_aligned[xcp_id] -= size;
266266
kfd_mem_limit.system_mem_used -= size;
267267
kfd_mem_limit.ttm_mem_used -= size;
@@ -890,7 +890,7 @@ static int kfd_mem_attach(struct amdgpu_device *adev, struct kgd_mem *mem,
890890
* if peer device has large BAR. In contrast, access over xGMI is
891891
* allowed for both small and large BAR configurations of peer device
892892
*/
893-
if ((adev != bo_adev && !(adev->gmc.is_app_apu || adev->flags & AMD_IS_APU)) &&
893+
if ((adev != bo_adev && !(adev->flags & AMD_IS_APU)) &&
894894
((mem->domain == AMDGPU_GEM_DOMAIN_VRAM) ||
895895
(mem->alloc_flags & KFD_IOC_ALLOC_MEM_FLAGS_DOORBELL) ||
896896
(mem->alloc_flags & KFD_IOC_ALLOC_MEM_FLAGS_MMIO_REMAP))) {
@@ -1658,7 +1658,7 @@ size_t amdgpu_amdkfd_get_available_memory(struct amdgpu_device *adev,
16581658
- atomic64_read(&adev->vram_pin_size)
16591659
- reserved_for_pt;
16601660

1661-
if (adev->gmc.is_app_apu || adev->flags & AMD_IS_APU) {
1661+
if (adev->flags & AMD_IS_APU) {
16621662
system_mem_available = no_system_mem_limit ?
16631663
kfd_mem_limit.max_system_mem_limit :
16641664
kfd_mem_limit.max_system_mem_limit -
@@ -1706,7 +1706,7 @@ int amdgpu_amdkfd_gpuvm_alloc_memory_of_gpu(
17061706
if (flags & KFD_IOC_ALLOC_MEM_FLAGS_VRAM) {
17071707
domain = alloc_domain = AMDGPU_GEM_DOMAIN_VRAM;
17081708

1709-
if (adev->gmc.is_app_apu || adev->flags & AMD_IS_APU) {
1709+
if (adev->flags & AMD_IS_APU) {
17101710
domain = AMDGPU_GEM_DOMAIN_GTT;
17111711
alloc_domain = AMDGPU_GEM_DOMAIN_GTT;
17121712
alloc_flags = 0;
@@ -1953,7 +1953,7 @@ int amdgpu_amdkfd_gpuvm_free_memory_of_gpu(
19531953
if (size) {
19541954
if (!is_imported &&
19551955
(mem->bo->preferred_domains == AMDGPU_GEM_DOMAIN_VRAM ||
1956-
((adev->gmc.is_app_apu || adev->flags & AMD_IS_APU) &&
1956+
((adev->flags & AMD_IS_APU) &&
19571957
mem->bo->preferred_domains == AMDGPU_GEM_DOMAIN_GTT)))
19581958
*size = bo_size;
19591959
else
@@ -2376,7 +2376,7 @@ static int import_obj_create(struct amdgpu_device *adev,
23762376
(*mem)->bo = bo;
23772377
(*mem)->va = va;
23782378
(*mem)->domain = (bo->preferred_domains & AMDGPU_GEM_DOMAIN_VRAM) &&
2379-
!(adev->gmc.is_app_apu || adev->flags & AMD_IS_APU) ?
2379+
!(adev->flags & AMD_IS_APU) ?
23802380
AMDGPU_GEM_DOMAIN_VRAM : AMDGPU_GEM_DOMAIN_GTT;
23812381

23822382
(*mem)->mapped_to_gpu_memory = 0;

‎drivers/gpu/drm/amd/amdgpu/amdgpu_device.c

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5944,13 +5944,18 @@ static void amdgpu_device_partner_bandwidth(struct amdgpu_device *adev,
59445944
*speed = PCI_SPEED_UNKNOWN;
59455945
*width = PCIE_LNK_WIDTH_UNKNOWN;
59465946

5947-
while ((parent = pci_upstream_bridge(parent))) {
5948-
/* skip upstream/downstream switches internal to dGPU*/
5949-
if (parent->vendor == PCI_VENDOR_ID_ATI)
5950-
continue;
5951-
*speed = pcie_get_speed_cap(parent);
5952-
*width = pcie_get_width_cap(parent);
5953-
break;
5947+
if (amdgpu_device_pcie_dynamic_switching_supported(adev)) {
5948+
while ((parent = pci_upstream_bridge(parent))) {
5949+
/* skip upstream/downstream switches internal to dGPU*/
5950+
if (parent->vendor == PCI_VENDOR_ID_ATI)
5951+
continue;
5952+
*speed = pcie_get_speed_cap(parent);
5953+
*width = pcie_get_width_cap(parent);
5954+
break;
5955+
}
5956+
} else {
5957+
/* use the current speeds rather than max if switching is not supported */
5958+
pcie_bandwidth_available(adev->pdev, NULL, speed, width);
59545959
}
59555960
}
59565961

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ struct amdgpu_iv_entry;
4646
#define AMDGPU_RAS_GPU_ERR_HBM_BIST_TEST(x) AMDGPU_GET_REG_FIELD(x, 7, 7)
4747
#define AMDGPU_RAS_GPU_ERR_SOCKET_ID(x) AMDGPU_GET_REG_FIELD(x, 10, 8)
4848
#define AMDGPU_RAS_GPU_ERR_AID_ID(x) AMDGPU_GET_REG_FIELD(x, 12, 11)
49-
#define AMDGPU_RAS_GPU_ERR_HBM_ID(x) AMDGPU_GET_REG_FIELD(x, 13, 13)
49+
#define AMDGPU_RAS_GPU_ERR_HBM_ID(x) AMDGPU_GET_REG_FIELD(x, 14, 13)
5050
#define AMDGPU_RAS_GPU_ERR_BOOT_STATUS(x) AMDGPU_GET_REG_FIELD(x, 31, 31)
5151

5252
#define AMDGPU_RAS_BOOT_STATUS_POLLING_LIMIT 1000

‎drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -706,11 +706,15 @@ int amdgpu_vm_pde_update(struct amdgpu_vm_update_params *params,
706706
struct amdgpu_vm_bo_base *entry)
707707
{
708708
struct amdgpu_vm_bo_base *parent = amdgpu_vm_pt_parent(entry);
709-
struct amdgpu_bo *bo = parent->bo, *pbo;
709+
struct amdgpu_bo *bo, *pbo;
710710
struct amdgpu_vm *vm = params->vm;
711711
uint64_t pde, pt, flags;
712712
unsigned int level;
713713

714+
if (WARN_ON(!parent))
715+
return -EINVAL;
716+
717+
bo = parent->bo;
714718
for (level = 0, pbo = bo->parent; pbo; ++level)
715719
pbo = pbo->parent;
716720

‎drivers/gpu/drm/amd/amdgpu/aqua_vanjaram.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -422,7 +422,7 @@ __aqua_vanjaram_get_auto_mode(struct amdgpu_xcp_mgr *xcp_mgr)
422422

423423
if (adev->gmc.num_mem_partitions == num_xcc / 2)
424424
return (adev->flags & AMD_IS_APU) ? AMDGPU_TPX_PARTITION_MODE :
425-
AMDGPU_QPX_PARTITION_MODE;
425+
AMDGPU_CPX_PARTITION_MODE;
426426

427427
if (adev->gmc.num_mem_partitions == 2 && !(adev->flags & AMD_IS_APU))
428428
return AMDGPU_DPX_PARTITION_MODE;

‎drivers/gpu/drm/amd/amdkfd/kfd_device.c

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -408,15 +408,8 @@ struct kfd_dev *kgd2kfd_probe(struct amdgpu_device *adev, bool vf)
408408
f2g = &gfx_v11_kfd2kgd;
409409
break;
410410
case IP_VERSION(11, 0, 3):
411-
if ((adev->pdev->device == 0x7460 &&
412-
adev->pdev->revision == 0x00) ||
413-
(adev->pdev->device == 0x7461 &&
414-
adev->pdev->revision == 0x00))
415-
/* Note: Compiler version is 11.0.5 while HW version is 11.0.3 */
416-
gfx_target_version = 110005;
417-
else
418-
/* Note: Compiler version is 11.0.1 while HW version is 11.0.3 */
419-
gfx_target_version = 110001;
411+
/* Note: Compiler version is 11.0.1 while HW version is 11.0.3 */
412+
gfx_target_version = 110001;
420413
f2g = &gfx_v11_kfd2kgd;
421414
break;
422415
case IP_VERSION(11, 5, 0):

‎drivers/gpu/drm/amd/amdkfd/kfd_migrate.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1023,7 +1023,7 @@ int kgd2kfd_init_zone_device(struct amdgpu_device *adev)
10231023
if (amdgpu_ip_version(adev, GC_HWIP, 0) < IP_VERSION(9, 0, 1))
10241024
return -EINVAL;
10251025

1026-
if (adev->gmc.is_app_apu || adev->flags & AMD_IS_APU)
1026+
if (adev->flags & AMD_IS_APU)
10271027
return 0;
10281028

10291029
pgmap = &kfddev->pgmap;

‎drivers/gpu/drm/amd/amdkfd/kfd_svm.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2619,8 +2619,7 @@ svm_range_best_restore_location(struct svm_range *prange,
26192619
return -1;
26202620
}
26212621

2622-
if (node->adev->gmc.is_app_apu ||
2623-
node->adev->flags & AMD_IS_APU)
2622+
if (node->adev->flags & AMD_IS_APU)
26242623
return 0;
26252624

26262625
if (prange->preferred_loc == gpuid ||
@@ -3338,8 +3337,7 @@ svm_range_best_prefetch_location(struct svm_range *prange)
33383337
goto out;
33393338
}
33403339

3341-
if (bo_node->adev->gmc.is_app_apu ||
3342-
bo_node->adev->flags & AMD_IS_APU) {
3340+
if (bo_node->adev->flags & AMD_IS_APU) {
33433341
best_loc = 0;
33443342
goto out;
33453343
}

‎drivers/gpu/drm/amd/amdkfd/kfd_svm.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,6 @@ void svm_range_list_lock_and_flush_work(struct svm_range_list *svms, struct mm_s
201201
* is initialized to not 0 when page migration register device memory.
202202
*/
203203
#define KFD_IS_SVM_API_SUPPORTED(adev) ((adev)->kfd.pgmap.type != 0 ||\
204-
(adev)->gmc.is_app_apu ||\
205204
((adev)->flags & AMD_IS_APU))
206205

207206
void svm_range_bo_unref_async(struct svm_range_bo *svm_bo);

‎drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -613,6 +613,9 @@ dm_dp_add_mst_connector(struct drm_dp_mst_topology_mgr *mgr,
613613
&connector->base,
614614
dev->mode_config.tile_property,
615615
0);
616+
connector->colorspace_property = master->base.colorspace_property;
617+
if (connector->colorspace_property)
618+
drm_connector_attach_colorspace_property(connector);
616619

617620
drm_connector_set_path_property(connector, pathprop);
618621

0 commit comments

Comments
 (0)