diff options
| author | Jesse Barnes <jbarnes@virtuousgeek.org> | 2010-07-22 08:12:20 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2010-07-26 11:27:07 -0700 |
| commit | aebf0dafee1a0a22b3d25db8107c6479db4aaebe (patch) | |
| tree | fc16bbf62cdb556f165bf569931e381330e1a6c4 | |
| parent | e7b96f28c58ca09f15f6c2e8ccbb889a30fab4f7 (diff) | |
| download | linux-3.10-aebf0dafee1a0a22b3d25db8107c6479db4aaebe.tar.gz linux-3.10-aebf0dafee1a0a22b3d25db8107c6479db4aaebe.tar.bz2 linux-3.10-aebf0dafee1a0a22b3d25db8107c6479db4aaebe.zip | |
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 <jbarnes@virtuousgeek.org>
Signed-off-by: Eric Anholt <eric@anholt.net>
| -rw-r--r-- | drivers/gpu/drm/i915/i915_dma.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c index f00c5ae9556..2305a1234f1 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); } |