[Intel-gfx] [PATCH] drm/i915: kick firmware fbs even when i915 fbdev is disabled

[Jani Nikula]

On Tue, 17 Dec 2013, Daniel Vetter <daniel.vetter at ffwll.ch> wrote:
> Otherwise we don't kick out firmware framebuffers like vesafb and
> efifb when CONFIG_DRM_I915_FBDEV=n but CONFIG_FB=y.
>
> There's still the pesky issue with vgacon which we should somehow
> replace with the dummy console at least. We have a similar issue at
> module un/reload, since vgacon state is terminally botched after
> i915.ko has loaded in modeset mode. But this gets us a step further at
> least.
>
> v2: Use IS_ENABLED - I always get this wrong for tristates. Spotted by
> Jani.
>

Reviewed-by: Jani Nikula <jani.nikula at intel.com>


> Reported-by: Chris Wilson <chris at chris-wilson.co.uk>
> Cc: Chris Wilson <chris at chris-wilson.co.uk>
> Cc: Jani Nikula <jani.nikula at linux.intel.com>
> Signed-off-by: Daniel Vetter <daniel.vetter at ffwll.ch>
> ---
>  drivers/gpu/drm/i915/i915_dma.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
> index c9101bde96be..6b5f63043cde 100644
> --- a/drivers/gpu/drm/i915/i915_dma.c
> +++ b/drivers/gpu/drm/i915/i915_dma.c
> @@ -1413,7 +1413,7 @@ void i915_master_destroy(struct drm_device *dev, struct drm_master *master)
>  	master->driver_priv = NULL;
>  }
>  
> -#ifdef CONFIG_DRM_I915_FBDEV
> +#if IS_ENABLED(CONFIG_FB)
>  static void i915_kick_out_firmware_fb(struct drm_i915_private *dev_priv)
>  {
>  	struct apertures_struct *ap;
> -- 
> 1.8.4.3
>

-- 
Jani Nikula, Intel Open Source Technology Center