Commit f9915c39 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-fixes-2025-08-21' of... 

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

 into drm-fixes

A bunch of fixes for 6.17:
  - analogix_dp: devm_drm_bridge_alloc() error handling fix
  - gaudi: Memory deallocation fix
  - gpuvm: Documentation warning fix
  - hibmc: Various misc fixes
  - nouveau: Memory leak fixes, typos
  - panic: u64 division handling on 32 bits architecture fix
  - rockchip: Kconfig fix, register caching fix
  - rust: memory layout and safety fixes
  - tests: Endianness fixes

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Maxime Ripard <mripard@redhat.com>
Link: https://lore.kernel.org/r/20250821-economic-dandelion-rooster-c57fa9@houat
parents dbb2c3ad 1a2cf179

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);