Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d7bf63f2 authored by Damien Lespiau's avatar Damien Lespiau Committed by Daniel Vetter
Browse files

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: default avatarDamien Lespiau <damien.lespiau@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent bb2043de

drivers/gpu/drm/i915/intel_display.c

+5 −2
Original line number Diff line number Diff line
@@ -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))) {