Commit 72dc7c05 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'amd-drm-next-6.16-2025-05-16' of... 

Merge tag 'amd-drm-next-6.16-2025-05-16' of https://gitlab.freedesktop.org/agd5f/linux

 into drm-next

amdgpu:
- Misc code cleanups
- UserQ fixes
- MALL reporting fix
- DP AUX fixes
- DCN 3.5 fixes
- DP MST fixes
- DC DMI quirks cleanup
- RAS fixes
- SR-IOV updates
- GC 9.5 updates
- Misc display fixes
- VCN 4.0.5 powergating race fix
- SMU 13.x updates
- Paritioning fixes
- VCN 5.0.1 SR-IOV updates
- JPEG 5.0.1 SR-IOV updates

amdkfd:
- Fix spurious warning in interrupt code
- XNACK fixes

radeon:
- CIK doorbell cleanup

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

From: Alex Deucher <alexander.deucher@amd.com>
Link: https://lore.kernel.org/r/20250516204609.2437472-1-alexander.deucher@amd.com
parents 5dca4335 2f0268ca

Documentation/gpu/amdgpu/amdgpu-glossary.rst

+1 −1
Original line number Diff line number Diff line
@@ -182,7 +182,7 @@ we have a dedicated glossary for Display Core at 
    SMU/SMC

      System Management Unit / System Management Controller



    SPI

    SPI (AMDGPU)

      Shader Processor Input



    SRLC

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

+3 −0
Original line number Diff line number Diff line
@@ -281,6 +281,9 @@ static int convert_atom_mem_type_to_vram_type(struct amdgpu_device *adev, 
		case ATOM_DGPU_VRAM_TYPE_GDDR6:

			vram_type = AMDGPU_VRAM_TYPE_GDDR6;

			break;

		case ATOM_DGPU_VRAM_TYPE_HBM3E:

			vram_type = AMDGPU_VRAM_TYPE_HBM3E;

			break;

		default:

			vram_type = AMDGPU_VRAM_TYPE_UNKNOWN;

			break;

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

+1 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ int amdgpu_unmap_static_csa(struct amdgpu_device *adev, struct amdgpu_vm *vm, 
	struct drm_exec exec;

	int r;



	drm_exec_init(&exec, DRM_EXEC_INTERRUPTIBLE_WAIT, 0);

	drm_exec_init(&exec, 0, 0);

	drm_exec_until_all_locked(&exec) {

		r = amdgpu_vm_lock_pd(vm, &exec, 0);

		if (likely(!r))

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

+1 −0
Original line number Diff line number Diff line
@@ -2105,6 +2105,7 @@ int amdgpu_debugfs_init(struct amdgpu_device *adev) 
	amdgpu_rap_debugfs_init(adev);

	amdgpu_securedisplay_debugfs_init(adev);

	amdgpu_fw_attestation_debugfs_init(adev);

	amdgpu_psp_debugfs_init(adev);



	debugfs_create_file("amdgpu_evict_vram", 0400, root, adev,

			    &amdgpu_evict_vram_fops);

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

+1 −1
Original line number Diff line number Diff line
@@ -183,7 +183,7 @@ void amdgpu_eviction_fence_destroy(struct amdgpu_eviction_fence_mgr *evf_mgr) 
	dma_fence_wait(&ev_fence->base, false);



	/* Last unref of ev_fence */

	dma_fence_put(&evf_mgr->ev_fence->base);

	dma_fence_put(&ev_fence->base);

}



int amdgpu_eviction_fence_attach(struct amdgpu_eviction_fence_mgr *evf_mgr,