[Intel-gfx] [PATCH] drm/i915: Use CONFIG_DRM_FBDEV_EMULATION

[Daniel Vetter]

On Tue, Aug 11, 2015 at 01:25:08PM +0200, Maarten Lankhorst wrote:
> Op 10-08-15 om 13:34 schreef Daniel Vetter:
> > Instead of our own duplicated one. This fixes a bug in the driver
> > unload code if DRM_FBDEV_EMULATION=n but DRM_I915_FBDEV=y because we
> > try to unregister the nonexistent fbdev drm_framebuffer.
> >
> > Cc: Archit Taneja <architt at codeaurora.org>
> > Cc: Maarten Lankhorst <maarten.lankhorst at linux.intel.com>
> > Reported-by: Maarten Lankhorst <maarten.lankhorst at linux.intel.com>
> > Signed-off-by: Daniel Vetter <daniel.vetter at intel.com>
> > ---
> >  drivers/gpu/drm/i915/Kconfig         | 15 ---------------
> >  drivers/gpu/drm/i915/Makefile        |  2 +-
> >  drivers/gpu/drm/i915/i915_debugfs.c  |  2 +-
> >  drivers/gpu/drm/i915/i915_drv.h      |  2 +-
> >  drivers/gpu/drm/i915/intel_display.c |  4 ++--
> >  drivers/gpu/drm/i915/intel_dp_mst.c  |  4 ++--
> >  drivers/gpu/drm/i915/intel_drv.h     |  2 +-
> >  7 files changed, 8 insertions(+), 23 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/i915/Kconfig b/drivers/gpu/drm/i915/Kconfig
> > index eb87e2538861..051eab33e4c7 100644
> > --- a/drivers/gpu/drm/i915/Kconfig
> > +++ b/drivers/gpu/drm/i915/Kconfig
> > @@ -36,21 +36,6 @@ config DRM_I915
> >  	  i810 driver instead, and the Atom z5xx series has an entirely
> >  	  different implementation.
> >  
> > -config DRM_I915_FBDEV
> > -	bool "Enable legacy fbdev support for the modesetting intel driver"
> > -	depends on DRM_I915
> > -	select DRM_KMS_FB_HELPER
> > -	select FB_CFB_FILLRECT
> > -	select FB_CFB_COPYAREA
> > -	select FB_CFB_IMAGEBLIT
> >
> Did some testing and didn't find a way to break this. Has the bug been fixed where if some
> option selects X that selects Y it also had to select Y?

Nope, but DRM_FBDEV_EMULATION should carry all the same selects as we did.
> 
> Oh well, have my r-b. :-)
> 
> Reviewed-by: Maarten Lankhorst <maarten.lankhorst at linux.intel.com>

Thanks, applied to drm-misc.
-Daniel
-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch