[Intel-gfx] [PATCH 1/1] drm/i915: Avoid initializing framebuffer without pipes

Mika Kuoppala mika.kuoppala at linux.intel.com
Fri Oct 19 12:30:37 UTC 2018


If we try to initialize a framebuffer without pipes, we get oops
as we fail to get valid crtc for a PIPE A, on trying to find
pitch limits. This is easily demonstrated by trying to init
framebuffer with displays disabled by 'i915.disable_display=1'
kernel cmdline.

Fix this by omitting framebuffer init early if there are no pipes.

Testcase: igt/kms_addfb_basic
Cc: Ville Syrjala <ville.syrjala at linux.intel.com>
Signed-off-by: Mika Kuoppala <mika.kuoppala at linux.intel.com>
---
 drivers/gpu/drm/i915/intel_display.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index fc7e3b0bd95c..c1685395c67c 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -14312,6 +14312,9 @@ static int intel_framebuffer_init(struct intel_framebuffer *intel_fb,
 	stride = i915_gem_object_get_stride(obj);
 	i915_gem_object_unlock(obj);
 
+	if (INTEL_INFO(dev_priv)->num_pipes == 0)
+		goto err;
+
 	if (mode_cmd->flags & DRM_MODE_FB_MODIFIERS) {
 		/*
 		 * If there's a fence, enforce that
-- 
2.17.1



More information about the Intel-gfx mailing list