Bug#687442: Further patches for 3.4 DRM in wheezy

[Ben Hutchings <ben@decadent.org.uk>]

bugfix/x86/drm-i915-Only-kick-out-vesafb-if-we-takeover-the-fbc.patch
needs to be refreshed; attached.

An additional patch
(debian/revert-vm-add-vm_munmap-helper-function.patch) is needed to
build the i810 driver (which is i386-only); attached.

Ben.

-- 
Ben Hutchings
Computers are not intelligent.	They only think they are.

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
@@ -1999,7 +1999,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);
 
 	pci_set_master(dev->pdev);
 

From: Ben Hutchings <ben@decadent.org.uk>
Subject: Revert "VM: add vm_munmap() helper function" in i810
Date: Sun, 02 Dec 2012 23:49:49 +0000

This reverts commit a46ef99d80817a167477ed1c8b4d90ee0c2e726f 'VM: add
"vm_munmap()" helper function' and commit
bfce281c287a427d0841fadf5d59242757b4e620 'kill mm argument of
vm_munmap()' in drivers/gpu/drm/i810/i810_dma.c

--- a/drivers/gpu/drm/i810/i810_dma.c
+++ b/drivers/gpu/drm/i810/i810_dma.c
@@ -157,8 +157,11 @@
 	if (buf_priv->currently_mapped != I810_BUF_MAPPED)
 		return -EINVAL;
 
-	retcode = vm_munmap((unsigned long)buf_priv->virtual,
+	down_write(&current->mm->mmap_sem);
+	retcode = do_munmap(current->mm,
+			    (unsigned long)buf_priv->virtual,
 			    (size_t) buf->total);
+	up_write(&current->mm->mmap_sem);
 
 	buf_priv->currently_mapped = I810_BUF_UNMAPPED;
 	buf_priv->virtual = NULL;

Attachment: signature.asc
Description: This is a digitally signed message part