diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2009-02-11 15:26:34 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-02-20 03:21:11 +0100 |
| commit | 3eb2ee77b0b6b7b2c10308d7b46d2a459fb5be10 (patch) | |
| tree | 6225c9ec55db8d7bbd4339da2b75e20494e85d03 /drivers/gpu/drm | |
| parent | drm/i915: Unpin the ringbuffer if we fail to ioremap it. (diff) | |
| download | linux-3eb2ee77b0b6b7b2c10308d7b46d2a459fb5be10.tar.xz linux-3eb2ee77b0b6b7b2c10308d7b46d2a459fb5be10.zip | |
drm/i915: Unpin the hws if we fail to kmap.
A missing unpin on the error path.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Dave Airlie <airlied@linux.ie>
Diffstat (limited to 'drivers/gpu/drm')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index e5fc664337f3..fd4b4e268a22 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -3106,6 +3106,7 @@ i915_gem_init_hws(struct drm_device *dev) if (dev_priv->hw_status_page == NULL) { DRM_ERROR("Failed to map status page.\n"); memset(&dev_priv->hws_map, 0, sizeof(dev_priv->hws_map)); + i915_gem_object_unpin(obj); drm_gem_object_unreference(obj); return -EINVAL; } |