From 0fe58be92d7895cd29976b57710447e5bf71203e Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Sat, 15 Sep 2012 09:41:57 +0100
Subject: [PATCH] --- yaml --- r: 323039 b: refs/heads/master c:
 7e81a42e341a4f15d76624b7c02ffb21b085b56f h: refs/heads/master i:   323037:
 8680f62817d2b3783e7f8fbeaafb24523e286c91   323035:
 394b8a1f66aaabed210c521e07ed4059d85d96e7   323031:
 a768dad48c80336ab6d381b413b6d8ec423f5992   323023:
 4f4cc80015b4dd50ae26fbfc389944b16313e88a   323007:
 b2f0c022c33901adb79298b99ea3f4a57c8ffb95 v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/gpu/drm/i915/i915_gem.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 1836ac1783a8..901cea227d6f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5b5896e4e1f353ef3dbc4e4e9ee44d53ccf105d7
+refs/heads/master: 7e81a42e341a4f15d76624b7c02ffb21b085b56f
diff --git a/trunk/drivers/gpu/drm/i915/i915_gem.c b/trunk/drivers/gpu/drm/i915/i915_gem.c
index 489e2b162b27..274d25de521e 100644
--- a/trunk/drivers/gpu/drm/i915/i915_gem.c
+++ b/trunk/drivers/gpu/drm/i915/i915_gem.c
@@ -3242,7 +3242,8 @@ i915_gem_object_pin(struct drm_i915_gem_object *obj,
 {
 	int ret;
 
-	BUG_ON(obj->pin_count == DRM_I915_GEM_OBJECT_MAX_PIN_COUNT);
+	if (WARN_ON(obj->pin_count == DRM_I915_GEM_OBJECT_MAX_PIN_COUNT))
+		return -EBUSY;
 
 	if (obj->gtt_space != NULL) {
 		if ((alignment && obj->gtt_offset & (alignment - 1)) ||