[PATCH] drm/i915: Only kick out vesafb if we takeover the fbcon with KMS

[PATCH] drm/i915: Only kick out vesafb if we takeover the fbcon with KMS

[Chris Wilson]

Otherwise we may remove the only console for a nomodeset system.

We became more aggressive in our kicking with
commit e188719a2891f01b3100dca4ae3a055fb5a7ab52
Author: Daniel Vetter <daniel.vetter@ffwll.ch>
Date:   Tue Jun 12 11:28:17 2012 +0200

    drm/i915: kick any firmware framebuffers before claiming the gtt

Reported-and-tested-by: monnier@iro.umontreal.ca
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=54615
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: stable@vger.kernel.org # v3.6
---
 drivers/gpu/drm/i915/i915_dma.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
index efdc204..36a4218 100644
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@ -1511,7 +1511,8 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
 		goto put_gmch;
 	}
 
-	i915_kick_out_firmware_fb(dev_priv);
+	if (drm_core_check_feature(dev, DRIVER_MODESET))
+		i915_kick_out_firmware_fb(dev_priv);
 
 	pci_set_master(dev->pdev);
 
-- 
1.7.10.4

Re: [PATCH] drm/i915: Only kick out vesafb if we takeover the fbcon with KMS

[Daniel Vetter]

On Fri, Oct 26, 2012 at 12:06:41PM +0100, Chris Wilson wrote:
> Otherwise we may remove the only console for a nomodeset system.
> 
> We became more aggressive in our kicking with
> commit e188719a2891f01b3100dca4ae3a055fb5a7ab52
> Author: Daniel Vetter <daniel.vetter@ffwll.ch>
> Date:   Tue Jun 12 11:28:17 2012 +0200
> 
>     drm/i915: kick any firmware framebuffers before claiming the gtt
> 
> Reported-and-tested-by: monnier@iro.umontreal.ca
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=54615
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: stable@vger.kernel.org # v3.6
Picked up for -fixes, thanks for the patch.
-Daniel
-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch