[Intel-gfx] [PATCH] drm/i915: Clear DDI pll selection in intel_crtc_compute_config()

Ander Conselvan de Oliveira ander.conselvan.de.oliveira at intel.com
Wed Nov 11 08:41:54 PST 2015


Clear the pipe's dpll_hw_state when choosing the PLL for CRT on DDI
platforms. Otherwise stale values might cause the state checker to
complain.

Should fix errors like below:
[drm:intel_pipe_config_compare [i915]] *ERROR* mismatch in dpll_hw_state.wrpll

Cc: Gabriel Feceoru <gabriel.feceoru at intel.com>
Cc: Daniel Vetter <daniel at ffwll.ch>
Cc: Jani Nikula <jani.nikula at linux.intel.com>
Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira at intel.com>
---

*Completely untested*

 drivers/gpu/drm/i915/intel_crt.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c
index b84aaa0..ad099f3 100644
--- a/drivers/gpu/drm/i915/intel_crt.c
+++ b/drivers/gpu/drm/i915/intel_crt.c
@@ -278,6 +278,9 @@ static bool intel_crt_compute_config(struct intel_encoder *encoder,
 
 	/* FDI must always be 2.7 GHz */
 	if (HAS_DDI(dev)) {
+		memset(&pipe_config->dpll_hw_state, 0,
+		       sizeof(pipe_config->dpll_hw_state));
+
 		pipe_config->ddi_pll_sel = PORT_CLK_SEL_SPLL;
 		pipe_config->port_clock = 135000 * 2;
 	}
-- 
2.4.3



More information about the Intel-gfx mailing list