diff options
| author | Rodrigo Siqueira <Rodrigo.Siqueira@amd.com> | 2024-05-14 11:22:00 -0600 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2024-05-29 14:39:33 -0400 |
| commit | ddef2cfbb8927f7236f1e0d12ffd35b5d576e300 (patch) | |
| tree | 38465151ba0de7a6b58e55c624286091121da407 | |
| parent | 2998bccfa4197ff49bf70cbe14563d1417fe3ccf (diff) | |
| download | linux-stable-ddef2cfbb8927f7236f1e0d12ffd35b5d576e300.tar.gz linux-stable-ddef2cfbb8927f7236f1e0d12ffd35b5d576e300.tar.bz2 linux-stable-ddef2cfbb8927f7236f1e0d12ffd35b5d576e300.zip | |
drm/amd/display: Remove unused code
This commit removes some unused code with the required adjustments.
Signed-off-by: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>
Acked-by: Harry Wentland <harry.wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
4 files changed, 2 insertions, 12 deletions
diff --git a/drivers/gpu/drm/amd/display/dc/dc.h b/drivers/gpu/drm/amd/display/dc/dc.h index 1055970d3888..31e3371b1b2e 100644 --- a/drivers/gpu/drm/amd/display/dc/dc.h +++ b/drivers/gpu/drm/amd/display/dc/dc.h @@ -1587,7 +1587,6 @@ struct dc_plane_state *dc_get_surface_for_mpcc(struct dc *dc, uint32_t dc_get_opp_for_plane(struct dc *dc, struct dc_plane_state *plane); void dc_set_disable_128b_132b_stream_overhead(bool disable); -bool dc_get_disable_128b_132b_stream_overhead(void); /* The function returns minimum bandwidth required to drive a given timing * return - minimum required timing bandwidth in kbps. diff --git a/drivers/gpu/drm/amd/display/dc/dpp/dcn401/dcn401_dpp.h b/drivers/gpu/drm/amd/display/dc/dpp/dcn401/dcn401_dpp.h index 1aaae7a5bd41..4bc85aaf17da 100644 --- a/drivers/gpu/drm/amd/display/dc/dpp/dcn401/dcn401_dpp.h +++ b/drivers/gpu/drm/amd/display/dc/dpp/dcn401/dcn401_dpp.h @@ -726,4 +726,4 @@ void dpp401_set_cursor_matrix( enum dc_color_space color_space, struct dc_csc_transform cursor_csc_color_matrix); -#endif +#endif /* __DCN401_DPP_H__ */ diff --git a/drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c b/drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c index b9d10e95ef7a..a1727e5bf024 100644 --- a/drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c +++ b/drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c @@ -1261,11 +1261,6 @@ void dc_set_disable_128b_132b_stream_overhead(bool disable) disable_128b_132b_stream_overhead = disable; } -bool dc_get_disable_128b_132b_stream_overhead(void) -{ - return disable_128b_132b_stream_overhead; -} - void dc_dsc_get_default_config_option(const struct dc *dc, struct dc_dsc_config_options *options) { options->dsc_min_slice_height_override = dc->debug.dsc_min_slice_height_override; diff --git a/drivers/gpu/drm/amd/display/dc/hubbub/dcn401/dcn401_hubbub.c b/drivers/gpu/drm/amd/display/dc/hubbub/dcn401/dcn401_hubbub.c index 597817b51228..054607c944a3 100644 --- a/drivers/gpu/drm/amd/display/dc/hubbub/dcn401/dcn401_hubbub.c +++ b/drivers/gpu/drm/amd/display/dc/hubbub/dcn401/dcn401_hubbub.c @@ -880,12 +880,8 @@ static void dcn401_program_compbuf_segments(struct hubbub *hubbub, unsigned comp + hubbub2->det3_size + compbuf_size_seg <= hubbub2->crb_size_segs); REG_UPDATE(DCHUBBUB_COMPBUF_CTRL, COMPBUF_SIZE, compbuf_size_seg); hubbub2->compbuf_size_segments = compbuf_size_seg; -#ifdef DIAGS_BUILD - REG_GET(DCHUBBUB_COMPBUF_CTRL, CONFIG_ERROR, &cur_compbuf_size_seg); - ASSERT(!cur_compbuf_size_seg); -#else + ASSERT(REG_GET(DCHUBBUB_COMPBUF_CTRL, CONFIG_ERROR, &cur_compbuf_size_seg) && !cur_compbuf_size_seg); -#endif } } |