aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2009-02-11 09:26:34 -0500
committerDave Airlie <airlied@redhat.com>2009-02-19 21:21:11 -0500
commit3eb2ee77b0b6b7b2c10308d7b46d2a459fb5be10 (patch)
tree6225c9ec55db8d7bbd4339da2b75e20494e85d03 /drivers
parent47ed185a777632063d2748f59d14ec6fdeb26f67 (diff)
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')
-rw-r--r--drivers/gpu/drm/i915/i915_gem.c1
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)
3106 if (dev_priv->hw_status_page == NULL) { 3106 if (dev_priv->hw_status_page == NULL) {
3107 DRM_ERROR("Failed to map status page.\n"); 3107 DRM_ERROR("Failed to map status page.\n");
3108 memset(&dev_priv->hws_map, 0, sizeof(dev_priv->hws_map)); 3108 memset(&dev_priv->hws_map, 0, sizeof(dev_priv->hws_map));
3109 i915_gem_object_unpin(obj);
3109 drm_gem_object_unreference(obj); 3110 drm_gem_object_unreference(obj);
3110 return -EINVAL; 3111 return -EINVAL;
3111 } 3112 }