drm/mediatek: dp: Move AUX_P0 setting to mtk_dp_initialize_aux_settings()
authorAngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Tue, 25 Jul 2023 07:32:28 +0000 (09:32 +0200)
committerChun-Kuang Hu <chunkuang.hu@kernel.org>
Wed, 9 Aug 2023 23:16:29 +0000 (23:16 +0000)
Move the register write to MTK_DP_AUX_P0_3690 to set the AUX reply mode
to function mtk_dp_initialize_aux_settings(), as this is effectively
part of the DPTX AUX setup sequence.

Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Tested-by: Chen-Yu Tsai <wenst@chromium.org>
Reviewed-by: CK Hu <ck.hu@mediatek.com>
Reviewed-by: Alexandre Mergnat <amergnat@baylibre.com>
Link: https://patchwork.kernel.org/project/dri-devel/patch/20230725073234.55892-6-angelogioacchino.delregno@collabora.com/
Signed-off-by: Chun-Kuang Hu <chunkuang.hu@kernel.org>
drivers/gpu/drm/mediatek/mtk_dp.c

index fc6cabf..e8d3bf3 100644 (file)
@@ -1009,6 +1009,11 @@ static void mtk_dp_initialize_aux_settings(struct mtk_dp *mtk_dp)
        mtk_dp_update_bits(mtk_dp, MTK_DP_AUX_P0_37C8,
                           MTK_ATOP_EN_AUX_TX_P0,
                           MTK_ATOP_EN_AUX_TX_P0);
+
+       /* Set complete reply mode for AUX */
+       mtk_dp_update_bits(mtk_dp, MTK_DP_AUX_P0_3690,
+                          RX_REPLY_COMPLETE_MODE_AUX_TX_P0,
+                          RX_REPLY_COMPLETE_MODE_AUX_TX_P0);
 }
 
 static void mtk_dp_initialize_digital_settings(struct mtk_dp *mtk_dp)
@@ -1826,10 +1831,6 @@ static void mtk_dp_init_port(struct mtk_dp *mtk_dp)
        mtk_dp_initialize_settings(mtk_dp);
        mtk_dp_initialize_aux_settings(mtk_dp);
        mtk_dp_initialize_digital_settings(mtk_dp);
-
-       mtk_dp_update_bits(mtk_dp, MTK_DP_AUX_P0_3690,
-                          RX_REPLY_COMPLETE_MODE_AUX_TX_P0,
-                          RX_REPLY_COMPLETE_MODE_AUX_TX_P0);
        mtk_dp_initialize_hpd_detect_settings(mtk_dp);
 
        mtk_dp_digital_sw_reset(mtk_dp);