Commit 6debb690 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull drm fixes from Dave Airlie:
 "Weekly drm fixes. Looks like things did indeed get busier after rc2,
  nothing seems too major, but stuff scattered all over the place,
  amdgpu, xe, i915, hibmc, rust support code, and other small fixes.

  rust:
   - drm device memory layout and safety fixes

  tests:
   - Endianness fixes

  gpuvm:
   - docs warning fix

  panic:
   - fix division on 32-bit arm

  i915:
   - TypeC DP display Fixes
   - Silence rpm wakeref asserts on GEN11_GU_MISC_IIR access
   - Relocate compression repacking WA for JSL/EHL

  xe:
   - xe_vm_create fixes
   - fix vm bind ioctl double free

  amdgpu:
   - Replay fixes
   - SMU14 fix
   - Null check DC fixes
   - DCE6 DC fixes
   - Misc DC fixes

  bridge:
   - analogix_dp: devm_drm_bridge_alloc() error handling fix

  habanalabs:
   - Memory deallocation fix

  hibmc:
   - modesetting black screen fixes
   - fix UAF on irq
   - fix leak on i2c failure path

  nouveau:
   - memory leak fixes
   - typos

  rockchip:
   - Kconfig fix
   - register caching fix"

* tag 'drm-fixes-2025-08-23-1' of https://gitlab.freedesktop.org/drm/kernel: (49 commits)
  drm/xe: Fix vm_bind_ioctl double free bug
  drm/xe: Move ASID allocation and user PT BO tracking into xe_vm_create
  drm/xe: Assign ioctl xe file handler to vm in xe_vm_create
  drm/i915/gt: Relocate compression repacking WA for JSL/EHL
  drm/i915: silence rpm wakeref asserts on GEN11_GU_MISC_IIR access
  drm/amd/display: Fix DP audio DTO1 clock source on DCE 6.
  drm/amd/display: Fix fractional fb divider in set_pixel_clock_v3
  drm/amd/display: Don't print errors for nonexistent connectors
  drm/amd/display: Don't warn when missing DCE encoder caps
  drm/amd/display: Fill display clock and vblank time in dce110_fill_display_configs
  drm/amd/display: Find first CRTC and its line time in dce110_fill_display_configs
  drm/amd/display: Adjust DCE 8-10 clock, don't overclock by 15%
  drm/amd/display: Don't overclock DCE 6 by 15%
  drm/amd/display: Add null pointer check in mod_hdcp_hdcp1_create_session()
  drm/amd/display: Fix Xorg desktop unresponsive on Replay panel
  drm/amd/display: Avoid a NULL pointer dereference
  drm/amdgpu/swm14: Update power limit logic
  drm/amd/display: Revert Add HPO encoder support to Replay
  drm/i915/icl+/tc: Convert AUX powered WARN to a debug message
  drm/i915/lnl+/tc: Use the cached max lane count value
  ...
parents 471b25a2 a60f5ee6

MAINTAINERS

+13 −1
Original line number Diff line number Diff line
@@ -8426,6 +8426,17 @@ T: git https://gitlab.freedesktop.org/drm/misc/kernel.git 
F:	drivers/gpu/drm/scheduler/

F:	include/drm/gpu_scheduler.h









DRM GPUVM









M:	Danilo Krummrich <dakr@kernel.org>









R:	Matthew Brost <matthew.brost@intel.com>









R:	Thomas Hellström <thomas.hellstrom@linux.intel.com>









R:	Alice Ryhl <aliceryhl@google.com>









L:	dri-devel@lists.freedesktop.org









S:	Supported









T:	git https://gitlab.freedesktop.org/drm/misc/kernel.git









F:	drivers/gpu/drm/drm_gpuvm.c









F:	include/drm/drm_gpuvm.h

















DRM LOG









M:	Jocelyn Falempe <jfalempe@redhat.com>









M:	Javier Martinez Canillas <javierm@redhat.com>








@@ -10655,7 +10666,8 @@ S:	Maintained







F:	block/partitions/efi.*

















HABANALABS PCI DRIVER









M:	Yaron Avizrat <yaron.avizrat@intel.com>









M:	Koby Elbaz <koby.elbaz@intel.com>









M:	Konstantin Sinyuk <konstantin.sinyuk@intel.com>









L:	dri-devel@lists.freedesktop.org









S:	Supported









C:	irc://irc.oftc.net/dri-devel
































drivers/accel/habanalabs/gaudi2/gaudi2.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -10437,7 +10437,7 @@ static int gaudi2_memset_device_memory(struct hl_device *hdev, u64 addr, u64 siz







				(u64 *)(lin_dma_pkts_arr), DEBUGFS_WRITE64);









	WREG32(sob_addr, 0);



















	kfree(lin_dma_pkts_arr);









	kvfree(lin_dma_pkts_arr);



















	return rc;









}
































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



+1
−1






























Original line number
Diff line number
Diff line







@@ -514,7 +514,7 @@ bool amdgpu_dmabuf_is_xgmi_accessible(struct amdgpu_device *adev,







		return false;



















	if (drm_gem_is_imported(obj)) {









		struct dma_buf *dma_buf = obj->dma_buf;









		struct dma_buf *dma_buf = obj->import_attach->dmabuf;



















		if (dma_buf->ops != &amdgpu_dmabuf_ops)









			/* No XGMI with non AMD GPUs */
































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



+2
−1






























Original line number
Diff line number
Diff line







@@ -317,7 +317,8 @@ static int amdgpu_gem_object_open(struct drm_gem_object *obj,







	 */









	if (!vm->is_compute_context || !vm->process_info)









		return 0;









	if (!drm_gem_is_imported(obj) || !dma_buf_is_dynamic(obj->dma_buf))









	if (!drm_gem_is_imported(obj) ||









	    !dma_buf_is_dynamic(obj->import_attach->dmabuf))









		return 0;









	mutex_lock_nested(&vm->process_info->lock, 1);









	if (!WARN_ON(!vm->process_info->eviction_fence)) {
































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



+1
−1






























Original line number
Diff line number
Diff line







@@ -1283,7 +1283,7 @@ int amdgpu_vm_bo_update(struct amdgpu_device *adev, struct amdgpu_bo_va *bo_va,







		struct drm_gem_object *obj = &bo->tbo.base;



















		if (drm_gem_is_imported(obj) && bo_va->is_xgmi) {









			struct dma_buf *dma_buf = obj->dma_buf;









			struct dma_buf *dma_buf = obj->import_attach->dmabuf;









			struct drm_gem_object *gobj = dma_buf->priv;









			struct amdgpu_bo *abo = gem_to_amdgpu_bo(gobj);