From: Ville Syrjälä <ville.syrj...@linux.intel.com>

The clock readout for DDI encoders needs to moved into the encoders.
To that end intel_dpll_readout_hw_state() needs to happen after
the encoder readout as otherwise it can't correctly populate
the PLL crtc_mask/active_mask bitmasks.

Signed-off-by: Ville Syrjälä <ville.syrj...@linux.intel.com>
---
 drivers/gpu/drm/i915/display/intel_display.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_display.c 
b/drivers/gpu/drm/i915/display/intel_display.c
index d0da88751c72..b34620545d3b 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -13444,8 +13444,6 @@ static void intel_modeset_readout_hw_state(struct 
drm_device *dev)
 
        readout_plane_state(dev_priv);
 
-       intel_dpll_readout_hw_state(dev_priv);
-
        for_each_intel_encoder(dev, encoder) {
                pipe = 0;
 
@@ -13480,6 +13478,8 @@ static void intel_modeset_readout_hw_state(struct 
drm_device *dev)
                            pipe_name(pipe));
        }
 
+       intel_dpll_readout_hw_state(dev_priv);
+
        drm_connector_list_iter_begin(dev, &conn_iter);
        for_each_intel_connector_iter(connector, &conn_iter) {
                if (connector->get_hw_state(connector)) {
-- 
2.26.2

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Reply via email to