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

Merge tag 'drm-fixes-2024-12-20' of https://gitlab.freedesktop.org/drm/kernel 

Pull drm fixes from Dave Airlie:
 "Probably the last pull before Christmas holidays, I'll still be around
  for most of the time anyways, nothing too major in here, bunch of
  amdgpu and i915 along with a smattering of fixes across the board.

  core:
   - fix FB dependency
   - avoid div by 0 more in vrefresh
   - maintainers update

  display:
   - fix DP tunnel error path

  dma-buf:
   - fix !DEBUG_FS

  sched:
   - docs warning fix

  panel:
   - collection of misc panel fixes

  i915:
   - Reset engine utilization buffer before registration
   - Ensure busyness counter increases motonically
   - Accumulate active runtime on gt reset

  amdgpu:
   - Disable BOCO when CONFIG_HOTPLUG_PCI_PCIE is not enabled
   - scheduler job fixes
   - IP version check fixes
   - devcoredump fix
   - GPUVM update fix
   - NBIO 2.5 fix

  udmabuf:
   - fix memory leak on last export
   - sealing fixes

  ivpu:
   - fix NULL pointer
   - fix memory leak
   - fix WARN"

* tag 'drm-fixes-2024-12-20' of https://gitlab.freedesktop.org/drm/kernel: (33 commits)
  drm/sched: Fix drm_sched_fini() docu generation
  accel/ivpu: Fix WARN in ivpu_ipc_send_receive_internal()
  accel/ivpu: Fix memory leak in ivpu_mmu_reserved_context_init()
  accel/ivpu: Fix general protection fault in ivpu_bo_list()
  drm/amdgpu/nbio7.0: fix IP version check
  drm/amd: Update strapping for NBIO 2.5.0
  drm/amdgpu: Handle NULL bo->tbo.resource (again) in amdgpu_vm_bo_update
  drm/amdgpu: fix amdgpu_coredump
  drm/amdgpu/smu14.0.2: fix IP version check
  drm/amdgpu/gfx12: fix IP version check
  drm/amdgpu/mmhub4.1: fix IP version check
  drm/amdgpu/nbio7.11: fix IP version check
  drm/amdgpu/nbio7.7: fix IP version check
  drm/amdgpu: don't access invalid sched
  drm/amd: Require CONFIG_HOTPLUG_PCI_PCIE for BOCO
  drm: rework FB_CORE dependency
  drm/fbdev: Select FB_CORE dependency for fbdev on DMA and TTM
  fbdev: Fix recursive dependencies wrt BACKLIGHT_CLASS_DEVICE
  i915/guc: Accumulate active runtime on gt reset
  i915/guc: Ensure busyness counter increases motonically
  ...
parents 5b83bcde e639fb04

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -7347,7 +7347,7 @@ F: drivers/gpu/drm/panel/panel-novatek-nt36672a.c 
DRM DRIVER FOR NVIDIA GEFORCE/QUADRO GPUS

M:	Karol Herbst <kherbst@redhat.com>

M:	Lyude Paul <lyude@redhat.com>

M:	Danilo Krummrich <dakr@redhat.com>

M:	Danilo Krummrich <dakr@kernel.org>

L:	dri-devel@lists.freedesktop.org

L:	nouveau@lists.freedesktop.org

S:	Supported
@@ -8924,7 +8924,7 @@ F: include/linux/arm_ffa.h 
FIRMWARE LOADER (request_firmware)

M:	Luis Chamberlain <mcgrof@kernel.org>

M:	Russ Weight <russ.weight@linux.dev>

M:	Danilo Krummrich <dakr@redhat.com>

M:	Danilo Krummrich <dakr@kernel.org>

L:	linux-kernel@vger.kernel.org

S:	Maintained

F:	Documentation/firmware_class/

arch/powerpc/configs/pmac32_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -208,6 +208,7 @@ CONFIG_FB_ATY=y 
CONFIG_FB_ATY_CT=y

CONFIG_FB_ATY_GX=y

CONFIG_FB_3DFX=y

CONFIG_BACKLIGHT_CLASS_DEVICE=y

# CONFIG_VGA_CONSOLE is not set

CONFIG_FRAMEBUFFER_CONSOLE=y

CONFIG_LOGO=y

arch/powerpc/configs/ppc6xx_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -716,6 +716,7 @@ CONFIG_FB_TRIDENT=m 
CONFIG_FB_SM501=m

CONFIG_FB_IBM_GXT4500=y

CONFIG_LCD_PLATFORM=m

CONFIG_BACKLIGHT_CLASS_DEVICE=y

CONFIG_FRAMEBUFFER_CONSOLE=y

CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y

CONFIG_LOGO=y

drivers/accel/ivpu/ivpu_gem.c

+1 −1
Original line number Diff line number Diff line
@@ -409,7 +409,7 @@ static void ivpu_bo_print_info(struct ivpu_bo *bo, struct drm_printer *p) 
	mutex_lock(&bo->lock);



	drm_printf(p, "%-9p %-3u 0x%-12llx %-10lu 0x%-8x %-4u",

		   bo, bo->ctx->id, bo->vpu_addr, bo->base.base.size,

		   bo, bo->ctx ? bo->ctx->id : 0, bo->vpu_addr, bo->base.base.size,

		   bo->flags, kref_read(&bo->base.base.refcount));



	if (bo->base.pages)

drivers/accel/ivpu/ivpu_mmu_context.c

+7 −3
Original line number Diff line number Diff line
@@ -612,18 +612,22 @@ int ivpu_mmu_reserved_context_init(struct ivpu_device *vdev) 
	if (!ivpu_mmu_ensure_pgd(vdev, &vdev->rctx.pgtable)) {

		ivpu_err(vdev, "Failed to allocate root page table for reserved context\n");

		ret = -ENOMEM;

		goto unlock;

		goto err_ctx_fini;

	}



	ret = ivpu_mmu_cd_set(vdev, vdev->rctx.id, &vdev->rctx.pgtable);

	if (ret) {

		ivpu_err(vdev, "Failed to set context descriptor for reserved context\n");

		goto unlock;

		goto err_ctx_fini;

	}



unlock:

	mutex_unlock(&vdev->rctx.lock);

	return ret;



err_ctx_fini:

	mutex_unlock(&vdev->rctx.lock);

	ivpu_mmu_context_fini(vdev, &vdev->rctx);

	return ret;

}



void ivpu_mmu_reserved_context_fini(struct ivpu_device *vdev)