drm/amd/display: fix aviInfoFrame bar Info and add set_avMute

[mirror_ubuntu-bionic-kernel.git] / drivers / gpu / drm / amd / display / dc / dce / dce_dmcu.h

diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.h b/drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.h
index 7dc25386c2bf4e155d2ec09533d5afcef0744b0a..c421a0250016e32333686e34a01bb3e8bf1fc183 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.h
+++ b/drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.h
@@ -48,6 +48,12 @@
        DMCU_COMMON_REG_LIST_DCE_BASE(), \
        SR(DCI_MEM_PWR_STATUS)
 
+#if defined(CONFIG_DRM_AMD_DC_DCN1_0)
+       #define DMCU_DCN10_REG_LIST()\
+               DMCU_COMMON_REG_LIST_DCE_BASE(), \
+               SR(DMU_MEM_PWR_CNTL)
+#endif
+
 #define DMCU_SF(reg_name, field_name, post_fix)\
        .field_name = reg_name ## __ ## field_name ## post_fix
 
@@ -76,6 +82,13 @@
        DMCU_SF(DCI_MEM_PWR_STATUS, \
                DMCU_IRAM_MEM_PWR_STATE, mask_sh)
 
+#if defined(CONFIG_DRM_AMD_DC_DCN1_0)
+       #define DMCU_MASK_SH_LIST_DCN10(mask_sh) \
+               DMCU_COMMON_MASK_SH_LIST_DCE_COMMON_BASE(mask_sh), \
+               DMCU_SF(DMU_MEM_PWR_CNTL, \
+                               DMCU_IRAM_MEM_PWR_STATE, mask_sh)
+#endif
+
 #define DMCU_REG_FIELD_LIST(type) \
        type DMCU_IRAM_MEM_PWR_STATE; \
        type IRAM_HOST_ACCESS_EN; \
@@ -184,12 +197,28 @@ union dce_dmcu_psr_config_data_reg3 {
        unsigned int u32All;
 };
 
+union dce_dmcu_psr_config_data_wait_loop_reg1 {
+       struct {
+               unsigned int wait_loop:16; /* [15:0] */
+               unsigned int reserved:16; /* [31:16] */
+       } bits;
+       unsigned int u32;
+};
+
 struct dmcu *dce_dmcu_create(
        struct dc_context *ctx,
        const struct dce_dmcu_registers *regs,
        const struct dce_dmcu_shift *dmcu_shift,
        const struct dce_dmcu_mask *dmcu_mask);
 
+#if defined(CONFIG_DRM_AMD_DC_DCN1_0)
+struct dmcu *dcn10_dmcu_create(
+       struct dc_context *ctx,
+       const struct dce_dmcu_registers *regs,
+       const struct dce_dmcu_shift *dmcu_shift,
+       const struct dce_dmcu_mask *dmcu_mask);
+#endif
+
 void dce_dmcu_destroy(struct dmcu **dmcu);
 
 #endif /* _DCE_ABM_H_ */