With the combination of ->enable and ->active it's a bit complicated
to follow what exactly is going on sometimes within a full modeset.
Add debug output to make this all traceable.

Signed-off-by: Daniel Vetter <daniel.vet...@intel.com>
---
 drivers/gpu/drm/drm_atomic_helper.c | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/drm_atomic_helper.c 
b/drivers/gpu/drm/drm_atomic_helper.c
index b67754035fec..b7ac83555b11 100644
--- a/drivers/gpu/drm/drm_atomic_helper.c
+++ b/drivers/gpu/drm/drm_atomic_helper.c
@@ -591,6 +591,9 @@ disable_outputs(struct drm_device *dev, struct 
drm_atomic_state *old_state)
 
                funcs = encoder->helper_private;
 
+               DRM_DEBUG_KMS("disabling [ENCODER:%d:%s]\n",
+                             encoder->base.id, encoder->name);
+
                /*
                 * Each encoder has at most one connector (since we always steal
                 * it away), so we won't call call disable hooks twice.
@@ -627,6 +630,10 @@ disable_outputs(struct drm_device *dev, struct 
drm_atomic_state *old_state)
 
                funcs = crtc->helper_private;
 
+               DRM_DEBUG_KMS("disabling [CRTC:%d]\n",
+                             crtc->base.id);
+
+
                /* Right function depends upon target state. */
                if (crtc->state->enable && funcs->prepare)
                        funcs->prepare(crtc);
@@ -707,8 +714,12 @@ crtc_set_mode(struct drm_device *dev, struct 
drm_atomic_state *old_state)
 
                funcs = crtc->helper_private;
 
-               if (crtc->state->enable)
+               if (crtc->state->enable) {
+                       DRM_DEBUG_KMS("modeset on [CRTC:%d]\n",
+                                     crtc->base.id);
+
                        funcs->mode_set_nofb(crtc);
+               }
        }
 
        for (i = 0; i < old_state->num_connector; i++) {
@@ -732,6 +743,9 @@ crtc_set_mode(struct drm_device *dev, struct 
drm_atomic_state *old_state)
                if (!new_crtc_state->mode_changed)
                        continue;
 
+               DRM_DEBUG_KMS("modeset on [ENCODER:%d:%s]\n",
+                             encoder->base.id, encoder->name);
+
                /*
                 * Each encoder has at most one connector (since we always steal
                 * it away), so we won't call call mode_set hooks twice.
@@ -793,6 +807,9 @@ void drm_atomic_helper_commit_post_planes(struct drm_device 
*dev,
                funcs = crtc->helper_private;
 
                if (crtc->state->enable) {
+                       DRM_DEBUG_KMS("enabling [CRTC:%d]\n",
+                                     crtc->base.id);
+
                        if (funcs->enable)
                                funcs->enable(crtc);
                        else
@@ -816,6 +833,9 @@ void drm_atomic_helper_commit_post_planes(struct drm_device 
*dev,
                encoder = connector->state->best_encoder;
                funcs = encoder->helper_private;
 
+               DRM_DEBUG_KMS("enabling [ENCODER:%d:%s]\n",
+                             encoder->base.id, encoder->name);
+
                /*
                 * Each encoder has at most one connector (since we always steal
                 * it away), so we won't call call enable hooks twice.
-- 
2.1.4

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

Reply via email to