Commit 460b3172 authored by Dibin Moolakadan Subrahmanian's avatar Dibin Moolakadan Subrahmanian Committed by Jani Nikula
Browse files

drm/i915/fbdev: Hold runtime PM ref during fbdev BO creation 

During fbdev probe, the xe driver allocates and pins a framebuffer
BO (via xe_bo_create_pin_map_novm() → xe_ggtt_insert_bo()).

Without a runtime PM reference, xe_pm_runtime_get_noresume() warns about
missing outer PM protection as below:

	xe 0000:03:00.0: [drm] Missing outer runtime PM protection

Acquire a runtime PM reference before framebuffer allocation to ensure
xe_ggtt_insert_bo()  executes  under active runtime PM context.

Changes in v2:
 - Update commit message to add Fixes tag (Jani Nikula)

Closes: https://gitlab.freedesktop.org/drm/xe/kernel/-/issues/6350


Fixes: 44e69495 ("drm/xe/display: Implement display support")
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Signed-off-by: default avatarDibin Moolakadan Subrahmanian <dibin.moolakadan.subrahmanian@intel.com>
Reviewed-by: default avatarJouni Högander <jouni.hogander@intel.com>
Signed-off-by: default avatarAnkit Nautiyal <ankit.k.nautiyal@intel.com>
Link: https://patch.msgid.link/20251111135403.3415947-1-dibin.moolakadan.subrahmanian@intel.com


(cherry picked from commit 37fc7b7b)
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parent c7685d11

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.