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 <damien.lespiau@xxxxxxxxx> > --- > 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 _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx
