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

Merge tag 'amd-drm-fixes-6.18-2025-11-20' of... 

Merge tag 'amd-drm-fixes-6.18-2025-11-20' of https://gitlab.freedesktop.org/agd5f/linux

 into drm-fixes

amd-drm-fixes-6.18-2025-11-20:

amdgpu:
- DTBCLK gating fix
- EDID fetching retry improvements
- HDMI HPD debounce filtering
- DCN 2.0 cursor fix
- DP MST PBN fix
- VPE fix
- GC 11 fix
- PRT fix
- MMIO remap page fix
- SR-IOV fix

radeon:
- Fence deadlock fix

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

From: Alex Deucher <alexander.deucher@amd.com>
Link: https://patch.msgid.link/20251120164110.1077973-1-alexander.deucher@amd.com
parents 201a32e6 c156c7f2

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

+2 −1
Original line number Diff line number Diff line
@@ -3414,10 +3414,11 @@ int amdgpu_device_set_pg_state(struct amdgpu_device *adev, 
		    (adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_GFX ||

		     adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_SDMA))

			continue;

		/* skip CG for VCE/UVD, it's handled specially */

		/* skip CG for VCE/UVD/VPE, it's handled specially */

		if (adev->ip_blocks[i].version->type != AMD_IP_BLOCK_TYPE_UVD &&

		    adev->ip_blocks[i].version->type != AMD_IP_BLOCK_TYPE_VCE &&

		    adev->ip_blocks[i].version->type != AMD_IP_BLOCK_TYPE_VCN &&

		    adev->ip_blocks[i].version->type != AMD_IP_BLOCK_TYPE_VPE &&

		    adev->ip_blocks[i].version->type != AMD_IP_BLOCK_TYPE_JPEG &&

		    adev->ip_blocks[i].version->funcs->set_powergating_state) {

			/* enable powergating to save power */

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

+1 −1
Original line number Diff line number Diff line
@@ -1372,7 +1372,7 @@ uint64_t amdgpu_ttm_tt_pde_flags(struct ttm_tt *ttm, struct ttm_resource *mem) 
		    mem->mem_type == AMDGPU_PL_MMIO_REMAP)) {

		flags |= AMDGPU_PTE_SYSTEM;



		if (ttm->caching == ttm_cached)

		if (ttm && ttm->caching == ttm_cached)

			flags |= AMDGPU_PTE_SNOOPED;

	}

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

+2 −2
Original line number Diff line number Diff line
@@ -2078,7 +2078,7 @@ int amdgpu_vm_bo_clear_mappings(struct amdgpu_device *adev, 
		struct amdgpu_bo *bo = before->bo_va->base.bo;



		amdgpu_vm_it_insert(before, &vm->va);

		if (before->flags & AMDGPU_PTE_PRT_FLAG(adev))

		if (before->flags & AMDGPU_VM_PAGE_PRT)

			amdgpu_vm_prt_get(adev);



		if (amdgpu_vm_is_bo_always_valid(vm, bo) &&
@@ -2093,7 +2093,7 @@ int amdgpu_vm_bo_clear_mappings(struct amdgpu_device *adev, 
		struct amdgpu_bo *bo = after->bo_va->base.bo;



		amdgpu_vm_it_insert(after, &vm->va);

		if (after->flags & AMDGPU_PTE_PRT_FLAG(adev))

		if (after->flags & AMDGPU_VM_PAGE_PRT)

			amdgpu_vm_prt_get(adev);



		if (amdgpu_vm_is_bo_always_valid(vm, bo) &&

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

+2 −2
Original line number Diff line number Diff line
@@ -5872,9 +5872,9 @@ static void gfx_v11_0_ring_emit_ib_gfx(struct amdgpu_ring *ring, 
		if (flags & AMDGPU_IB_PREEMPTED)

			control |= INDIRECT_BUFFER_PRE_RESUME(1);



		if (vmid)

		if (vmid && !ring->adev->gfx.rs64_enable)

			gfx_v11_0_ring_emit_de_meta(ring,

				    (!amdgpu_sriov_vf(ring->adev) && flags & AMDGPU_IB_PREEMPTED) ? true : false);

				!amdgpu_sriov_vf(ring->adev) && (flags & AMDGPU_IB_PREEMPTED));

	}



	amdgpu_ring_write(ring, header);

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

+1 −1
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ static int vcn_v4_0_3_late_init(struct amdgpu_ip_block *ip_block) 
	adev->vcn.supported_reset =

		amdgpu_get_soft_full_reset_mask(&adev->vcn.inst[0].ring_enc[0]);



	if (amdgpu_dpm_reset_vcn_is_supported(adev))

	if (amdgpu_dpm_reset_vcn_is_supported(adev) && !amdgpu_sriov_vf(adev))

		adev->vcn.supported_reset |= AMDGPU_RESET_TYPE_PER_QUEUE;



	return 0;