git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs...
[pandora-kernel.git]
/
drivers
/
gpu
/
drm
/
i915
/
i915_gem_tiling.c
diff --git
a/drivers/gpu/drm/i915/i915_gem_tiling.c
b/drivers/gpu/drm/i915/i915_gem_tiling.c
index
281ad3d
..
82d70fd
100644
(file)
--- a/
drivers/gpu/drm/i915/i915_gem_tiling.c
+++ b/
drivers/gpu/drm/i915/i915_gem_tiling.c
@@
-92,7
+92,7
@@
i915_gem_detect_bit_6_swizzle(struct drm_device *dev)
uint32_t swizzle_x = I915_BIT_6_SWIZZLE_UNKNOWN;
uint32_t swizzle_y = I915_BIT_6_SWIZZLE_UNKNOWN;
- if (I
S_GEN5(dev) || IS_GEN6(dev)
) {
+ if (I
NTEL_INFO(dev)->gen >= 5
) {
/* On Ironlake whatever DRAM config, GPU always do
* same swizzling setup.
*/