From 226576aafeaaa0f7efa845b39594faa85bf92319 Mon Sep 17 00:00:00 2001 From: Sean Paul Date: Wed, 16 May 2012 13:25:22 -0400 Subject: [PATCH] CHROMIUM: drm/i915: Replace pin count BUG_ON with warning MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This patch reduces the BUG_ON when pin_count reaches max to a warning. The reason we want to just warn is because the unpin_work_fn work function can get starved out during soft lockup. When the unpin worker is starved, the pin_count rises, and the gem BUG_ON races the soft lockup crash reporter. The original intent of this BUG was to catch overflow cases when all of the small bitfields in drm_i915_gem_object were combined into one bitfield (commit 778c35444). Since pin leaks aren't an issue in steady state, it should be fine to downgrade the error. Signed-off-by: Sean Paul BUG=chrome-os-partner:8552,chromium-os:30733 TEST=Tested on lumpy Change-Id: Ibd7377385f36a722b588cfe4989b3e26d2647bd2 Reviewed-on: https://gerrit.chromium.org/gerrit/22829 Reviewed-by: Stéphane Marchesin Tested-by: Sean Paul Commit-Ready: Sean Paul --- drivers/gpu/drm/i915/i915_gem.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index ee5189070d0b..686e5f116a29 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -3317,7 +3317,10 @@ i915_gem_object_pin(struct drm_i915_gem_object *obj, struct drm_i915_private *dev_priv = dev->dev_private; int ret; - BUG_ON(obj->pin_count == DRM_I915_GEM_OBJECT_MAX_PIN_COUNT); + if (obj->pin_count == DRM_I915_GEM_OBJECT_MAX_PIN_COUNT) { + WARN(obj->pin_count, "pin count has reached its max\n"); + return -ENOSPC; + } WARN_ON(i915_verify_lists(dev)); if (obj->gtt_space != NULL) { -- 2.20.1