From 9bd139461bdf8f24997848dacd7db9136c18cc2a Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Thu, 5 Nov 2009 15:30:35 -0800 Subject: [PATCH] --- yaml --- r: 185611 b: refs/heads/master c: c2416fc6bb16fa87bcc4b9d90a7632f3531bdee6 h: refs/heads/master i: 185609: 56b1453a8c3b24a3c90ed397ebbfd358a001ef96 185607: 9a03b1b79d718142fd6cdde1d955685e9b6b9724 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/intel_display.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index a2b67910c933..89fa231b5e2d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e3deb204c69c485c88c990f07b71be10a464e508 +refs/heads/master: c2416fc6bb16fa87bcc4b9d90a7632f3531bdee6 diff --git a/trunk/drivers/gpu/drm/i915/intel_display.c b/trunk/drivers/gpu/drm/i915/intel_display.c index ce28f18e0852..3fe90730b0ff 100644 --- a/trunk/drivers/gpu/drm/i915/intel_display.c +++ b/trunk/drivers/gpu/drm/i915/intel_display.c @@ -3419,7 +3419,7 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc, intel_wait_for_vblank(dev); - if (HAS_PCH_SPLIT(dev)) { + if (IS_IRONLAKE(dev)) { /* enable address swizzle for tiling buffer */ temp = I915_READ(DISP_ARB_CTL); I915_WRITE(DISP_ARB_CTL, temp | DISP_TILE_SURFACE_SWIZZLING);