[ 126/171] drm/i915: Reduce a pin-leak BUG into a WARN
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: 2013-01-15 23:29:28
Also in:
lkml
3.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Chris Wilson <redacted> commit 7e81a42e341a4f15d76624b7c02ffb21b085b56f upstream. Pin-leaks persist and we get the perennial bug reports of machine lockups to the BUG_ON(pin_count==MAX). If we instead loudly report that the object cannot be pinned at that time it should prevent the driver from locking up, and hopefully restore a semblance of working whilst still leaving us a OOPS to debug. Signed-off-by: Chris Wilson <redacted> Signed-off-by: Daniel Vetter <redacted> [bwh: Backported to 3.2: adjust context] Signed-off-by: Ben Hutchings <redacted> Signed-off-by: Julien Cristau <redacted> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- drivers/gpu/drm/i915/i915_gem.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c@@ -3318,7 +3318,8 @@ i915_gem_object_pin(struct drm_i915_gem_ struct drm_i915_private *dev_priv = dev->dev_private; 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; WARN_ON(i915_verify_lists(dev)); if (obj->gtt_space != NULL) {