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

Commit e41a56be authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Daniel Vetter
Browse files

drm/i915: Don't populate pipe_src_{w,h} multiple times 



If we ever end up doing the retry loop due to bandwidth constraints, we
would rewrite pipe_src_{w,n} based on adjusted_mode timings. But by that
time the encoder may have already replaced the adjusted_mode with a
fixed panel mode, which would then corrupt pipe_src_{w,h}.

v2: Use requested_mode and slap on a big comment from Daniel

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent e4916946

drivers/gpu/drm/i915/intel_display.c

+12 −4
Original line number Diff line number Diff line
@@ -8529,6 +8529,18 @@ intel_modeset_pipe_config(struct drm_crtc *crtc, 
	if (plane_bpp < 0)

		goto fail;



	/*

	 * Determine the real pipe dimensions. Note that stereo modes can

	 * increase the actual pipe size due to the frame doubling and

	 * insertion of additional space for blanks between the frame. This

	 * is stored in the crtc timings. We use the requested mode to do this

	 * computation to clearly distinguish it from the adjusted mode, which

	 * can be changed by the connectors in the below retry loop.

	 */

	drm_mode_set_crtcinfo(&pipe_config->requested_mode, CRTC_STEREO_DOUBLE);

	pipe_config->pipe_src_w = pipe_config->requested_mode.crtc_hdisplay;

	pipe_config->pipe_src_h = pipe_config->requested_mode.crtc_vdisplay;



encoder_retry:

	/* Ensure the port clock defaults are reset when retrying. */

	pipe_config->port_clock = 0;
@@ -8537,10 +8549,6 @@ intel_modeset_pipe_config(struct drm_crtc *crtc, 
	/* Fill in default crtc timings, allow encoders to overwrite them. */

	drm_mode_set_crtcinfo(&pipe_config->adjusted_mode, CRTC_STEREO_DOUBLE);



	/* set_crtcinfo() may have adjusted hdisplay/vdisplay */

	pipe_config->pipe_src_w = pipe_config->adjusted_mode.crtc_hdisplay;

	pipe_config->pipe_src_h = pipe_config->adjusted_mode.crtc_vdisplay;



	/* Pass our mode to the connectors and the CRTC to give them a chance to

	 * adjust it according to limitations or connector properties, and also

	 * a chance to reject the mode entirely.