superrob1500
/
mirror-linux
mirror of https://github.com/torvalds/linux
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: Dave Airlie <airlied@redhat.com>
From: Jani Nikula <jani.nikula@intel.com>
Link: https://patch.msgid.link/281309f78560bcceebac8d5c0511efe66baf641c@intel.com
pull/1354/merge
Dave Airlie 2025-12-12 18:57:43 +10:00
parent 6ae7ec86de 1c7f9e528f
commit 37a1cefd4d
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/gpu/drm/i915/display/intel_fbdev.c
View File

@ -288,13 +288,18 @@ int intel_fbdev_driver_fbdev_probe(struct drm_fb_helper *helper,
drm_framebuffer_put(&fb->base); drm_framebuffer_put(&fb->base);
fb = NULL; fb = NULL;
} }
wakeref = intel_display_rpm_get(display);
if (!fb || drm_WARN_ON(display->drm, !intel_fb_bo(&fb->base))) { if (!fb || drm_WARN_ON(display->drm, !intel_fb_bo(&fb->base))) {
drm_dbg_kms(display->drm, drm_dbg_kms(display->drm,
"no BIOS fb, allocating a new one\n"); "no BIOS fb, allocating a new one\n");
fb = __intel_fbdev_fb_alloc(display, sizes); fb = __intel_fbdev_fb_alloc(display, sizes);
if (IS_ERR(fb)) if (IS_ERR(fb)) {
return PTR_ERR(fb); ret = PTR_ERR(fb);
goto out_unlock;
}
} else { } else {
drm_dbg_kms(display->drm, "re-using BIOS fb\n"); drm_dbg_kms(display->drm, "re-using BIOS fb\n");
prealloc = true; prealloc = true;
@ -302,8 +307,6 @@ int intel_fbdev_driver_fbdev_probe(struct drm_fb_helper *helper,
sizes->fb_height = fb->base.height; sizes->fb_height = fb->base.height;
} }
wakeref = intel_display_rpm_get(display);
/* Pin the GGTT vma for our access via info->screen_base. /* Pin the GGTT vma for our access via info->screen_base.
* This also validates that any existing fb inherited from the * This also validates that any existing fb inherited from the
* BIOS is suitable for own access. * BIOS is suitable for own access.

2
drivers/gpu/drm/i915/intel_memory_region.h
View File

@ -72,7 +72,7 @@ struct intel_memory_region {
u16 instance; u16 instance;
enum intel_region_id id; enum intel_region_id id;
char name[16]; char name[16];
char uabi_name[16]; char uabi_name[20];
bool private; /* not for userspace */ bool private; /* not for userspace */
struct { struct {