public inbox for intel-gfx@lists.freedesktop.org
 help / color / mirror / Atom feed
From: clinton.a.taylor@intel.com
To: Intel-gfx@lists.freedesktop.org
Subject: [PATCH] drm/i915: prevent crash with .disable_display parameter
Date: Tue, 17 Jan 2017 16:37:28 -0800	[thread overview]
Message-ID: <1484699848-1605-1-git-send-email-clinton.a.taylor@intel.com> (raw)

From: Clint Taylor <clinton.a.taylor@intel.com>

The .disable_display parameter was causing a fatal crash when fbdev was
dereferenced during driver init.

Signed-off-by: Clint Taylor <clinton.a.taylor@intel.com>
---
 drivers/gpu/drm/i915/i915_drv.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 4e5ea58..b2a9195 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -1140,7 +1140,9 @@ static void i915_driver_register(struct drm_i915_private *dev_priv)
 	 * irqs are fully enabled. We do it last so that the async config
 	 * cannot run before the connectors are registered.
 	 */
-	intel_fbdev_initial_config_async(dev);
+	if (dev_priv->fbdev) {
+		intel_fbdev_initial_config_async(dev);
+	}
 }
 
 /**
-- 
1.7.9.5

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

             reply	other threads:[~2017-01-18  0:39 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-01-18  0:37 clinton.a.taylor [this message]
2017-01-18  1:24 ` ✓ Fi.CI.BAT: success for drm/i915: prevent crash with .disable_display parameter Patchwork
2017-01-18  9:52 ` [PATCH] " Chris Wilson
2017-01-18 10:16   ` Chris Wilson
2017-01-18 16:22   ` Clint Taylor
2017-01-18 15:54 ` kbuild test robot
2017-01-18 21:38 ` [PATCH v2] " clinton.a.taylor
2017-01-19  8:55   ` Chris Wilson
2017-01-18 22:24 ` ✗ Fi.CI.BAT: failure for drm/i915: prevent crash with .disable_display parameter (rev2) Patchwork

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1484699848-1605-1-git-send-email-clinton.a.taylor@intel.com \
    --to=clinton.a.taylor@intel.com \
    --cc=Intel-gfx@lists.freedesktop.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox