Merge tag 'drm-next-2021-08-31-1' of git://anongit.freedesktop.org/drm/drm

[linux-2.6-microblaze.git] / drivers / gpu / drm / msm / dp / dp_catalog.c

diff --git a/drivers/gpu/drm/msm/dp/dp_catalog.c b/drivers/gpu/drm/msm/dp/dp_catalog.c
index c0423e7..cc2bb82 100644 (file)
--- a/drivers/gpu/drm/msm/dp/dp_catalog.c
+++ b/drivers/gpu/drm/msm/dp/dp_catalog.c
@@ -372,6 +372,7 @@ void dp_catalog_ctrl_mainlink_ctrl(struct dp_catalog *dp_catalog,
        struct dp_catalog_private *catalog = container_of(dp_catalog,
                                struct dp_catalog_private, dp_catalog);
 
+       DRM_DEBUG_DP("enable=%d\n", enable);
        if (enable) {
                /*
                 * To make sure link reg writes happens before other operation,
@@ -580,6 +581,7 @@ void dp_catalog_hpd_config_intr(struct dp_catalog *dp_catalog,
 
        config = (en ? config | intr_mask : config & ~intr_mask);
 
+       DRM_DEBUG_DP("intr_mask=%#x config=%#x\n", intr_mask, config);
        dp_write_aux(catalog, REG_DP_DP_HPD_INT_MASK,
                                config & DP_DP_HPD_INT_MASK);
 }
@@ -610,6 +612,7 @@ u32 dp_catalog_link_is_connected(struct dp_catalog *dp_catalog)
        u32 status;
 
        status = dp_read_aux(catalog, REG_DP_DP_HPD_INT_STATUS);
+       DRM_DEBUG_DP("aux status: %#x\n", status);
        status >>= DP_DP_HPD_STATE_STATUS_BITS_SHIFT;
        status &= DP_DP_HPD_STATE_STATUS_BITS_MASK;
 
@@ -685,6 +688,7 @@ void dp_catalog_ctrl_send_phy_pattern(struct dp_catalog *dp_catalog,
        /* Make sure to clear the current pattern before starting a new one */
        dp_write_link(catalog, REG_DP_STATE_CTRL, 0x0);
 
+       DRM_DEBUG_DP("pattern: %#x\n", pattern);
        switch (pattern) {
        case DP_PHY_TEST_PATTERN_D10_2:
                dp_write_link(catalog, REG_DP_STATE_CTRL,
@@ -745,7 +749,7 @@ void dp_catalog_ctrl_send_phy_pattern(struct dp_catalog *dp_catalog,
                                DP_STATE_CTRL_LINK_TRAINING_PATTERN4);
                break;
        default:
-               DRM_DEBUG_DP("No valid test pattern requested:0x%x\n", pattern);
+               DRM_DEBUG_DP("No valid test pattern requested: %#x\n", pattern);
                break;
        }
 }
@@ -929,7 +933,7 @@ void dp_catalog_audio_config_acr(struct dp_catalog *dp_catalog)
        select = dp_catalog->audio_data;
        acr_ctrl = select << 4 | BIT(31) | BIT(8) | BIT(14);
 
-       DRM_DEBUG_DP("select = 0x%x, acr_ctrl = 0x%x\n", select, acr_ctrl);
+       DRM_DEBUG_DP("select: %#x, acr_ctrl: %#x\n", select, acr_ctrl);
 
        dp_write_link(catalog, MMSS_DP_AUDIO_ACR_CTRL, acr_ctrl);
 }