Commit c6d732c3 authored Nov 21, 2025 by Linus Torvalds

Merge tag 'drm-fixes-2025-11-21' of https://gitlab.freedesktop.org/drm/kernel

Pull drm fixes from Dave Airlie:
 "A range of small fixes across the board, the i915 display
  disambiguation is probably the biggest otherwise amdgpu and xe as
  usual with tegra, nouveau, radeon and a core atomic fix.

  Looks mostly normal.

  atomic:
   - Return error codes on failed blob creation for planes

  nouveau:
   - Fix memory leak

  tegra:
   - Fix device ref counting
   - Fix pid ref counting
   - Revert booting on Pixel C

  xe:
   - Fix out-of-bounds access with BIT()
   - Fix kunit test checking wrong condition
   - Drop duplicate kconfig select
   - Fix guc2host irq handler with MSI-X

  i915:
   - Wildcat Lake and Panther Lake detangled for display fixes

  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"

* tag 'drm-fixes-2025-11-21' of https://gitlab.freedesktop.org/drm/kernel: (25 commits)
  drm/amdgpu: Add sriov vf check for VCN per queue reset support.
  drm/amdgpu/ttm: Fix crash when handling MMIO_REMAP in PDE flags
  drm/amdgpu/vm: Check PRT uAPI flag instead of PTE flag
  drm/amdgpu: Skip emit de meta data on gfx11 with rs64 enabled
  drm/amd: Skip power ungate during suspend for VPE
  drm/plane: Fix create_in_format_blob() return value
  drm/xe/irq: Handle msix vector0 interrupt
  drm/xe: Remove duplicate DRM_EXEC selection from Kconfig
  drm/xe/kunit: Fix forcewake assertion in mocs test
  drm/xe: Prevent BIT() overflow when handling invalid prefetch region
  drm/radeon: delete radeon_fence_process in is_signaled, no deadlock
  drm/amd/display: Fix pbn to kbps Conversion
  drm/amd/display: Clear the CUR_ENABLE register on DCN20 on DPP5
  drm/amd/display: Add an HPD filter for HDMI
  drm/amd/display: Increase DPCD read retries
  drm/amd/display: Move sleep into each retry for retrieve_link_cap()
  drm/amd/display: Prevent Gating DTBCLK before It Is Properly Latched
  drm/i915/xe3: Restrict PTL intel_encoder_is_c10phy() to only PHY A
  drm/i915/display: Add definition for wcl as subplatform
  drm/pcids: Split PTL pciids group to make wcl subplatform
  ...

parents a48f8229 40b53db8

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;