From: Dave Airlie <airlied@redhat.com>
Date: Wed, 30 Jul 2008 07:06:11 +0000 (+1000)
Subject: radeon: hack gem to get an offset back for Mesa.
X-Git-Tag: android-x86-1.6~141^2~105^2~5^2~41
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=fb5542aaa87aca9b6b312968abe0a6044812cf0e;p=android-x86%2Fexternal-libdrm.git

radeon: hack gem to get an offset back for Mesa.
---

diff --git a/linux-core/radeon_gem.c b/linux-core/radeon_gem.c
index 9d122ac5..e06cba5b 100644
--- a/linux-core/radeon_gem.c
+++ b/linux-core/radeon_gem.c
@@ -243,9 +243,12 @@ int radeon_gem_pin_ioctl(struct drm_device *dev, void *data,
 	DRM_DEBUG("got here %p %p %d\n", obj, obj_priv->bo, atomic_read(&obj_priv->bo->usage));
 	/* validate into a pin with no fence */
 
-	ret = drm_bo_do_validate(obj_priv->bo, 0, DRM_BO_FLAG_NO_EVICT,
-				 DRM_BO_HINT_DONT_FENCE,
-				 0, NULL);
+	if (!(obj_priv->bo->type != drm_bo_type_kernel && !DRM_SUSER(DRM_CURPROC))) {
+	  ret = drm_bo_do_validate(obj_priv->bo, 0, DRM_BO_FLAG_NO_EVICT,
+				   DRM_BO_HINT_DONT_FENCE,
+				   0, NULL);
+	} else
+	  ret = 0;
 
 	args->offset = obj_priv->bo->offset;
 	DRM_DEBUG("got here %p %p\n", obj, obj_priv->bo);