drm/amd/display: Add missing surface address registers

[Why]
- Need to add missing surface address register definitions.
- RGBE+A does not work in a stereo configuration because
  surface addresses are no programmed correctly.

[How]
Added the register definitions and surface address programming.

Signed-off-by: Ilya Bakoulin <Ilya.Bakoulin@amd.com>
Reviewed-by: Charlene Liu <Charlene.Liu@amd.com>
Acked-by: Bhawanpreet Lakha <Bhawanpreet.Lakha@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.h b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.h
index cb20d10288c0be8ce915b7684e490917e007e701..f8e82ef24c09fa197f2681e6909bc0c932f022a2 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.h
+++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.h
@@ -57,8 +57,12 @@
        SRI(DCSURF_SECONDARY_META_SURFACE_ADDRESS, HUBPREQ, id),\
        SRI(DCSURF_PRIMARY_SURFACE_ADDRESS_HIGH_C, HUBPREQ, id),\
        SRI(DCSURF_PRIMARY_SURFACE_ADDRESS_C, HUBPREQ, id),\
+       SRI(DCSURF_SECONDARY_SURFACE_ADDRESS_HIGH_C, HUBPREQ, id),\
+       SRI(DCSURF_SECONDARY_SURFACE_ADDRESS_C, HUBPREQ, id),\
        SRI(DCSURF_PRIMARY_META_SURFACE_ADDRESS_HIGH_C, HUBPREQ, id),\
        SRI(DCSURF_PRIMARY_META_SURFACE_ADDRESS_C, HUBPREQ, id),\
+       SRI(DCSURF_SECONDARY_META_SURFACE_ADDRESS_HIGH_C, HUBPREQ, id),\
+       SRI(DCSURF_SECONDARY_META_SURFACE_ADDRESS_C, HUBPREQ, id),\
        SRI(DCSURF_SURFACE_INUSE, HUBPREQ, id),\
        SRI(DCSURF_SURFACE_INUSE_HIGH, HUBPREQ, id),\
        SRI(DCSURF_SURFACE_INUSE_C, HUBPREQ, id),\
@@ -160,8 +164,12 @@
        uint32_t DCSURF_SECONDARY_META_SURFACE_ADDRESS; \
        uint32_t DCSURF_PRIMARY_SURFACE_ADDRESS_HIGH_C; \
        uint32_t DCSURF_PRIMARY_SURFACE_ADDRESS_C; \
+       uint32_t DCSURF_SECONDARY_SURFACE_ADDRESS_HIGH_C; \
+       uint32_t DCSURF_SECONDARY_SURFACE_ADDRESS_C; \
        uint32_t DCSURF_PRIMARY_META_SURFACE_ADDRESS_HIGH_C; \
        uint32_t DCSURF_PRIMARY_META_SURFACE_ADDRESS_C; \
+       uint32_t DCSURF_SECONDARY_META_SURFACE_ADDRESS_HIGH_C; \
+       uint32_t DCSURF_SECONDARY_META_SURFACE_ADDRESS_C; \
        uint32_t DCSURF_SURFACE_INUSE; \
        uint32_t DCSURF_SURFACE_INUSE_HIGH; \
        uint32_t DCSURF_SURFACE_INUSE_C; \
@@ -289,8 +297,12 @@
        HUBP_SF(HUBPREQ0_DCSURF_SECONDARY_META_SURFACE_ADDRESS, SECONDARY_META_SURFACE_ADDRESS, mask_sh),\
        HUBP_SF(HUBPREQ0_DCSURF_PRIMARY_SURFACE_ADDRESS_HIGH_C, PRIMARY_SURFACE_ADDRESS_HIGH_C, mask_sh),\
        HUBP_SF(HUBPREQ0_DCSURF_PRIMARY_SURFACE_ADDRESS_C, PRIMARY_SURFACE_ADDRESS_C, mask_sh),\
+       HUBP_SF(HUBPREQ0_DCSURF_SECONDARY_SURFACE_ADDRESS_HIGH_C, SECONDARY_SURFACE_ADDRESS_HIGH_C, mask_sh),\
+       HUBP_SF(HUBPREQ0_DCSURF_SECONDARY_SURFACE_ADDRESS_C, SECONDARY_SURFACE_ADDRESS_C, mask_sh),\
        HUBP_SF(HUBPREQ0_DCSURF_PRIMARY_META_SURFACE_ADDRESS_HIGH_C, PRIMARY_META_SURFACE_ADDRESS_HIGH_C, mask_sh),\
        HUBP_SF(HUBPREQ0_DCSURF_PRIMARY_META_SURFACE_ADDRESS_C, PRIMARY_META_SURFACE_ADDRESS_C, mask_sh),\
+       HUBP_SF(HUBPREQ0_DCSURF_SECONDARY_META_SURFACE_ADDRESS_HIGH_C, SECONDARY_META_SURFACE_ADDRESS_HIGH_C, mask_sh),\
+       HUBP_SF(HUBPREQ0_DCSURF_SECONDARY_META_SURFACE_ADDRESS_C, SECONDARY_META_SURFACE_ADDRESS_C, mask_sh),\
        HUBP_SF(HUBPREQ0_DCSURF_SURFACE_INUSE, SURFACE_INUSE_ADDRESS, mask_sh),\
        HUBP_SF(HUBPREQ0_DCSURF_SURFACE_INUSE_HIGH, SURFACE_INUSE_ADDRESS_HIGH, mask_sh),\
        HUBP_SF(HUBPREQ0_DCSURF_SURFACE_INUSE_C, SURFACE_INUSE_ADDRESS_C, mask_sh),\
@@ -479,8 +491,12 @@
        type SECONDARY_META_SURFACE_ADDRESS;\
        type PRIMARY_SURFACE_ADDRESS_HIGH_C;\
        type PRIMARY_SURFACE_ADDRESS_C;\
+       type SECONDARY_SURFACE_ADDRESS_HIGH_C;\
+       type SECONDARY_SURFACE_ADDRESS_C;\
        type PRIMARY_META_SURFACE_ADDRESS_HIGH_C;\
        type PRIMARY_META_SURFACE_ADDRESS_C;\
+       type SECONDARY_META_SURFACE_ADDRESS_HIGH_C;\
+       type SECONDARY_META_SURFACE_ADDRESS_C;\
        type SURFACE_INUSE_ADDRESS;\
        type SURFACE_INUSE_ADDRESS_HIGH;\
        type SURFACE_INUSE_ADDRESS_C;\