drm/amd/display: group DCN watermark registers

Signed-off-by: Eric Bernstein <[email protected]>
Reviewed-by: Charlene Liu <[email protected]>
Acked-by: Harry Wentland <[email protected]>
Signed-off-by: Alex Deucher <[email protected]>

diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_hwseq.h b/drivers/gpu/drm/amd/display/dc/dce/dce_hwseq.h
index 9a04b8758888da9df3ffff9c50b0358bc4684263..52506155e36120cb6ae5e0d811a889ab7978316c 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dce/dce_hwseq.h
+++ b/drivers/gpu/drm/amd/display/dc/dce/dce_hwseq.h
@@ -163,23 +163,15 @@
        SR(REFCLK_CNTL), \
        SR(DCHUBBUB_ARB_DATA_URGENCY_WATERMARK_A),\
        SR(DCHUBBUB_ARB_PTE_META_URGENCY_WATERMARK_A),\
-       SR(DCHUBBUB_ARB_ALLOW_SR_ENTER_WATERMARK_A),\
-       SR(DCHUBBUB_ARB_ALLOW_SR_EXIT_WATERMARK_A),\
        SR(DCHUBBUB_ARB_ALLOW_DRAM_CLK_CHANGE_WATERMARK_A),\
        SR(DCHUBBUB_ARB_DATA_URGENCY_WATERMARK_B),\
        SR(DCHUBBUB_ARB_PTE_META_URGENCY_WATERMARK_B),\
-       SR(DCHUBBUB_ARB_ALLOW_SR_ENTER_WATERMARK_B),\
-       SR(DCHUBBUB_ARB_ALLOW_SR_EXIT_WATERMARK_B),\
        SR(DCHUBBUB_ARB_ALLOW_DRAM_CLK_CHANGE_WATERMARK_B),\
        SR(DCHUBBUB_ARB_DATA_URGENCY_WATERMARK_C),\
        SR(DCHUBBUB_ARB_PTE_META_URGENCY_WATERMARK_C),\
-       SR(DCHUBBUB_ARB_ALLOW_SR_ENTER_WATERMARK_C),\
-       SR(DCHUBBUB_ARB_ALLOW_SR_EXIT_WATERMARK_C),\
        SR(DCHUBBUB_ARB_ALLOW_DRAM_CLK_CHANGE_WATERMARK_C),\
        SR(DCHUBBUB_ARB_DATA_URGENCY_WATERMARK_D),\
        SR(DCHUBBUB_ARB_PTE_META_URGENCY_WATERMARK_D),\
-       SR(DCHUBBUB_ARB_ALLOW_SR_ENTER_WATERMARK_D),\
-       SR(DCHUBBUB_ARB_ALLOW_SR_EXIT_WATERMARK_D),\
        SR(DCHUBBUB_ARB_ALLOW_DRAM_CLK_CHANGE_WATERMARK_D),\
        SR(DCHUBBUB_ARB_WATERMARK_CHANGE_CNTL),\
        SR(DCHUBBUB_ARB_DRAM_STATE_CNTL),\
@@ -207,8 +199,19 @@
        MMHUB_SR(MC_VM_SYSTEM_APERTURE_LOW_ADDR),\
        MMHUB_SR(MC_VM_SYSTEM_APERTURE_HIGH_ADDR)
 
+#define HWSEQ_SR_WATERMARK_REG_LIST()\
+       SR(DCHUBBUB_ARB_ALLOW_SR_ENTER_WATERMARK_A),\
+       SR(DCHUBBUB_ARB_ALLOW_SR_EXIT_WATERMARK_A),\
+       SR(DCHUBBUB_ARB_ALLOW_SR_ENTER_WATERMARK_B),\
+       SR(DCHUBBUB_ARB_ALLOW_SR_EXIT_WATERMARK_B),\
+       SR(DCHUBBUB_ARB_ALLOW_SR_ENTER_WATERMARK_C),\
+       SR(DCHUBBUB_ARB_ALLOW_SR_EXIT_WATERMARK_C),\
+       SR(DCHUBBUB_ARB_ALLOW_SR_ENTER_WATERMARK_D),\
+       SR(DCHUBBUB_ARB_ALLOW_SR_EXIT_WATERMARK_D)
+
 #define HWSEQ_DCN1_REG_LIST()\
        HWSEQ_DCN_REG_LIST(), \
+       HWSEQ_SR_WATERMARK_REG_LIST(), \
        HWSEQ_PIXEL_RATE_REG_LIST(OTG), \
        HWSEQ_PHYPLL_REG_LIST(OTG), \
        SR(DCHUBBUB_SDPIF_FB_TOP),\