| Message ID | 20201012114623.8583-1-bernard@vivo.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/amd/display: remove no need return value | expand |
Applied. Thanks! Alex On Mon, Oct 12, 2020 at 9:44 AM Bernard Zhao <bernard@vivo.com> wrote: > > Functions (disable_all_writeback_pipes_for_stream & > dc_enable_stereo & dc_post_update_surfaces_to_stream) > always return true, there is no need to keep the return value. > This change is to make the code a bit more readable. > > Signed-off-by: Bernard Zhao <bernard@vivo.com> > --- > drivers/gpu/drm/amd/display/dc/core/dc.c | 17 +++++------------ > drivers/gpu/drm/amd/display/dc/dc.h | 2 +- > drivers/gpu/drm/amd/display/dc/dc_stream.h | 2 +- > 3 files changed, 7 insertions(+), 14 deletions(-) > > diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c > index 92eb1ca1634f..8dc598a632b5 100644 > --- a/drivers/gpu/drm/amd/display/dc/core/dc.c > +++ b/drivers/gpu/drm/amd/display/dc/core/dc.c > @@ -761,7 +761,7 @@ static bool dc_construct(struct dc *dc, > return false; > } > > -static bool disable_all_writeback_pipes_for_stream( > +static void disable_all_writeback_pipes_for_stream( > const struct dc *dc, > struct dc_stream_state *stream, > struct dc_state *context) > @@ -770,8 +770,6 @@ static bool disable_all_writeback_pipes_for_stream( > > for (i = 0; i < stream->num_wb_info; i++) > stream->writeback_info[i].wb_enabled = false; > - > - return true; > } > > void apply_ctx_interdependent_lock(struct dc *dc, struct dc_state *context, struct dc_stream_state *stream, bool lock) > @@ -1213,13 +1211,12 @@ bool dc_validate_seamless_boot_timing(const struct dc *dc, > return true; > } > > -bool dc_enable_stereo( > +void dc_enable_stereo( > struct dc *dc, > struct dc_state *context, > struct dc_stream_state *streams[], > uint8_t stream_count) > { > - bool ret = true; > int i, j; > struct pipe_ctx *pipe; > > @@ -1234,8 +1231,6 @@ bool dc_enable_stereo( > dc->hwss.setup_stereo(pipe, dc); > } > } > - > - return ret; > } > > /* > @@ -1448,18 +1443,18 @@ static bool is_flip_pending_in_pipes(struct dc *dc, struct dc_state *context) > return false; > } > > -bool dc_post_update_surfaces_to_stream(struct dc *dc) > +void dc_post_update_surfaces_to_stream(struct dc *dc) > { > int i; > struct dc_state *context = dc->current_state; > > if ((!dc->optimized_required) || dc->optimize_seamless_boot_streams > 0) > - return true; > + return; > > post_surface_trace(dc); > > if (is_flip_pending_in_pipes(dc, context)) > - return true; > + return; > > for (i = 0; i < dc->res_pool->pipe_count; i++) > if (context->res_ctx.pipe_ctx[i].stream == NULL || > @@ -1472,8 +1467,6 @@ bool dc_post_update_surfaces_to_stream(struct dc *dc) > > dc->optimized_required = false; > dc->wm_optimized_required = false; > - > - return true; > } > > struct dc_state *dc_create_state(struct dc *dc) > diff --git a/drivers/gpu/drm/amd/display/dc/dc.h b/drivers/gpu/drm/amd/display/dc/dc.h > index f50ef4255020..f79a3c318757 100644 > --- a/drivers/gpu/drm/amd/display/dc/dc.h > +++ b/drivers/gpu/drm/amd/display/dc/dc.h > @@ -962,7 +962,7 @@ struct dc_flip_addrs { > bool triplebuffer_flips; > }; > > -bool dc_post_update_surfaces_to_stream( > +void dc_post_update_surfaces_to_stream( > struct dc *dc); > > #include "dc_stream.h" > diff --git a/drivers/gpu/drm/amd/display/dc/dc_stream.h b/drivers/gpu/drm/amd/display/dc/dc_stream.h > index d9888f316da6..0047ab33f88e 100644 > --- a/drivers/gpu/drm/amd/display/dc/dc_stream.h > +++ b/drivers/gpu/drm/amd/display/dc/dc_stream.h > @@ -391,7 +391,7 @@ enum dc_status dc_validate_stream(struct dc *dc, struct dc_stream_state *stream) > * Enable stereo when commit_streams is not required, > * for example, frame alternate. > */ > -bool dc_enable_stereo( > +void dc_enable_stereo( > struct dc *dc, > struct dc_state *context, > struct dc_stream_state *streams[], > -- > 2.28.0 > > _______________________________________________ > amd-gfx mailing list > amd-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/amd-gfx
diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c index 92eb1ca1634f..8dc598a632b5 100644 --- a/drivers/gpu/drm/amd/display/dc/core/dc.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc.c @@ -761,7 +761,7 @@ static bool dc_construct(struct dc *dc, return false; } -static bool disable_all_writeback_pipes_for_stream( +static void disable_all_writeback_pipes_for_stream( const struct dc *dc, struct dc_stream_state *stream, struct dc_state *context) @@ -770,8 +770,6 @@ static bool disable_all_writeback_pipes_for_stream( for (i = 0; i < stream->num_wb_info; i++) stream->writeback_info[i].wb_enabled = false; - - return true; } void apply_ctx_interdependent_lock(struct dc *dc, struct dc_state *context, struct dc_stream_state *stream, bool lock) @@ -1213,13 +1211,12 @@ bool dc_validate_seamless_boot_timing(const struct dc *dc, return true; } -bool dc_enable_stereo( +void dc_enable_stereo( struct dc *dc, struct dc_state *context, struct dc_stream_state *streams[], uint8_t stream_count) { - bool ret = true; int i, j; struct pipe_ctx *pipe; @@ -1234,8 +1231,6 @@ bool dc_enable_stereo( dc->hwss.setup_stereo(pipe, dc); } } - - return ret; } /* @@ -1448,18 +1443,18 @@ static bool is_flip_pending_in_pipes(struct dc *dc, struct dc_state *context) return false; } -bool dc_post_update_surfaces_to_stream(struct dc *dc) +void dc_post_update_surfaces_to_stream(struct dc *dc) { int i; struct dc_state *context = dc->current_state; if ((!dc->optimized_required) || dc->optimize_seamless_boot_streams > 0) - return true; + return; post_surface_trace(dc); if (is_flip_pending_in_pipes(dc, context)) - return true; + return; for (i = 0; i < dc->res_pool->pipe_count; i++) if (context->res_ctx.pipe_ctx[i].stream == NULL || @@ -1472,8 +1467,6 @@ bool dc_post_update_surfaces_to_stream(struct dc *dc) dc->optimized_required = false; dc->wm_optimized_required = false; - - return true; } struct dc_state *dc_create_state(struct dc *dc) diff --git a/drivers/gpu/drm/amd/display/dc/dc.h b/drivers/gpu/drm/amd/display/dc/dc.h index f50ef4255020..f79a3c318757 100644 --- a/drivers/gpu/drm/amd/display/dc/dc.h +++ b/drivers/gpu/drm/amd/display/dc/dc.h @@ -962,7 +962,7 @@ struct dc_flip_addrs { bool triplebuffer_flips; }; -bool dc_post_update_surfaces_to_stream( +void dc_post_update_surfaces_to_stream( struct dc *dc); #include "dc_stream.h" diff --git a/drivers/gpu/drm/amd/display/dc/dc_stream.h b/drivers/gpu/drm/amd/display/dc/dc_stream.h index d9888f316da6..0047ab33f88e 100644 --- a/drivers/gpu/drm/amd/display/dc/dc_stream.h +++ b/drivers/gpu/drm/amd/display/dc/dc_stream.h @@ -391,7 +391,7 @@ enum dc_status dc_validate_stream(struct dc *dc, struct dc_stream_state *stream) * Enable stereo when commit_streams is not required, * for example, frame alternate. */ -bool dc_enable_stereo( +void dc_enable_stereo( struct dc *dc, struct dc_state *context, struct dc_stream_state *streams[],
Functions (disable_all_writeback_pipes_for_stream & dc_enable_stereo & dc_post_update_surfaces_to_stream) always return true, there is no need to keep the return value. This change is to make the code a bit more readable. Signed-off-by: Bernard Zhao <bernard@vivo.com> --- drivers/gpu/drm/amd/display/dc/core/dc.c | 17 +++++------------ drivers/gpu/drm/amd/display/dc/dc.h | 2 +- drivers/gpu/drm/amd/display/dc/dc_stream.h | 2 +- 3 files changed, 7 insertions(+), 14 deletions(-)