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

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

Pull drm fixes from Dave Airlie:
 "Back from travel, thanks to Simona for handling things. regular fixes,
  seems about the right size, but spread out a bit.

  amdgpu has the usual range of fixes, xe has a few fixes, and nouveau
  has a couple of fixes, one for blackwell modifiers on 8/16 bit
  surfaces.

  Otherwise a few small fixes for mediatek, sched, imagination and
  pixpaper.

  sched:
   - Fix deadlock

  amdgpu:
   - Reset fixes
   - Misc fixes
   - Panel scaling fixes
   - HDMI fix
   - S0ix fixes
   - Hibernation fix
   - Secure display fix
   - Suspend fix
   - MST fix

  amdkfd:
   - Process cleanup fix

  xe:
   - Fix missing  synchronization on unbind
   - Fix device shutdown when doing FLR
   - Fix user fence signaling order

  i915:
   - Avoid lock inversion when pinning to GGTT on CHV/BXT+VTD
   - Fix conversion between clock ticks and nanoseconds

  mediatek:
   - Disable AFBC support on Mediatek DRM driver
   - Add pm_runtime support for GCE power control

  imagination:
   - kconfig: Fix dependencies

  nouveau:
   - Set DMA mask earlier
   - Advertize correct modifiers for GB20x

  pixpaper:
   - kconfig: Fix dependencies"

* tag 'drm-fixes-2025-11-08' of https://gitlab.freedesktop.org/drm/kernel: (26 commits)
  drm/xe: Enforce correct user fence signaling order using
  drm/xe: Do clean shutdown also when using flr
  drm/xe: Move declarations under conditional branch
  drm/xe/guc: Synchronize Dead CT worker with unbind
  drm/amd/display: Enable mst when it's detected but yet to be initialized
  drm/amdgpu: Fix wait after reset sequence in S3
  drm/amd: Fix suspend failure with secure display TA
  drm/amdgpu: fix gpu page fault after hibernation on PF passthrough
  drm/tiny: pixpaper: add explicit dependency on MMU
  drm/nouveau: Advertise correct modifiers on GB20x
  drm: define NVIDIA DRM format modifiers for GB20x
  drm/nouveau: set DMA mask before creating the flush page
  drm/sched: Fix deadlock in drm_sched_entity_kill_jobs_cb
  drm/amd/display: Fix NULL deref in debugfs odm_combine_segments
  drm/amdkfd: Don't clear PT after process killed
  drm/amdgpu/smu: Handle S0ix for vangogh
  drm/amdgpu: Drop PMFW RLC notifier from amdgpu_device_suspend()
  drm/amd/display: Fix black screen with HDMI outputs
  drm/amd/display: Don't stretch non-native images by default in eDP
  drm/amd/pm: fix missing device_attr cleanup in amdgpu_pm_sysfs_init()
  ...
parents 38a2c275 d439acbb

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

+4 −0
Original line number Diff line number Diff line
@@ -1267,6 +1267,10 @@ static int unmap_bo_from_gpuvm(struct kgd_mem *mem, 


	(void)amdgpu_vm_bo_unmap(adev, bo_va, entry->va);



	/* VM entity stopped if process killed, don't clear freed pt bo */

	if (!amdgpu_vm_ready(vm))

		return 0;



	(void)amdgpu_vm_clear_freed(adev, vm, &bo_va->last_pt_update);



	(void)amdgpu_sync_fence(sync, bo_va->last_pt_update, GFP_KERNEL);

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

+0 −4
Original line number Diff line number Diff line
@@ -5243,10 +5243,6 @@ int amdgpu_device_suspend(struct drm_device *dev, bool notify_clients) 
	if (amdgpu_sriov_vf(adev))

		amdgpu_virt_release_full_gpu(adev, false);



	r = amdgpu_dpm_notify_rlc_state(adev, false);

	if (r)

		return r;



	return 0;

}

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

+7 −2
Original line number Diff line number Diff line
@@ -2632,9 +2632,14 @@ static int amdgpu_pmops_suspend_noirq(struct device *dev) 
{

	struct drm_device *drm_dev = dev_get_drvdata(dev);

	struct amdgpu_device *adev = drm_to_adev(drm_dev);

	int r;



	if (amdgpu_acpi_should_gpu_reset(adev))

		return amdgpu_asic_reset(adev);

	if (amdgpu_acpi_should_gpu_reset(adev)) {

		amdgpu_device_lock_reset_domain(adev->reset_domain);

		r = amdgpu_asic_reset(adev);

		amdgpu_device_unlock_reset_domain(adev->reset_domain);

		return r;

	}



	return 0;

}

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

+4 −1
Original line number Diff line number Diff line
@@ -2355,8 +2355,11 @@ static int psp_securedisplay_initialize(struct psp_context *psp) 
	if (!ret && !psp->securedisplay_context.context.resp_status) {

		psp->securedisplay_context.context.initialized = true;

		mutex_init(&psp->securedisplay_context.mutex);

	} else

	} else {

		/* don't try again */

		psp->securedisplay_context.context.bin_desc.size_bytes = 0;

		return ret;

	}



	mutex_lock(&psp->securedisplay_context.mutex);

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

+2 −1
Original line number Diff line number Diff line
@@ -407,7 +407,8 @@ static int aqua_vanjaram_switch_partition_mode(struct amdgpu_xcp_mgr *xcp_mgr, 
		return -EINVAL;

	}



	if (adev->kfd.init_complete && !amdgpu_in_reset(adev))

	if (adev->kfd.init_complete && !amdgpu_in_reset(adev) &&

		!adev->in_suspend)

		flags |= AMDGPU_XCP_OPS_KFD;



	if (flags & AMDGPU_XCP_OPS_KFD) {