Commit 42bb9b63 authored Jul 04, 2025 by Linus Torvalds

kernel

Pull drm fixes from Dave Airlie:
 "Weekly drm fixes, bit of a bumper crop, the usual amdgpu/xe/i915
  suspects, then there is a large scattering of fixes across core and
  drivers. I think the simple panel lookup fix is probably the largest,
  the sched race fix is also fun, but I don't see anything standing out
  too badly.

  dma-buf:
   - fix timeout handling

  gem:
   - fix framebuffer object references

  sched:
   - fix spsc queue job count race

  bridge:
   - fix aux hpd bridge of node
   - panel: move missing flag handling
   - samsung-dsim: fix %pK usage to %p

  panel:
   - fix problem with simple panel lookup

  ttm:
   - fix error path handling

  amdgpu:
   - SDMA 5.x reset fix
   - Add missing firmware declaration
   - Fix leak in amdgpu_ctx_mgr_entity_fini()
   - Freesync fix
   - OLED backlight fix

  amdkfd:
   - mtype fix for ext coherent system memory
   - MMU notifier fix
   - gfx7/8 fix

  xe:
   - Fix chunking the PTE updates and overflowing the maximum number of
     dwords with with MI_STORE_DATA_IMM
   - Move WA BB to the LRC BO to mitigate hangs on context switch
   - Fix frequency/flush WAs for BMG
   - Fix kconfig prompt title and description
   - Do not require kunit
   - Extend 14018094691 WA to BMG
   - Fix wedging the device on signal

  i915:
   - Make mei interrupt top half irq disabled to fix RT builds
   - Fix timeline left held on VMA alloc error
   - Fix NULL pointer deref in vlv_dphy_param_init()
   - Fix selftest mock_request() to avoid NULL deref

  exynos:
   - switch to using %p instead of %pK
   - fix vblank NULL ptr race
   - fix lockup on samsung peach-pit/pi chromebooks

  vesadrm:
   - NULL ptr fix

  vmwgfx:
   - fix encrypted memory allocation bug

  v3d:
   - fix irq enabled during reset"

* tag 'drm-fixes-2025-07-04' of https://gitlab.freedesktop.org/drm/kernel: (41 commits)
  drm/xe: Do not wedge device on killed exec queues
  drm/xe: Extend WA 14018094691 to BMG
  drm/v3d: Disable interrupts before resetting the GPU
  drm/gem: Acquire references on GEM handles for framebuffers
  drm/sched: Increment job count before swapping tail spsc queue
  drm/xe: Allow dropping kunit dependency as built-in
  drm/xe: Fix kconfig prompt
  drm/xe/bmg: Update Wa_22019338487
  drm/xe/bmg: Update Wa_14022085890
  drm/xe: Split xe_device_td_flush()
  drm/xe/xe_guc_pc: Lock once to update stashed frequencies
  drm/xe/guc_pc: Add _locked variant for min/max freq
  drm/xe: Make WA BB part of LRC BO
  drm/xe: Fix out-of-bounds field write in MI_STORE_DATA_IMM
  drm/i915/gsc: mei interrupt top half should be in irq disabled context
  drm/i915/gt: Fix timeline left held on VMA alloc error
  drm/vmwgfx: Fix guests running with TDX/SEV
  drm/amd/display: Don't allow OLED to go down to fully off
  drm/amd/display: Added case for when RR equals panel's max RR using freesync
  drm/amdkfd: add hqd_sdma_get_doorbell callbacks for gfx7/8
  ...

parents 923d4012 da8d8e90

drivers/dma-buf/dma-resv.c

+7 −5

Original line number	Diff line number	Diff line
		@@ -685,11 +685,13 @@ long dma_resv_wait_timeout(struct dma_resv *obj, enum dma_resv_usage usage,
		dma_resv_iter_begin(&cursor, obj, usage);
		dma_resv_for_each_fence_unlocked(&cursor, fence) {

		ret = dma_fence_wait_timeout(fence, intr, ret);
		if (ret <= 0) {
		dma_resv_iter_end(&cursor);
		return ret;
		}
		ret = dma_fence_wait_timeout(fence, intr, timeout);
		if (ret <= 0)
		break;

		/* Even for zero timeout the return value is 1 */
		if (timeout)
		timeout = ret;
		}
		dma_resv_iter_end(&cursor);

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

+8 −0

Original line number	Diff line number	Diff line
		@@ -561,6 +561,13 @@ static uint32_t read_vmid_from_vmfault_reg(struct amdgpu_device *adev)
		return REG_GET_FIELD(status, VM_CONTEXT1_PROTECTION_FAULT_STATUS, VMID);
		}

		static uint32_t kgd_hqd_sdma_get_doorbell(struct amdgpu_device *adev,
		int engine, int queue)

		{
		return 0;
		}

		const struct kfd2kgd_calls gfx_v7_kfd2kgd = {
		.program_sh_mem_settings = kgd_program_sh_mem_settings,
		.set_pasid_vmid_mapping = kgd_set_pasid_vmid_mapping,
		@@ -578,4 +585,5 @@ const struct kfd2kgd_calls gfx_v7_kfd2kgd = {
		.set_scratch_backing_va = set_scratch_backing_va,
		.set_vm_context_page_table_base = set_vm_context_page_table_base,
		.read_vmid_from_vmfault_reg = read_vmid_from_vmfault_reg,
		.hqd_sdma_get_doorbell = kgd_hqd_sdma_get_doorbell,
		};

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

+8 −0

Original line number	Diff line number	Diff line
		@@ -582,6 +582,13 @@ static void set_vm_context_page_table_base(struct amdgpu_device *adev,
		lower_32_bits(page_table_base));
		}

		static uint32_t kgd_hqd_sdma_get_doorbell(struct amdgpu_device *adev,
		int engine, int queue)

		{
		return 0;
		}

		const struct kfd2kgd_calls gfx_v8_kfd2kgd = {
		.program_sh_mem_settings = kgd_program_sh_mem_settings,
		.set_pasid_vmid_mapping = kgd_set_pasid_vmid_mapping,
		@@ -599,4 +606,5 @@ const struct kfd2kgd_calls gfx_v8_kfd2kgd = {
		get_atc_vmid_pasid_mapping_info,
		.set_scratch_backing_va = set_scratch_backing_va,
		.set_vm_context_page_table_base = set_vm_context_page_table_base,
		.hqd_sdma_get_doorbell = kgd_hqd_sdma_get_doorbell,
		};

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -944,6 +944,7 @@ static void amdgpu_ctx_mgr_entity_fini(struct amdgpu_ctx_mgr *mgr)
		drm_sched_entity_fini(entity);
		}
		}
		kref_put(&ctx->refcount, amdgpu_ctx_fini);
		}
		}

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -45,6 +45,7 @@
		#include "amdgpu_ras.h"

		MODULE_FIRMWARE("amdgpu/sdma_4_4_2.bin");
		MODULE_FIRMWARE("amdgpu/sdma_4_4_4.bin");
		MODULE_FIRMWARE("amdgpu/sdma_4_4_5.bin");

		static const struct amdgpu_hwip_reg_entry sdma_reg_list_4_4_2[] = {