From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Wed, 24 Jun 2015 15:03:44 +0000 (-0700)
Subject: 4.0-stable patches
X-Git-Tag: v3.10.82~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ef96bc07de496fabe592b31835b74533092271ce;p=thirdparty%2Fkernel%2Fstable-queue.git

4.0-stable patches

added patches:
	drm-radeon-add-radeon_info_va_unmap_working-query.patch
---

diff --git a/queue-4.0/drm-radeon-add-radeon_info_va_unmap_working-query.patch b/queue-4.0/drm-radeon-add-radeon_info_va_unmap_working-query.patch
new file mode 100644
index 00000000000..b488772e0a3
--- /dev/null
+++ b/queue-4.0/drm-radeon-add-radeon_info_va_unmap_working-query.patch
@@ -0,0 +1,46 @@
+From 3bc980bf19bb62007e923691fa2869ba113be895 Mon Sep 17 00:00:00 2001
+From: Michel Dänzer <michel.daenzer@amd.com>
+Date: Tue, 16 Jun 2015 17:28:16 +0900
+Subject: drm/radeon: Add RADEON_INFO_VA_UNMAP_WORKING query
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: Michel Dänzer <michel.daenzer@amd.com>
+
+commit 3bc980bf19bb62007e923691fa2869ba113be895 upstream.
+
+This tells userspace that it's safe to use the RADEON_VA_UNMAP operation
+of the DRM_RADEON_GEM_VA ioctl.
+
+Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
+Signed-off-by: Christian König <christian.koenig@amd.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/gpu/drm/radeon/radeon_kms.c |    3 +++
+ include/uapi/drm/radeon_drm.h       |    1 +
+ 2 files changed, 4 insertions(+)
+
+--- a/drivers/gpu/drm/radeon/radeon_kms.c
++++ b/drivers/gpu/drm/radeon/radeon_kms.c
+@@ -547,6 +547,9 @@ static int radeon_info_ioctl(struct drm_
+ 		else
+ 			*value = 1;
+ 		break;
++	case RADEON_INFO_VA_UNMAP_WORKING:
++		*value = true;
++		break;
+ 	default:
+ 		DRM_DEBUG_KMS("Invalid request %d\n", info->request);
+ 		return -EINVAL;
+--- a/include/uapi/drm/radeon_drm.h
++++ b/include/uapi/drm/radeon_drm.h
+@@ -1034,6 +1034,7 @@ struct drm_radeon_cs {
+ #define RADEON_INFO_VRAM_USAGE		0x1e
+ #define RADEON_INFO_GTT_USAGE		0x1f
+ #define RADEON_INFO_ACTIVE_CU_COUNT	0x20
++#define RADEON_INFO_VA_UNMAP_WORKING	0x25
+ 
+ struct drm_radeon_info {
+ 	uint32_t		request;
diff --git a/queue-4.0/series b/queue-4.0/series
index 0ff27f821c3..45fd487d495 100644
--- a/queue-4.0/series
+++ b/queue-4.0/series
@@ -10,3 +10,4 @@ iser-target-fix-possible-use-after-free.patch
 drm-mgag200-reject-non-character-cell-aligned-mode-widths.patch
 drm-i915-always-reset-vma-ggtt_view.pages-cache-on-unbinding.patch
 revert-drm-i915-don-t-skip-request-retirement-if-the-active-list-is-empty.patch
+drm-radeon-add-radeon_info_va_unmap_working-query.patch