Skip to content

Commit 37a1cef

Browse files
committed
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
2 parents 6ae7ec8 + 1c7f9e5 commit 37a1cef

2 files changed

Lines changed: 8 additions & 5 deletions

File tree

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

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -288,22 +288,25 @@ int intel_fbdev_driver_fbdev_probe(struct drm_fb_helper *helper,
288288
drm_framebuffer_put(&fb->base);
289289
fb = NULL;
290290
}
291+
292+
wakeref = intel_display_rpm_get(display);
293+
291294
if (!fb || drm_WARN_ON(display->drm, !intel_fb_bo(&fb->base))) {
292295
drm_dbg_kms(display->drm,
293296
"no BIOS fb, allocating a new one\n");
294297

295298
fb = __intel_fbdev_fb_alloc(display, sizes);
296-
if (IS_ERR(fb))
297-
return PTR_ERR(fb);
299+
if (IS_ERR(fb)) {
300+
ret = PTR_ERR(fb);
301+
goto out_unlock;
302+
}
298303
} else {
299304
drm_dbg_kms(display->drm, "re-using BIOS fb\n");
300305
prealloc = true;
301306
sizes->fb_width = fb->base.width;
302307
sizes->fb_height = fb->base.height;
303308
}
304309

305-
wakeref = intel_display_rpm_get(display);
306-
307310
/* Pin the GGTT vma for our access via info->screen_base.
308311
* This also validates that any existing fb inherited from the
309312
* BIOS is suitable for own access.

drivers/gpu/drm/i915/intel_memory_region.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ struct intel_memory_region {
7272
u16 instance;
7373
enum intel_region_id id;
7474
char name[16];
75-
char uabi_name[16];
75+
char uabi_name[20];
7676
bool private; /* not for userspace */
7777

7878
struct {

0 commit comments

Comments
 (0)