OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e7b96f2
)
drm/i915: don't free non-existent compressed llb on ILK+
author
Jesse Barnes
<jbarnes@virtuousgeek.org>
Thu, 22 Jul 2010 15:12:20 +0000
(08:12 -0700)
committer
Eric Anholt
<eric@anholt.net>
Mon, 26 Jul 2010 18:27:07 +0000
(11:27 -0700)
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>
drivers/gpu/drm/i915/i915_dma.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/i915/i915_dma.c
b/drivers/gpu/drm/i915/i915_dma.c
index
f00c5ae
..
2305a12
100644
(file)
--- 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);
}