drm/i915: improve modeset state checking after dpms calls
Now that we have solid modeset state tracking and checking code in
place, we can do the Full Monty also after dpms calls.
Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index d15fa0c..44318bf 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -3585,7 +3585,7 @@
/* Cross check the actual hw state with our own modeset state tracking (and it's
* internal consistency). */
-void intel_connector_check_state(struct intel_connector *connector)
+static void intel_connector_check_state(struct intel_connector *connector)
{
if (connector->get_hw_state(connector)) {
struct intel_encoder *encoder = connector->encoder;
@@ -3639,7 +3639,7 @@
else
WARN_ON(encoder->connectors_active != false);
- intel_connector_check_state(to_intel_connector(connector));
+ intel_modeset_check_state(connector->dev);
}
/* Simple connector->get_hw_state implementation for encoders that support only
@@ -6872,7 +6872,7 @@
base.head) \
if (mask & (1 <<(intel_crtc)->pipe)) \
-static void
+void
intel_modeset_check_state(struct drm_device *dev)
{
struct intel_crtc *crtc;