diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2009-02-20 17:52:20 +0000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-02-23 10:06:30 +1000 |
| commit | bab2d1f6531657e37dc84f26184f3f64e1e73ecd (patch) | |
| tree | bc55f7e0f38d71dce6714b91d0dab972ab0b81e0 /drivers/gpu | |
| parent | f21289b355cee8738d80c2ae5cbd272c3f7b5689 (diff) | |
| download | linux-3.10-bab2d1f6531657e37dc84f26184f3f64e1e73ecd.tar.gz linux-3.10-bab2d1f6531657e37dc84f26184f3f64e1e73ecd.tar.bz2 linux-3.10-bab2d1f6531657e37dc84f26184f3f64e1e73ecd.zip | |
drm/i915: Fix regression in 95ca9d
The object is dereferenced before the NULL check. Oops.
Fixes http://bugs.freedesktop.org/show_bug.cgi?id=20235
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 8b50d482038..25b337438ca 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -3143,16 +3143,20 @@ static void i915_gem_cleanup_hws(struct drm_device *dev) { drm_i915_private_t *dev_priv = dev->dev_private; - struct drm_gem_object *obj = dev_priv->hws_obj; - struct drm_i915_gem_object *obj_priv = obj->driver_private; + struct drm_gem_object *obj; + struct drm_i915_gem_object *obj_priv; if (dev_priv->hws_obj == NULL) return; + obj = dev_priv->hws_obj; + obj_priv = obj->driver_private; + kunmap(obj_priv->page_list[0]); i915_gem_object_unpin(obj); drm_gem_object_unreference(obj); dev_priv->hws_obj = NULL; + memset(&dev_priv->hws_map, 0, sizeof(dev_priv->hws_map)); dev_priv->hw_status_page = NULL; |