From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH 8/8] drm/i915: Provide a command line option to disable display Date: Mon, 10 Feb 2014 10:13:52 +0100 Message-ID: <20140210091352.GN17001@phenom.ffwll.local> References: <1391800374-24904-1-git-send-email-damien.lespiau@intel.com> <1391800374-24904-9-git-send-email-damien.lespiau@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-ee0-f53.google.com (mail-ee0-f53.google.com [74.125.83.53]) by gabe.freedesktop.org (Postfix) with ESMTP id 6B609F9E7A for ; Mon, 10 Feb 2014 01:13:56 -0800 (PST) Received: by mail-ee0-f53.google.com with SMTP id t10so2791883eei.40 for ; Mon, 10 Feb 2014 01:13:55 -0800 (PST) Content-Disposition: inline In-Reply-To: <1391800374-24904-9-git-send-email-damien.lespiau@intel.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: Damien Lespiau Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org On Fri, Feb 07, 2014 at 07:12:54PM +0000, Damien Lespiau wrote: > If we can't actually determine at run-time we have a fused-off display, > provide at least an option to disable it. > > Signed-off-by: Damien Lespiau > --- > drivers/gpu/drm/i915/i915_dma.c | 3 ++- > drivers/gpu/drm/i915/i915_drv.h | 1 + > drivers/gpu/drm/i915/i915_params.c | 4 ++++ > 3 files changed, 7 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c > index 283ace8..493c9ea 100644 > --- a/drivers/gpu/drm/i915/i915_dma.c > +++ b/drivers/gpu/drm/i915/i915_dma.c > @@ -1497,7 +1497,8 @@ static void intel_device_info_runtime_init(struct drm_device *dev) > * On CPT/PPT, we can detect this case as SFUSE_STRAP_FUSE_LOCK > * should be set when taking over after the firmware. > */ > - if (fuse_strap & ILK_INTERNAL_DISPLAY_DISABLE || > + if (i915.disable_display || tbh I'd move this out into a separate top-level check - this option is a bit hard to catch in the fuse checks here. Alos that way I could have merged it already ;-) Previous two patches are also merged, thanks. -Daniel -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch