Commit f1a5e78a authored May 01, 2026 by Linus Torvalds

kernel

Pull drm fixes from Dave Airlie:
 "Fixes for rc2, the usual amdgpu/xe double header, I think xe had a
  couple of weeks combined due to some maintainer access issues,
  otherwise there's just a few misc fixes and documentation fixups.

  core and helpers:
   - calculate framebuffer geometry with format helpers
   - fix docs

  amdgpu:
   - GFX12 fix for CONFIG_DRM_DEBUG_MM configs
   - Fix DC analog support
   - Userq fixes
   - GART placement fix
   - Aldebaran SMU fixes
   - AMDGPU_INFO_READ_MMR_REG fix
   - UVD 3.1 fix
   - GC 6 TCC fix
   - Fix root reservation in amdgpu_vm_handle_fault()
   - RAS fix
   - Module reload fix for APUs
   - Fix build for CONFIG_DRM_FBDEV_EMULATION=n
   - IGT DWB regression fix
   - GC 11.5.4 fix
   - VCN user fence fixes
   - JPEG user fence fixes
   - SMU 13.0.6 fix
   - VCN 3/4 IB parser fixes
   - NV3x+ dGPU vblank fix
   - DCE6/8 fixes for LVDS/eDP panels without an EDID

  amdkfd:
   - Fix for when CONFIG_HSA_AMD is not set
   - SVM fixes

  xe:
   - uapi: Add missing pad and extensions check
   - uapi: Reject unsafe PAT indices for CPU cached memory
   - Drop registration of guc_submit_wedged_fini from xe_guc_submit_wedge
   - Xe3p tuning and workaround fixes
   - USE drm mm instead of drm SA for CCS read/write
   - Fix leaks and null derefs
   - Fix Wa_18022495364

  appletbdrm:
   - allocate protocol buffers with kvzalloc()

  dma-buf:
   - fix docs

  imagination:
   - avoid segfault in debugfs

  ofdrm:
   - put PCI device reference on errors

  udl:
   - increase USB timeout"

* tag 'drm-fixes-2026-05-02' of https://gitlab.freedesktop.org/drm/kernel: (77 commits)
  drm/xe/uapi: Reject coh_none PAT index for CPU_ADDR_MIRROR
  drm/xe/uapi: Reject coh_none PAT index for CPU cached memory in madvise
  drm/xe/xelp: Fix Wa_18022495364
  drm/xe/gsc: Fix BO leak on error in query_compatibility_version()
  drm/xe/eustall: Fix drm_dev_put called before stream disable in close
  drm/xe: Fix error cleanup in xe_exec_queue_create_ioctl()
  drm/xe: Fix dma-buf attachment leak in xe_gem_prime_import()
  drm/xe: Fix bo leak in xe_dma_buf_init_obj() on allocation failure
  drm/xe/bo: Fix bo leak on GGTT flag validation in xe_bo_init_locked()
  drm/xe/bo: Fix bo leak on unaligned size validation in xe_bo_init_locked()
  drm/xe: Fix potential NULL deref in xe_exec_queue_tlb_inval_last_fence_put_unlocked
  drm/xe/vf: Use drm mm instead of drm sa for CCS read/write
  drm/xe: Add memory pool with shadow support
  drm/xe/debugfs: Correct printing of register whitelist ranges
  drm/xe: Mark ROW_CHICKEN5 as a masked register
  drm/xe/tuning: Use proper register offset for GAMSTLB_CTRL
  drm/xe/xe3p_lpg: Add missing indirect ring state feature flag
  drm/xe: Drop redundant rtp entries for Wa_14019988906 & Wa_14019877138
  drm/xe/vm: Add missing pad and extensions check
  drm/xe: Drop registration of guc_submit_wedged_fini from xe_guc_submit_wedge()
  ...

parents cd546f7a f0997a06

.mailmap

+1 −0

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@ Abhinav Kumar <quic_abhinavk@quicinc.com> <abhinavk@codeaurora.org>
		Ahmad Masri <quic_amasri@quicinc.com> <amasri@codeaurora.org>
		Adam Oldham <oldhamca@gmail.com>
		Adam Radford <aradford@gmail.com>
		Aditya Garg <gargaditya08@proton.me> <gargaditya08@live.com>
		Adriana Reus <adi.reus@gmail.com> <adriana.reus@intel.com>
		Adrian Bunk <bunk@stusta.de>
		Ajay Kaher <ajay.kaher@broadcom.com> <akaher@vmware.com>

MAINTAINERS

+1 −1

Original line number	Diff line number	Diff line
		@@ -7873,7 +7873,7 @@ F: drivers/gpu/drm/sun4i/sun8i*

		DRM DRIVER FOR APPLE TOUCH BARS
		M: Aun-Ali Zaidi <admin@kodeit.net>
		M: Aditya Garg <gargaditya08@live.com>
		M: Aditya Garg <gargaditya08@proton.me>
		L: dri-devel@lists.freedesktop.org
		S: Maintained
		T: git https://gitlab.freedesktop.org/drm/misc/kernel.git

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

+5 −1

Original line number	Diff line number	Diff line
		@@ -2839,8 +2839,12 @@ static int amdgpu_device_ip_fini_early(struct amdgpu_device *adev)
		* that checks whether the PSP is running. A solution for those issues
		* in the APU is to trigger a GPU reset, but this should be done during
		* the unload phase to avoid adding boot latency and screen flicker.
		* GFX V11 has GC block as default off IP. Every time AMDGPU driver sends
		* a request to PMFW to unload MP1, PMFW will put GC in reset and power down
		* the voltage. Hence, skipping reset for APUs with GFX V11 or later.
		*/
		if ((adev->flags & AMD_IS_APU) && !adev->gmc.is_app_apu) {
		if ((adev->flags & AMD_IS_APU) && !adev->gmc.is_app_apu &&
		amdgpu_ip_version(adev, GC_HWIP, 0) < IP_VERSION(11, 0, 0)) {
		r = amdgpu_asic_reset(adev);
		if (r)
		dev_err(adev->dev, "asic reset on %s failed\n", __func__);

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

+1 −3

Original line number	Diff line number	Diff line
		@@ -3090,10 +3090,8 @@ int amdgpu_discovery_set_ip_blocks(struct amdgpu_device *adev)
		case IP_VERSION(11, 5, 1):
		case IP_VERSION(11, 5, 2):
		case IP_VERSION(11, 5, 3):
		adev->family = AMDGPU_FAMILY_GC_11_5_0;
		break;
		case IP_VERSION(11, 5, 4):
		adev->family = AMDGPU_FAMILY_GC_11_5_4;
		adev->family = AMDGPU_FAMILY_GC_11_5_0;
		break;
		case IP_VERSION(12, 0, 0):
		case IP_VERSION(12, 0, 1):

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

+4 −2

Original line number	Diff line number	Diff line
		@@ -3158,8 +3158,10 @@ static int __init amdgpu_init(void)
		amdgpu_register_atpx_handler();
		amdgpu_acpi_detect();

		/* Ignore KFD init failures. Normal when CONFIG_HSA_AMD is not set. */
		amdgpu_amdkfd_init();
		/* Ignore KFD init failures when CONFIG_HSA_AMD is not set. */
		r = amdgpu_amdkfd_init();
		if (r && r != -ENOENT)
		goto error_fence;

		if (amdgpu_pp_feature_mask & PP_OVERDRIVE_MASK) {
		add_taint(TAINT_CPU_OUT_OF_SPEC, LOCKDEP_STILL_OK);