[Intel-gfx] [PATCH 2/2] drm/i915: get clock config when checking CRTC state too

[Jesse Barnes]

We need to get the current hw state so we can compare against the
expected state.

References: https://bugs.freedesktop.org/show_bug.cgi?id=66444

Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>
---
 drivers/gpu/drm/i915/intel_display.c |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index f1eaf8e..6b0013c 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -8377,8 +8377,12 @@ check_crtc_state(struct drm_device *dev)
 				    base.head) {
 			if (encoder->base.crtc != &crtc->base)
 				continue;
-			if (encoder->get_config)
+			if (encoder->get_config &&
+			    dev_priv->display.get_clock) {
 				encoder->get_config(encoder, &pipe_config);
+				dev_priv->display.get_clock(crtc,
+							    &pipe_config);
+			}
 		}
 
 		WARN(crtc->active != active,
-- 
1.7.9.5