36 lines
1.2 KiB
Diff
36 lines
1.2 KiB
Diff
From: Chris Wilson <chris@chris-wilson.co.uk>
|
|
Date: Fri, 26 Oct 2012 12:06:41 +0100
|
|
Subject: drm/i915: Only kick out vesafb if we takeover the fbcon with KMS
|
|
|
|
commit 1623392af9da983f3ad088a75076c9da05e5600d upstream.
|
|
|
|
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>
|
|
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
|
|
---
|
|
drivers/gpu/drm/i915/i915_dma.c | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
--- a/drivers/gpu/drm/i915/i915_dma.c
|
|
+++ b/drivers/gpu/drm/i915/i915_dma.c
|
|
@@ -1955,7 +1955,8 @@ int i915_driver_load(struct drm_device *
|
|
goto put_bridge;
|
|
}
|
|
|
|
- i915_kick_out_firmware_fb(dev_priv);
|
|
+ if (drm_core_check_feature(dev, DRIVER_MODESET))
|
|
+ i915_kick_out_firmware_fb(dev_priv);
|
|
|
|
/* overlay on gen2 is broken and can't address above 1G */
|
|
if (IS_GEN2(dev))
|