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

Commit 9953599b authored by Daniel Vetter's avatar Daniel Vetter Committed by Jani Nikula
Browse files

drm/i915: Don't check gmch state on inherited configs 

... our current modeset code isn't good enough yet to handle this. The
scenario is:

1. BIOS sets up a cloned config with lvds+external screen on the same
pipe, e.g. pipe B.

2. We read out that state for pipe B and assign the gmch_pfit state to
it.

3. The initial modeset switches the lvds to pipe A but due to lack of
atomic modeset we don't recompute the config of pipe B.

-> both pipes now claim (in the sw pipe config structure) to use the
gmch_pfit, which just won't work.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=74081


Tested-by: default avatarmax <manikulin@gmail.com>
Cc: Alan Stern <stern@rowland.harvard.edu>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parent 40478455

drivers/gpu/drm/i915/intel_display.c

+18 −5
Original line number Diff line number Diff line
@@ -9654,11 +9654,22 @@ intel_pipe_config_compare(struct drm_device *dev, 
	PIPE_CONF_CHECK_I(pipe_src_w);

	PIPE_CONF_CHECK_I(pipe_src_h);



	/*

	 * FIXME: BIOS likes to set up a cloned config with lvds+external

	 * screen. Since we don't yet re-compute the pipe config when moving

	 * just the lvds port away to another pipe the sw tracking won't match.

	 *

	 * Proper atomic modesets with recomputed global state will fix this.

	 * Until then just don't check gmch state for inherited modes.

	 */

	if (!PIPE_CONF_QUIRK(PIPE_CONFIG_QUIRK_INHERITED_MODE)) {

		PIPE_CONF_CHECK_I(gmch_pfit.control);

		/* pfit ratios are autocomputed by the hw on gen4+ */

		if (INTEL_INFO(dev)->gen < 4)

			PIPE_CONF_CHECK_I(gmch_pfit.pgm_ratios);

		PIPE_CONF_CHECK_I(gmch_pfit.lvds_border_bits);

	}



	PIPE_CONF_CHECK_I(pch_pfit.enabled);

	if (current_config->pch_pfit.enabled) {

		PIPE_CONF_CHECK_I(pch_pfit.pos);
@@ -11616,6 +11627,8 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev) 
			    base.head) {

		memset(&crtc->config, 0, sizeof(crtc->config));



		crtc->config.quirks |= PIPE_CONFIG_QUIRK_INHERITED_MODE;



		crtc->active = dev_priv->display.get_pipe_config(crtc,

								 &crtc->config);

drivers/gpu/drm/i915/intel_drv.h

+2 −1
Original line number Diff line number Diff line
@@ -237,6 +237,7 @@ struct intel_crtc_config { 
	 * accordingly.

	 */

#define PIPE_CONFIG_QUIRK_MODE_SYNC_FLAGS	(1<<0) /* unreliable sync mode.flags */

#define PIPE_CONFIG_QUIRK_INHERITED_MODE	(1<<1) /* mode inherited from firmware */

	unsigned long quirks;



	/* User requested mode, only valid as a starting point to