diff options
| author | Matthew Stewart <Matthew.Stewart2@amd.com> | 2026-10-09 15:35:33 -0400 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2026-10-27 14:13:38 -0400 |
| commit | 92b5c91b582d14e032ea5afd864f9c0a8be33f4e (patch) | |
| tree | 70450e34c0711fb49330238b56dc70c3ef0355b2 | |
| parent | e4139129a4bb7c04b35373be603fde09a579cdb2 (diff) | |
| download | linux-next-92b5c91b582d14e032ea5afd864f9c0a8be33f4e.tar.gz linux-next-92b5c91b582d14e032ea5afd864f9c0a8be33f4e.zip | |
drm/amd/display: Reuse mpc401_read_mpcc_state on dcn42, dcn60
This will populate lut3d_mode, lut3d_size, and shaper_lut_mode so that
they have valid values for dcn10_log_hw_state.
Reviewed-by: Harry Wentland <harry.wentland@amd.com>
Reviewed-by: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>
Signed-off-by: Matthew Stewart <Matthew.Stewart2@amd.com>
Signed-off-by: Tom Chung <chiahsuan.chung@amd.com>
Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
4 files changed, 8 insertions, 11 deletions
diff --git a/drivers/gpu/drm/amd/display/dc/mpc/dcn401/dcn401_mpc.c b/drivers/gpu/drm/amd/display/dc/mpc/dcn401/dcn401_mpc.c index 5f5c27eb1d64..a485db71c166 100644 --- a/drivers/gpu/drm/amd/display/dc/mpc/dcn401/dcn401_mpc.c +++ b/drivers/gpu/drm/amd/display/dc/mpc/dcn401/dcn401_mpc.c @@ -627,7 +627,7 @@ void mpc401_get_lut_mode(struct mpc *mpc, } } -static void mpc401_read_mpcc_state( +void mpc401_read_mpcc_state( struct mpc *mpc, int mpcc_inst, struct mpcc_state *s) diff --git a/drivers/gpu/drm/amd/display/dc/mpc/dcn401/dcn401_mpc.h b/drivers/gpu/drm/amd/display/dc/mpc/dcn401/dcn401_mpc.h index 75fa05ed2b22..2731045f277c 100644 --- a/drivers/gpu/drm/amd/display/dc/mpc/dcn401/dcn401_mpc.h +++ b/drivers/gpu/drm/amd/display/dc/mpc/dcn401/dcn401_mpc.h @@ -275,4 +275,9 @@ void mpc401_update_3dlut_fast_load_select( int mpcc_id, int hubp_idx); +void mpc401_read_mpcc_state( + struct mpc *mpc, + int mpcc_inst, + struct mpcc_state *s); + #endif diff --git a/drivers/gpu/drm/amd/display/dc/mpc/dcn42/dcn42_mpc.c b/drivers/gpu/drm/amd/display/dc/mpc/dcn42/dcn42_mpc.c index 37d024cfb3fb..f15690b026cc 100644 --- a/drivers/gpu/drm/amd/display/dc/mpc/dcn42/dcn42_mpc.c +++ b/drivers/gpu/drm/amd/display/dc/mpc/dcn42/dcn42_mpc.c @@ -65,16 +65,8 @@ void mpc42_update_blending( -void mpc42_read_mpcc_state( - struct mpc *mpc, - int mpcc_inst, - struct mpcc_state *s) -{ - mpc1_read_mpcc_state(mpc, mpcc_inst, s); -} - static const struct mpc_funcs dcn42_mpc_funcs = { - .read_mpcc_state = mpc42_read_mpcc_state, + .read_mpcc_state = mpc401_read_mpcc_state, .insert_plane = mpc1_insert_plane, .remove_mpcc = mpc1_remove_mpcc, .mpc_init = mpc32_mpc_init, diff --git a/drivers/gpu/drm/amd/display/dc/mpc/dcn60/dcn60_mpc.c b/drivers/gpu/drm/amd/display/dc/mpc/dcn60/dcn60_mpc.c index e38582f0a319..89c4d431a82c 100644 --- a/drivers/gpu/drm/amd/display/dc/mpc/dcn60/dcn60_mpc.c +++ b/drivers/gpu/drm/amd/display/dc/mpc/dcn60/dcn60_mpc.c @@ -229,7 +229,7 @@ static bool mpc60_program_3dlut( } static const struct mpc_funcs dcn60_mpc_funcs = { - .read_mpcc_state = mpc1_read_mpcc_state, + .read_mpcc_state = mpc401_read_mpcc_state, .insert_plane = mpc60_insert_plane, .remove_mpcc = mpc1_remove_mpcc, .mpc_init = mpc32_mpc_init, |