diff options
| author | Dave Airlie <airlied@gmail.com> | 2012-09-21 20:46:01 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@gmail.com> | 2012-09-21 20:46:01 +1000 |
| commit | 017a27e7f52346ca8de6fc776579fbcc8ea55b48 (patch) | |
| tree | a9e3906f6c967a27852c056a150147f71cf37190 /drivers/gpu/drm/i915/i915_gem.c | |
| parent | 6c06d608ec244d9b030f16ce9088b4456197e1cb (diff) | |
| parent | b98b60167279df3acac9422c3c9820d9ebbcf9fb (diff) | |
| download | linux-3.10-017a27e7f52346ca8de6fc776579fbcc8ea55b48.tar.gz linux-3.10-017a27e7f52346ca8de6fc776579fbcc8ea55b48.tar.bz2 linux-3.10-017a27e7f52346ca8de6fc776579fbcc8ea55b48.zip | |
Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel into drm-fixes
Daniel writes:
Essentially just flush my -fixes queue before I head off to xdc.
- gen2 regression fixer, we've enabled the lvds stuff too late. Not
causing any known issues, but this restores the sequence before a
refactor that landed in 3.5, and lvds is a fickle beast. And seriously,
who runs gen2 still ...
- downgrade a BUG to a WARN - we haven't root-caused/fixed the underlying
issue yet, but this should help bug reporters quite a bit.
- properly disable hdmi audio - we've lost track of this, which resulted
in the alsa driver again losing track of the unplug event.
* 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel:
drm/i915: HDMI - Clear Audio Enable bit for Hot Plug
drm/i915: Reduce a pin-leak BUG into a WARN
drm/i915: enable lvds pin pairs before dpll on gen2
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 489e2b162b2..274d25de521 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/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)) || |