Commit d4a292c5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'drm-next-2026-02-21' of https://gitlab.freedesktop.org/drm/kernel 

Pull drm fixes from Dave Airlie:
 "This is the fixes and cleanups for the end of the merge window, it's
  nearly all amdgpu, with some amdkfd, then a pagemap core fix, i915/xe
  display fixes, and some xe driver fixes.

  Nothing seems out of the ordinary, except amdgpu is a little more
  volume than usual.

  pagemap:
   - drm/pagemap: pass pagemap_addr by reference

  amdgpu:
   - DML 2.1 fixes
   - Panel replay fixes
   - Display writeback fixes
   - MES 11 old firmware compat fix
   - DC CRC improvements
   - DPIA fixes
   - XGMI fixes
   - ASPM fix
   - SMU feature bit handling fixes
   - DC LUT fixes
   - RAS fixes
   - Misc memory leak in error path fixes
   - SDMA queue reset fixes
   - PG handling fixes
   - 5 level GPUVM page table fix
   - SR-IOV fix
   - Queue reset fix
   - SMU 13.x fixes
   - DC resume lag fix
   - MPO fixes
   - DCN 3.6 fix
   - VSDB fixes
   - HWSS clean up
   - Replay fixes
   - DCE cursor fixes
   - DCN 3.5 SR DDR5 latency fixes
   - HPD fixes
   - Error path unwind fixes
   - SMU13/14 mode1 reset fixes
   - PSP 15 updates
   - SMU 15 updates
   - Sync fix in amdgpu_dma_buf_move_notify()
   - HAINAN fix
   - PSP 13.x fix
   - GPUVM locking fix
   - Fixes for DC analog support
   - DC FAMS fixes
   - DML 2.1 fixes
   - eDP fixes
   - Misc DC fixes
   - Fastboot fix
   - 3DLUT fixes
   - GPUVM fixes
   - 64bpp format fix
   - Fix for MacBooks with switchable gfx

  amdkfd:
   - Fix possible double deletion of validate list
   - Event setup fix
   - Device disconnect regression fix
   - APU GTT as VRAM fix
   - Fix piority inversion with MQDs
   - NULL check fix

  radeon:
   - HAINAN fix

  i915/xe display:
   - Regresion fix for HDR 4k displays (#15503)
   - Fixup for Dell XPS 13 7390 eDP rate limit
   - Memory leak fix on ACPI _DSM handling
   - Add missing slice count check during DP mode validation

  xe:
   - drm/xe: Prevent VFs from exposing the CCS mode sysfs file
   - SRIOV related fixes
   - PAT cache fix
   - MMIO read fix
   - W/a fixes
   - Adjust type of xe_modparam.force_vram_bar_size
   - Wedge mode fix
   - HWMon fix

* tag 'drm-next-2026-02-21' of https://gitlab.freedesktop.org/drm/kernel: (143 commits)
  drm/amd/display: Remove unneeded DAC link encoder register
  drm/amd/display: Enable DAC in DCE link encoder
  drm/amd/display: Set CRTC source for DAC using registers
  drm/amd/display: Initialize DAC in DCE link encoder using VBIOS
  drm/amd/display: Turn off DAC in DCE link encoder using VBIOS
  drm/amd/display: Don't call find_analog_engine() twice
  drm/amdgpu: fix 4-level paging if GMC supports 57-bit VA v2
  drm/amdgpu: keep vga memory on MacBooks with switchable graphics
  drm/amdgpu: Set atomics to true for xgmi
  drm/amdkfd: Check for NULL return values
  drm/amd/display: Use same max plane scaling limits for all 64 bpp formats
  drm/amdgpu: Set vmid0 PAGE_TABLE_DEPTH for GFX12.1
  drm/amdkfd: Disable MQD queue priority
  drm/amd/display: Remove conditional for shaper 3DLUT power-on
  drm/amd/display: Check return of shaper curve to HW format
  drm/amd/display: Correct logic check error for fastboot
  drm/amd/display: Skip eDP detection when no sink
  Revert "drm/amd/display: Add Gfx Base Case For Linear Tiling Handling"
  Revert "drm/amd/display: Correct hubp GfxVersion verification"
  Revert "drm/amd/display: Add Handling for gfxversion DcGfxBase"
  ...
parents eee3666c ae9e8654

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

+3 −1
Original line number Diff line number Diff line
@@ -1186,8 +1186,10 @@ int amdgpu_acpi_enumerate_xcc(void) 
		if (!dev_info)

			ret = amdgpu_acpi_dev_init(&dev_info, xcc_info, sbdf);



		if (ret == -ENOMEM)

		if (ret == -ENOMEM) {

			kfree(xcc_info);

			return ret;

		}



		if (!dev_info) {

			kfree(xcc_info);

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

+3 −5
Original line number Diff line number Diff line
@@ -317,8 +317,7 @@ int amdgpu_amdkfd_post_reset(struct amdgpu_device *adev) 
void amdgpu_amdkfd_gpu_reset(struct amdgpu_device *adev)

{

	if (amdgpu_device_should_recover_gpu(adev))

		amdgpu_reset_domain_schedule(adev->reset_domain,

					     &adev->kfd.reset_work);

		(void)amdgpu_reset_domain_schedule(adev->reset_domain, &adev->kfd.reset_work);

}



int amdgpu_amdkfd_alloc_kernel_mem(struct amdgpu_device *adev, size_t size,
@@ -720,9 +719,8 @@ void amdgpu_amdkfd_set_compute_idle(struct amdgpu_device *adev, bool idle) 
		if (gfx_block != NULL)

			gfx_block->version->funcs->set_powergating_state((void *)gfx_block, state);

	}

	amdgpu_dpm_switch_power_profile(adev,

					PP_SMC_POWER_PROFILE_COMPUTE,

					!idle);

	(void)amdgpu_dpm_switch_power_profile(adev, PP_SMC_POWER_PROFILE_COMPUTE, !idle);



}



bool amdgpu_amdkfd_is_kfd_vmid(struct amdgpu_device *adev, u32 vmid)

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

+1 −1
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ static const char *amdkfd_fence_get_timeline_name(struct dma_fence *f) 
{

	struct amdgpu_amdkfd_fence *fence = to_amdgpu_amdkfd_fence(f);



	return fence->timeline_name;

	return fence ? fence->timeline_name : NULL;

}



/**

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

+13 −6
Original line number Diff line number Diff line
@@ -878,6 +878,7 @@ static int kfd_mem_attach(struct amdgpu_device *adev, struct kgd_mem *mem, 
	struct amdgpu_bo *bo[2] = {NULL, NULL};

	struct amdgpu_bo_va *bo_va;

	bool same_hive = false;

	struct drm_exec exec;

	int i, ret;



	if (!va) {
@@ -958,19 +959,25 @@ static int kfd_mem_attach(struct amdgpu_device *adev, struct kgd_mem *mem, 
			goto unwind;

		}



		/* Add BO to VM internal data structures */

		ret = amdgpu_bo_reserve(bo[i], false);

		if (ret) {

			pr_debug("Unable to reserve BO during memory attach");

		drm_exec_init(&exec, DRM_EXEC_INTERRUPTIBLE_WAIT, 0);

		drm_exec_until_all_locked(&exec) {

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

			drm_exec_retry_on_contention(&exec);

			if (unlikely(ret))

				goto unwind;

			ret = drm_exec_lock_obj(&exec, &bo[i]->tbo.base);

			drm_exec_retry_on_contention(&exec);

			if (unlikely(ret))

				goto unwind;

		}



		bo_va = amdgpu_vm_bo_find(vm, bo[i]);

		if (!bo_va)

			bo_va = amdgpu_vm_bo_add(adev, vm, bo[i]);

		else

			++bo_va->ref_count;

		attachment[i]->bo_va = bo_va;

		amdgpu_bo_unreserve(bo[i]);

		drm_exec_fini(&exec);

		if (unlikely(!attachment[i]->bo_va)) {

			ret = -ENOMEM;

			pr_err("Failed to add BO object to VM. ret == %d\n",

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

+4 −2
Original line number Diff line number Diff line
@@ -892,8 +892,10 @@ static int amdgpu_cs_parser_bos(struct amdgpu_cs_parser *p, 
		struct amdgpu_bo *bo = e->bo;



		e->range = amdgpu_hmm_range_alloc(NULL);

		if (unlikely(!e->range))

			return -ENOMEM;

		if (unlikely(!e->range)) {

			r = -ENOMEM;

			goto out_free_user_pages;

		}



		r = amdgpu_ttm_tt_get_user_pages(bo, e->range);

		if (r)