mirror of
https://github.com/torvalds/linux.git
synced 2026-06-04 12:35:52 +02:00
drm/amd/display: Update DCN32 for DCN35 support
[Why & How] Update DCN32 files for DCN35 usage. Signed-off-by: Qingqing Zhuo <Qingqing.Zhuo@amd.com> Acked-by: Harry Wentland <Harry.Wentland@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
parent
24143e5089
commit
33e36f8e50
|
|
@ -779,7 +779,6 @@
|
|||
type MPCC_MCM_1DLUT_LUT_DATA;\
|
||||
type MPCC_MCM_1DLUT_LUT_WRITE_COLOR_MASK;\
|
||||
type MPCC_MCM_1DLUT_LUT_READ_COLOR_SEL;\
|
||||
type MPCC_MCM_1DLUT_LUT_READ_DBG;\
|
||||
type MPCC_MCM_1DLUT_LUT_HOST_SEL;\
|
||||
type MPCC_MCM_1DLUT_LUT_CONFIG_MODE;\
|
||||
type MPCC_MCM_1DLUT_RAMA_EXP_REGION_START_B;\
|
||||
|
|
|
|||
|
|
@ -43,8 +43,6 @@
|
|||
SRI2(MCIF_WB_BUF_4_STATUS2, MCIF_WB, inst),\
|
||||
SRI2(MCIF_WB_ARBITRATION_CONTROL, MCIF_WB, inst),\
|
||||
SRI2(MCIF_WB_SCLK_CHANGE, MCIF_WB, inst),\
|
||||
SRI2(MCIF_WB_TEST_DEBUG_INDEX, MCIF_WB, inst),\
|
||||
SRI2(MCIF_WB_TEST_DEBUG_DATA, MCIF_WB, inst),\
|
||||
SRI2(MCIF_WB_BUF_1_ADDR_Y, MCIF_WB, inst),\
|
||||
SRI2(MCIF_WB_BUF_1_ADDR_C, MCIF_WB, inst),\
|
||||
SRI2(MCIF_WB_BUF_2_ADDR_Y, MCIF_WB, inst),\
|
||||
|
|
@ -157,8 +155,6 @@
|
|||
SF(MCIF_WB_ARBITRATION_CONTROL, MCIF_WB_CLIENT_ARBITRATION_SLICE, mask_sh),\
|
||||
SF(MCIF_WB_ARBITRATION_CONTROL, MCIF_WB_TIME_PER_PIXEL, mask_sh),\
|
||||
SF(MCIF_WB_SCLK_CHANGE, WM_CHANGE_ACK_FORCE_ON, mask_sh),\
|
||||
SF(MCIF_WB_TEST_DEBUG_INDEX, MCIF_WB_TEST_DEBUG_INDEX, mask_sh),\
|
||||
SF(MCIF_WB_TEST_DEBUG_DATA, MCIF_WB_TEST_DEBUG_DATA, mask_sh),\
|
||||
SF(MCIF_WB_BUF_1_ADDR_Y, MCIF_WB_BUF_1_ADDR_Y, mask_sh),\
|
||||
SF(MCIF_WB_BUF_1_ADDR_C, MCIF_WB_BUF_1_ADDR_C, mask_sh),\
|
||||
SF(MCIF_WB_BUF_2_ADDR_Y, MCIF_WB_BUF_2_ADDR_Y, mask_sh),\
|
||||
|
|
|
|||
|
|
@ -232,7 +232,6 @@
|
|||
SF(MPCC_OGAM0_MPCC_OGAM_CONTROL, MPCC_OGAM_SELECT_CURRENT, mask_sh),\
|
||||
SF(MPCC_OGAM0_MPCC_OGAM_LUT_CONTROL, MPCC_OGAM_LUT_WRITE_COLOR_MASK, mask_sh),\
|
||||
SF(MPCC_OGAM0_MPCC_OGAM_LUT_CONTROL, MPCC_OGAM_LUT_READ_COLOR_SEL, mask_sh),\
|
||||
SF(MPCC_OGAM0_MPCC_OGAM_LUT_CONTROL, MPCC_OGAM_LUT_READ_DBG, mask_sh),\
|
||||
SF(MPCC_OGAM0_MPCC_OGAM_LUT_CONTROL, MPCC_OGAM_LUT_HOST_SEL, mask_sh),\
|
||||
SF(MPCC_OGAM0_MPCC_OGAM_LUT_CONTROL, MPCC_OGAM_LUT_CONFIG_MODE, mask_sh),\
|
||||
SF(MPCC_OGAM0_MPCC_OGAM_LUT_DATA, MPCC_OGAM_LUT_DATA, mask_sh),\
|
||||
|
|
@ -276,7 +275,6 @@
|
|||
SF(MPCC_MCM0_MPCC_MCM_1DLUT_LUT_DATA, MPCC_MCM_1DLUT_LUT_DATA, mask_sh),\
|
||||
SF(MPCC_MCM0_MPCC_MCM_1DLUT_LUT_CONTROL, MPCC_MCM_1DLUT_LUT_WRITE_COLOR_MASK, mask_sh),\
|
||||
SF(MPCC_MCM0_MPCC_MCM_1DLUT_LUT_CONTROL, MPCC_MCM_1DLUT_LUT_READ_COLOR_SEL, mask_sh),\
|
||||
SF(MPCC_MCM0_MPCC_MCM_1DLUT_LUT_CONTROL, MPCC_MCM_1DLUT_LUT_READ_DBG, mask_sh),\
|
||||
SF(MPCC_MCM0_MPCC_MCM_1DLUT_LUT_CONTROL, MPCC_MCM_1DLUT_LUT_HOST_SEL, mask_sh),\
|
||||
SF(MPCC_MCM0_MPCC_MCM_1DLUT_LUT_CONTROL, MPCC_MCM_1DLUT_LUT_CONFIG_MODE, mask_sh),\
|
||||
SF(MPCC_MCM0_MPCC_MCM_1DLUT_RAMA_START_CNTL_B, MPCC_MCM_1DLUT_RAMA_EXP_REGION_START_B, mask_sh),\
|
||||
|
|
|
|||
|
|
@ -713,8 +713,6 @@ bool dcn32_subvp_vblank_admissable(struct dc *dc, struct dc_state *context, int
|
|||
SRI2_ARR(MCIF_WB_BUF_4_STATUS2, MCIF_WB, inst), \
|
||||
SRI2_ARR(MCIF_WB_ARBITRATION_CONTROL, MCIF_WB, inst), \
|
||||
SRI2_ARR(MCIF_WB_SCLK_CHANGE, MCIF_WB, inst), \
|
||||
SRI2_ARR(MCIF_WB_TEST_DEBUG_INDEX, MCIF_WB, inst), \
|
||||
SRI2_ARR(MCIF_WB_TEST_DEBUG_DATA, MCIF_WB, inst), \
|
||||
SRI2_ARR(MCIF_WB_BUF_1_ADDR_Y, MCIF_WB, inst), \
|
||||
SRI2_ARR(MCIF_WB_BUF_1_ADDR_C, MCIF_WB, inst), \
|
||||
SRI2_ARR(MCIF_WB_BUF_2_ADDR_Y, MCIF_WB, inst), \
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user