From da2c29d21c2d00966f839b8e36ec388f52ca1ad8 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Fri, 9 Nov 2012 05:43:10 +0000 Subject: [PATCH] [x86] drm/i915: Only kick out vesafb if we takeover the fbcon with KMS (Closes: #686284) svn path=/dists/sid/linux/; revision=19487 --- debian/changelog | 2 ++ ...ck-out-vesafb-if-we-takeover-the-fbc.patch | 35 +++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 38 insertions(+) create mode 100644 debian/patches/bugfix/x86/drm-i915-Only-kick-out-vesafb-if-we-takeover-the-fbc.patch diff --git a/debian/changelog b/debian/changelog index 402d2ff01..4f3f95039 100644 --- a/debian/changelog +++ b/debian/changelog @@ -41,6 +41,8 @@ linux (3.2.33-1) UNRELEASED; urgency=low * udeb: Add bnx2fc, fnic, pmcraid to scsi-extra-modules * udeb: Move rtl8180 to nic-extra-modules * [x86] asus-laptop: Do not call HWRS on init (Closes: #692436) + * [x86] drm/i915: Only kick out vesafb if we takeover the fbcon with KMS + (Closes: #686284) -- Ben Hutchings Wed, 24 Oct 2012 14:15:57 +0100 diff --git a/debian/patches/bugfix/x86/drm-i915-Only-kick-out-vesafb-if-we-takeover-the-fbc.patch b/debian/patches/bugfix/x86/drm-i915-Only-kick-out-vesafb-if-we-takeover-the-fbc.patch new file mode 100644 index 000000000..7d057fffa --- /dev/null +++ b/debian/patches/bugfix/x86/drm-i915-Only-kick-out-vesafb-if-we-takeover-the-fbc.patch @@ -0,0 +1,35 @@ +From: Chris Wilson +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 +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 +Signed-off-by: Daniel Vetter +--- + 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)) diff --git a/debian/patches/series b/debian/patches/series index 5c48bce61..e2577480d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -405,3 +405,4 @@ debian/xfrm-avoid-ABI-change-in-3.2.31.patch bugfix/all/use-clamp_t-in-UNAME26-fix.patch debian/fs-writeback-avoid-ABI-change-in-3.2.32.patch bugfix/x86/asus-laptop-Do-not-call-HWRS-on-init.patch +bugfix/x86/drm-i915-Only-kick-out-vesafb-if-we-takeover-the-fbc.patch