summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2011-03-30 13:01:06 -0700
committerKeith Packard <keithp@keithp.com>2011-05-10 13:56:36 -0700
commitdb244b60e7f7f11825c6f36bcc8e8d8f3ca7cd36 (patch)
tree2d107df97c9fc3ea8d0d61952e0b4f2d5689b39e /drivers/gpu/drm/i915
parentc713bb087e714f01082e6b8a85e98552e7bc6c3a (diff)
downloadtalos-op-linux-db244b60e7f7f11825c6f36bcc8e8d8f3ca7cd36.tar.gz
talos-op-linux-db244b60e7f7f11825c6f36bcc8e8d8f3ca7cd36.zip
drm/i915: Drop the remaining bit of Ironlake code from i9xx_crtc_mode_set().
Signed-off-by: Eric Anholt <eric@anholt.net> Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'drivers/gpu/drm/i915')
-rw-r--r--drivers/gpu/drm/i915/intel_display.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 08ff2f0b9322..a0d5a1a039e0 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -4899,12 +4899,6 @@ static int i9xx_crtc_mode_set(struct drm_crtc *crtc,
intel_wait_for_vblank(dev, pipe);
- if (IS_GEN5(dev)) {
- /* enable address swizzle for tiling buffer */
- temp = I915_READ(DISP_ARB_CTL);
- I915_WRITE(DISP_ARB_CTL, temp | DISP_TILE_SURFACE_SWIZZLING);
- }
-
I915_WRITE(DSPCNTR(plane), dspcntr);
POSTING_READ(DSPCNTR(plane));
OpenPOWER on IntegriCloud