diff options
author | Paul Mundt <lethal@linux-sh.org> | 2009-05-03 04:24:55 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2009-05-03 04:24:55 -0400 |
commit | 66fdc951720406deb3b0f17094cb16ec623f525d (patch) | |
tree | 24f0ea4cc5d563e4e11cb3bdeb0ca86dd28e8cb6 /drivers/gpu/drm/i915/i915_gem_tiling.c | |
parent | f425752fc66acf1d4e47970ea704ed7d31c14173 (diff) | |
parent | 7d27558c4138ac6b3684dea35c2f4379b940a7dd (diff) |
Merge branch 'timers/clocksource' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem_tiling.c')
-rw-r--r-- | drivers/gpu/drm/i915/i915_gem_tiling.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem_tiling.c b/drivers/gpu/drm/i915/i915_gem_tiling.c index f27e523c764..52a059354e8 100644 --- a/drivers/gpu/drm/i915/i915_gem_tiling.c +++ b/drivers/gpu/drm/i915/i915_gem_tiling.c | |||
@@ -283,7 +283,6 @@ i915_gem_set_tiling(struct drm_device *dev, void *data, | |||
283 | mutex_lock(&dev->struct_mutex); | 283 | mutex_lock(&dev->struct_mutex); |
284 | 284 | ||
285 | if (args->tiling_mode == I915_TILING_NONE) { | 285 | if (args->tiling_mode == I915_TILING_NONE) { |
286 | obj_priv->tiling_mode = I915_TILING_NONE; | ||
287 | args->swizzle_mode = I915_BIT_6_SWIZZLE_NONE; | 286 | args->swizzle_mode = I915_BIT_6_SWIZZLE_NONE; |
288 | } else { | 287 | } else { |
289 | if (args->tiling_mode == I915_TILING_X) | 288 | if (args->tiling_mode == I915_TILING_X) |