From: Damien Lespiau Date: Mon, 30 Sep 2013 13:21:50 +0000 (+0100) Subject: drm/i915: Use adjusted_mode in the fastboot hack to disable pfit X-Git-Tag: v3.13-rc1~69^2~81^2~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d7bf63f2465b3b6335dd66ffbf387768d81a59d5;p=platform%2Fkernel%2Flinux-stable.git drm/i915: Use adjusted_mode in the fastboot hack to disable pfit When booting with i915.fastboot=1, we always take tha code path and end up undoing what we're trying to do with adjusted_mode. Hopefully, as the fastboot hardware readout code is using adjusted_mode as well, it should be equivalent. Signed-off-by: Damien Lespiau Signed-off-by: Daniel Vetter --- diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index fe86325..617b963 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -2334,9 +2334,12 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, int y, * then update the pipesrc and pfit state, even on the flip path. */ if (i915_fastboot) { + const struct drm_display_mode *adjusted_mode = + &intel_crtc->config.adjusted_mode; + I915_WRITE(PIPESRC(intel_crtc->pipe), - ((crtc->mode.hdisplay - 1) << 16) | - (crtc->mode.vdisplay - 1)); + ((adjusted_mode->crtc_hdisplay - 1) << 16) | + (adjusted_mode->crtc_vdisplay - 1)); if (!intel_crtc->config.pch_pfit.enabled && (intel_pipe_has_type(crtc, INTEL_OUTPUT_LVDS) || intel_pipe_has_type(crtc, INTEL_OUTPUT_EDP))) {