From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jesse Barnes Subject: Re: [PATCH 6/8] drm/i915: Wrap the preallocated BIOS framebuffer and preserve for KMS fbcon v7 Date: Tue, 17 Dec 2013 13:05:29 -0800 Message-ID: <20131217130529.68cb2b68@jbarnes-desktop> References: <1387240469-932-1-git-send-email-jbarnes@virtuousgeek.org> <1387240469-932-6-git-send-email-jbarnes@virtuousgeek.org> <20131217103439.GA22448@nuc-i3427.alporthouse.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from alt-proxy31.mail.unifiedlayer.com (alt-proxy31.mail.unifiedlayer.com [74.220.221.129]) by gabe.freedesktop.org (Postfix) with SMTP id 94865FD255 for ; Tue, 17 Dec 2013 13:03:37 -0800 (PST) In-Reply-To: <20131217103439.GA22448@nuc-i3427.alporthouse.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org To: Chris Wilson Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org On Tue, 17 Dec 2013 10:34:39 +0000 Chris Wilson wrote: > On Mon, Dec 16, 2013 at 04:34:27PM -0800, Jesse Barnes wrote: > > @@ -333,7 +535,8 @@ MODULE_LICENSE("GPL and additional rights"); > > void intel_fbdev_output_poll_changed(struct drm_device *dev) > > { > > struct drm_i915_private *dev_priv = dev->dev_private; > > - drm_fb_helper_hotplug_event(&dev_priv->fbdev->helper); > > + if (dev_priv->fbdev) > > + drm_fb_helper_hotplug_event(&dev_priv->fbdev->helper); > > } > > Also intel_fbdev_restore_mode() needs the NULL fbdev safeguard. Fixed. -- Jesse Barnes, Intel Open Source Technology Center