From: Jesse Barnes Date: Thu, 22 Jul 2010 15:12:20 +0000 (-0700) Subject: drm/i915: don't free non-existent compressed llb on ILK+ X-Git-Tag: v2.6.35~33^2~3 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=aebf0dafee1a0a22b3d25db8107c6479db4aaebe;p=platform%2Fkernel%2Flinux-stable.git drm/i915: don't free non-existent compressed llb on ILK+ We should only free the compressed llb if we allocated it in the first place otherwise we'll panic at unload time. Signed-off-by: Jesse Barnes Signed-off-by: Eric Anholt --- diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c index f00c5ae..2305a12 100644 --- a/drivers/gpu/drm/i915/i915_dma.c +++ b/drivers/gpu/drm/i915/i915_dma.c @@ -1300,7 +1300,7 @@ static void i915_cleanup_compression(struct drm_device *dev) struct drm_i915_private *dev_priv = dev->dev_private; drm_mm_put_block(dev_priv->compressed_fb); - if (!IS_GM45(dev)) + if (dev_priv->compressed_llb) drm_mm_put_block(dev_priv->compressed_llb); }