From 5be1eaaca41c2cf9ecadd93e645753a8aba22d82 Mon Sep 17 00:00:00 2001 From: Jesse Barnes Date: Thu, 22 Jul 2010 08:12:20 -0700 Subject: [PATCH] --- yaml --- r: 201249 b: refs/heads/master c: aebf0dafee1a0a22b3d25db8107c6479db4aaebe h: refs/heads/master i: 201247: ad5d169ee34640daa50ddffc455a8b9d0d2087d7 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/i915_dma.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 56656611b612..69ae4ec0e460 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e7b96f28c58ca09f15f6c2e8ccbb889a30fab4f7 +refs/heads/master: aebf0dafee1a0a22b3d25db8107c6479db4aaebe diff --git a/trunk/drivers/gpu/drm/i915/i915_dma.c b/trunk/drivers/gpu/drm/i915/i915_dma.c index f00c5ae9556c..2305a1234f1e 100644 --- a/trunk/drivers/gpu/drm/i915/i915_dma.c +++ b/trunk/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); }