Commit 478a5270 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'amd-drm-next-6.11-2024-07-12' of... 

Merge tag 'amd-drm-next-6.11-2024-07-12' of https://gitlab.freedesktop.org/agd5f/linux

 into drm-next

amd-drm-next-6.11-2024-07-12:

amdgpu:
- RAS fixes
- SMU fixes
- GC 12 updates
- SR-IOV fixes
- IH 7 updates
- DCC fixes
- GC 11.5 fixes
- DP MST fixes
- GFX 9.4.4 fixes
- SMU 14 updates
- Documentation updates
- MAINTAINERS updates
- PSR SU fix
- Misc small fixes

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Alex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240712171637.2581787-1-alexander.deucher@amd.com
parents c58c3916 1cff1010

Documentation/gpu/amdgpu/dgpu-asic-info-table.csv

+2 −2
Original line number Diff line number Diff line
@@ -15,8 +15,8 @@ Radeon (RX/Pro) 500 /540(X) /550 /640 /WX2100 /WX3100 /WX200 Series, POLARIS12, 
Radeon (RX|TM) (PRO|WX) Vega /MI25 /V320 /V340L /8200 /9100 /SSG MxGPU, VEGA10, DCE 12, 9.0.1, VCE 4.0.0 / UVD 7.0.0, 4.0.0

AMD Radeon (Pro) VII /MI50 /MI60, VEGA20, DCE 12, 9.4.0, VCE 4.1.0 / UVD 7.2.0, 4.2.0

MI100, ARCTURUS, *, 9.4.1, VCN 2.5.0, 4.2.2

MI200, ALDEBARAN, *, 9.4.2, VCN 2.6.0, 4.4.0

MI300, AQUA_VANGARAM, *, 9.4.3, VCN 4.0.3, 4.4.2

MI200 Series, ALDEBARAN, *, 9.4.2, VCN 2.6.0, 4.4.0

MI300 Series, AQUA_VANJARAM, *, 9.4.3, VCN 4.0.3, 4.4.2

AMD Radeon (RX|Pro) 5600(M|XT) /5700 (M|XT|XTB) /W5700, NAVI10, DCN 2.0.0, 10.1.10, VCN 2.0.0, 5.0.0

AMD Radeon (Pro) 5300 /5500XTB/5500(XT|M) /W5500M /W5500, NAVI14, DCN 2.0.0, 10.1.1, VCN 2.0.2, 5.0.2

AMD Radeon RX 6800(XT) /6900(XT) /W6800, SIENNA_CICHLID, DCN 3.0.0, 10.3.0, VCN 3.0.0, 5.2.0

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -1092,7 +1092,7 @@ F: Documentation/ABI/testing/sysfs-amd-pmf 
F:	drivers/platform/x86/amd/pmf/









AMD POWERPLAY AND SWSMU









M:	Evan Quan <evan.quan@amd.com>









M:	Kenneth Feng <kenneth.feng@amd.com>









L:	amd-gfx@lists.freedesktop.org









S:	Supported









T:	git https://gitlab.freedesktop.org/agd5f/linux.git








@@ -18656,7 +18656,7 @@ F:	drivers/net/wireless/quantenna







RADEON and AMDGPU DRM DRIVERS









M:	Alex Deucher <alexander.deucher@amd.com>









M:	Christian König <christian.koenig@amd.com>









M:	Pan, Xinhui <Xinhui.Pan@amd.com>









M:	Xinhui Pan <Xinhui.Pan@amd.com>









L:	amd-gfx@lists.freedesktop.org









S:	Supported









B:	https://gitlab.freedesktop.org/drm/amd/-/issues

























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



+0
−2






























Original line number
Diff line number
Diff line







@@ -316,8 +316,6 @@ static int aldebaran_mode2_restore_ip(struct amdgpu_device *adev)







		adev->ip_blocks[i].status.late_initialized = true;









	}



















	amdgpu_ras_set_error_query_ready(adev, true);



















	amdgpu_device_set_cg_state(adev, AMD_CG_STATE_GATE);









	amdgpu_device_set_pg_state(adev, AMD_PG_STATE_GATE);










































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



+1
−1






























Original line number
Diff line number
Diff line







@@ -119,7 +119,7 @@ static struct aca_regs_dump {







static void aca_smu_bank_dump(struct amdgpu_device *adev, int idx, int total, struct aca_bank *bank,









			      struct ras_query_context *qctx)









{









	u64 event_id = qctx ? qctx->event_id : 0ULL;









	u64 event_id = qctx ? qctx->evid.event_id : RAS_EVENT_INVALID_ID;









	int i;



















	RAS_EVENT_LOG(adev, event_id, HW_ERR "Accelerator Check Architecture events logged\n");
































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



+15
−0






























Original line number
Diff line number
Diff line







@@ -1093,6 +1093,21 @@ static int amdgpu_cs_vm_handling(struct amdgpu_cs_parser *p)







	unsigned int i;









	int r;



















	/*









	 * We can't use gang submit on with reserved VMIDs when the VM changes









	 * can't be invalidated by more than one engine at the same time.









	 */









	if (p->gang_size > 1 && !p->adev->vm_manager.concurrent_flush) {









		for (i = 0; i < p->gang_size; ++i) {









			struct drm_sched_entity *entity = p->entities[i];









			struct drm_gpu_scheduler *sched = entity->rq->sched;









			struct amdgpu_ring *ring = to_amdgpu_ring(sched);



















			if (amdgpu_vmid_uses_reserved(vm, ring->vm_hub))









				return -EINVAL;









		}









	}



















	r = amdgpu_vm_clear_freed(adev, vm, NULL);









	if (r)









		return r;