aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorManasi Navare <[email protected]>2021-07-14 15:34:14 -0700
committerManasi Navare <[email protected]>2021-07-20 16:25:07 -0700
commit76e50ea054ae2369040494208a4099eee70cc5c3 (patch)
tree795192d3b3841345d65395e7397eda380c3a25f7
parent425057e725934b46760b0386b18bb4eb8ee066a7 (diff)
drm/i915/display: Fix shared dpll mismatch for bigjoiner slave
Currently when we do the HW state readout, we dont set the shared dpll to NULL for the bigjoiner slave which should not have a DPLL assigned. So it has some garbage while the HW state readout is NULL. So explicitly reset the shared dpll for bigjoiner slave pipe. Bug: https://gitlab.freedesktop.org/drm/intel/-/issues/3465 Cc: Ville Syrjälä <[email protected]> Cc: Ankit Nautiyal <[email protected]> Tested-by: Swati Sharma <[email protected]> Signed-off-by: Manasi Navare <[email protected]> Reviewed-by: Ankit Nautiyal <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
-rw-r--r--drivers/gpu/drm/i915/display/intel_display.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index 588b8ebe3020..834d285b6477 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -9003,6 +9003,10 @@ verify_crtc_state(struct intel_crtc *crtc,
if (!new_crtc_state->hw.active)
return;
+ if (new_crtc_state->bigjoiner_slave)
+ /* No PLLs set for slave */
+ pipe_config->shared_dpll = NULL;
+
intel_pipe_config_sanity_check(dev_priv, pipe_config);
if (!intel_pipe_config_compare(new_crtc_state,