From: Damien Lespiau Date: Fri, 24 Oct 2014 23:11:11 +0000 (+0100) Subject: drm/i915: Remove unnecessary test on the gen in intel_do_mmio_flip() X-Git-Tag: MMI-PSA29.97-13-9~10979^2~64^2~129 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c5d974728fafc151e740638b4cf492958be78b5b;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git drm/i915: Remove unnecessary test on the gen in intel_do_mmio_flip() use_mmio_flip() makes sure we only enable MMIO flips on gen5+. So we don't need to take into account older devices. Signed-off-by: Damien Lespiau Reviewed-by: Chris Wilson Signed-off-by: Daniel Vetter --- diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 140bbefaac8d..46224c6307cb 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -9567,12 +9567,11 @@ static void intel_do_mmio_flip(struct intel_crtc *intel_crtc) reg = DSPCNTR(intel_crtc->plane); dspcntr = I915_READ(reg); - if (INTEL_INFO(dev)->gen >= 4) { - if (obj->tiling_mode != I915_TILING_NONE) - dspcntr |= DISPPLANE_TILED; - else - dspcntr &= ~DISPPLANE_TILED; - } + if (obj->tiling_mode != I915_TILING_NONE) + dspcntr |= DISPPLANE_TILED; + else + dspcntr &= ~DISPPLANE_TILED; + I915_WRITE(reg, dspcntr); I915_WRITE(DSPSURF(intel_crtc->plane),