From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Wed, 18 Dec 2013 01:27:07 +0000 (-0800)
Subject: 3.12-stable patches
X-Git-Tag: v3.4.75~48
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6e0d36eeedebe1e8bce48f7a2662a0afa87a072c;p=thirdparty%2Fkernel%2Fstable-queue.git

3.12-stable patches

added patches:
	udl-fix-issue-with-imported-prime-buffers.patch
---

diff --git a/queue-3.12/series b/queue-3.12/series
index 13d4794555d..825ea040661 100644
--- a/queue-3.12/series
+++ b/queue-3.12/series
@@ -1 +1,2 @@
 arm64-mm-fix-pmd_sect_prot_none-definition.patch
+udl-fix-issue-with-imported-prime-buffers.patch
diff --git a/queue-3.12/udl-fix-issue-with-imported-prime-buffers.patch b/queue-3.12/udl-fix-issue-with-imported-prime-buffers.patch
new file mode 100644
index 00000000000..c560c8c7456
--- /dev/null
+++ b/queue-3.12/udl-fix-issue-with-imported-prime-buffers.patch
@@ -0,0 +1,36 @@
+From 1d507b3af40a60e03a3bbc4c897fc2709c075d24 Mon Sep 17 00:00:00 2001
+From: Rob Clark <robdclark@gmail.com>
+Date: Wed, 4 Dec 2013 08:45:43 -0500
+Subject: udl: fix issue with imported prime buffers
+
+From: Rob Clark <robdclark@gmail.com>
+
+commit 1d507b3af40a60e03a3bbc4c897fc2709c075d24 upstream.
+
+5dc9e1e8 was a bit over-ambitious, and accidentially removed handling
+for imported prime buffers.
+
+Signed-off-by: Rob Clark <robdclark@gmail.com>
+Signed-off-by: Dave Airlie <airlied@redhat.com>
+Cc: Thomas Meyer <thomas@m3y3r.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/gpu/drm/udl/udl_gem.c |    6 ++++++
+ 1 file changed, 6 insertions(+)
+
+--- a/drivers/gpu/drm/udl/udl_gem.c
++++ b/drivers/gpu/drm/udl/udl_gem.c
+@@ -132,6 +132,12 @@ static int udl_gem_get_pages(struct udl_
+ 
+ static void udl_gem_put_pages(struct udl_gem_object *obj)
+ {
++	if (obj->base.import_attach) {
++		drm_free_large(obj->pages);
++		obj->pages = NULL;
++		return;
++	}
++
+ 	drm_gem_put_pages(&obj->base, obj->pages, false, false);
+ 	obj->pages = NULL;
+ }