Browse Source

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>
Chris Wilson 16 years ago
parent
commit
3eb2ee77b0
1 changed files with 1 additions and 0 deletions
  1. 1 0
      drivers/gpu/drm/i915/i915_gem.c

+ 1 - 0
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) {
 	if (dev_priv->hw_status_page == NULL) {
 		DRM_ERROR("Failed to map status page.\n");
 		DRM_ERROR("Failed to map status page.\n");
 		memset(&dev_priv->hws_map, 0, sizeof(dev_priv->hws_map));
 		memset(&dev_priv->hws_map, 0, sizeof(dev_priv->hws_map));
+		i915_gem_object_unpin(obj);
 		drm_gem_object_unreference(obj);
 		drm_gem_object_unreference(obj);
 		return -EINVAL;
 		return -EINVAL;
 	}
 	}