Commit 37a1cefd authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-next-fixes-2025-12-12' of... 

Merge tag 'drm-intel-next-fixes-2025-12-12' of https://gitlab.freedesktop.org/drm/i915/kernel

 into drm-next

drm/i915 fixes for v6.19-rc1:
- Fix format string truncation warning
- FIx runtime PM reference during fbdev BO creation

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Jani Nikula <jani.nikula@intel.com>
Link: https://patch.msgid.link/281309f78560bcceebac8d5c0511efe66baf641c@intel.com
parents 6ae7ec86 1c7f9e52

drivers/gpu/drm/i915/display/intel_fbdev.c

+7 −4
Original line number Diff line number Diff line
@@ -288,13 +288,18 @@ int intel_fbdev_driver_fbdev_probe(struct drm_fb_helper *helper, 
		drm_framebuffer_put(&fb->base);

		fb = NULL;

	}



	wakeref = intel_display_rpm_get(display);



	if (!fb || drm_WARN_ON(display->drm, !intel_fb_bo(&fb->base))) {

		drm_dbg_kms(display->drm,

			    "no BIOS fb, allocating a new one\n");



		fb = __intel_fbdev_fb_alloc(display, sizes);

		if (IS_ERR(fb))

			return PTR_ERR(fb);

		if (IS_ERR(fb)) {

			ret = PTR_ERR(fb);

			goto out_unlock;

		}

	} else {

		drm_dbg_kms(display->drm, "re-using BIOS fb\n");

		prealloc = true;
@@ -302,8 +307,6 @@ int intel_fbdev_driver_fbdev_probe(struct drm_fb_helper *helper, 
		sizes->fb_height = fb->base.height;

	}



	wakeref = intel_display_rpm_get(display);



	/* Pin the GGTT vma for our access via info->screen_base.

	 * This also validates that any existing fb inherited from the

	 * BIOS is suitable for own access.

drivers/gpu/drm/i915/intel_memory_region.h

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ struct intel_memory_region { 
	u16 instance;

	enum intel_region_id id;

	char name[16];

	char uabi_name[16];

	char uabi_name[20];

	bool private; /* not for userspace */



	struct {