Commit 87fd8833 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-fixes-2024-12-19' of... 

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

 into drm-fixes

drm-misc-fixes for v6.13-rc4:
- udma-buf fixes related to sealing.
- dma-buf build warning fix when debugfs is not enabled.
- Assorted drm/panel fixes.
- Correct error return in drm_dp_tunnel_mgr_create.
- Fix even more divide by zero in drm_mode_vrefresh.
- Fix FBDEV dependencies in Kconfig.
- Documentation fix for drm_sched_fini.
- IVPU NULL pointer, memory leak and WARN fix.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/d0763051-87b7-483e-89e0-a9f993383450@linux.intel.com
parents e9088ac1 1b684ca1

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)