Skip to content

Commit d021bd4

Browse files
Ilya Bakoulinalexdeucher
Ilya Bakoulin
authored and
alexdeucher
committed
drm/amd/display: Fix misc. checkpatch issues
[Why/How] Addresses various checkpatch issues related to the HWSS block sequence function change. Reviewed-by: Aurabindo Pillai <aurabindo.pillai@amd.com> Signed-off-by: Ilya Bakoulin <Ilya.Bakoulin@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>
1 parent d8ed14f commit d021bd4

2 files changed

Lines changed: 86 additions & 131 deletions

File tree

‎drivers/gpu/drm/amd/display/dc/core/dc_hw_sequencer.c‎

Lines changed: 19 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1962,9 +1962,8 @@ void hwss_program_bias_and_scale(union block_sequence_params *params)
19621962
struct dc_bias_and_scale bns_params = plane_state->bias_and_scale;
19631963

19641964
//TODO :for CNVC set scale and bias registers if necessary
1965-
if (dpp->funcs->dpp_program_bias_and_scale) {
1965+
if (dpp->funcs->dpp_program_bias_and_scale)
19661966
dpp->funcs->dpp_program_bias_and_scale(dpp, &bns_params);
1967-
}
19681967
}
19691968

19701969
void hwss_power_on_mpc_mem_pwr(union block_sequence_params *params)
@@ -2121,6 +2120,7 @@ void hwss_wait_for_odm_update_pending_complete(struct dc *dc, struct dc_state *c
21212120
void hwss_wait_for_no_pipes_pending(struct dc *dc, struct dc_state *context)
21222121
{
21232122
int i;
2123+
21242124
for (i = 0; i < MAX_PIPES; i++) {
21252125
int count = 0;
21262126
struct pipe_ctx *pipe = &context->res_ctx.pipe_ctx[i];
@@ -2277,6 +2277,7 @@ void hwss_tg_set_dsc_config(union block_sequence_params *params)
22772277

22782278
if (params->tg_set_dsc_config_params.enable) {
22792279
struct dsc_optc_config *dsc_optc_cfg = params->tg_set_dsc_config_params.dsc_optc_cfg;
2280+
22802281
if (dsc_optc_cfg) {
22812282
bytes_per_pixel = dsc_optc_cfg->bytes_per_pixel;
22822283
slice_width = dsc_optc_cfg->slice_width;
@@ -2370,9 +2371,8 @@ void hwss_tg_wait_for_state(union block_sequence_params *params)
23702371
struct timing_generator *tg = params->tg_wait_for_state_params.tg;
23712372
enum crtc_state state = params->tg_wait_for_state_params.state;
23722373

2373-
if (tg->funcs->wait_for_state) {
2374+
if (tg->funcs->wait_for_state)
23742375
tg->funcs->wait_for_state(tg, state);
2375-
}
23762376
}
23772377

23782378
void hwss_tg_set_vtg_params(union block_sequence_params *params)
@@ -2381,29 +2381,26 @@ void hwss_tg_set_vtg_params(union block_sequence_params *params)
23812381
struct dc_crtc_timing *timing = params->tg_set_vtg_params_params.timing;
23822382
bool program_fp2 = params->tg_set_vtg_params_params.program_fp2;
23832383

2384-
if (tg->funcs->set_vtg_params) {
2384+
if (tg->funcs->set_vtg_params)
23852385
tg->funcs->set_vtg_params(tg, timing, program_fp2);
2386-
}
23872386
}
23882387

23892388
void hwss_tg_setup_vertical_interrupt2(union block_sequence_params *params)
23902389
{
23912390
struct timing_generator *tg = params->tg_setup_vertical_interrupt2_params.tg;
23922391
int start_line = params->tg_setup_vertical_interrupt2_params.start_line;
23932392

2394-
if (tg->funcs->setup_vertical_interrupt2) {
2393+
if (tg->funcs->setup_vertical_interrupt2)
23952394
tg->funcs->setup_vertical_interrupt2(tg, start_line);
2396-
}
23972395
}
23982396

23992397
void hwss_dpp_set_hdr_multiplier(union block_sequence_params *params)
24002398
{
24012399
struct dpp *dpp = params->dpp_set_hdr_multiplier_params.dpp;
24022400
uint32_t hw_mult = params->dpp_set_hdr_multiplier_params.hw_mult;
24032401

2404-
if (dpp->funcs->dpp_set_hdr_multiplier) {
2402+
if (dpp->funcs->dpp_set_hdr_multiplier)
24052403
dpp->funcs->dpp_set_hdr_multiplier(dpp, hw_mult);
2406-
}
24072404
}
24082405

24092406
void hwss_program_det_size(union block_sequence_params *params)
@@ -2412,9 +2409,8 @@ void hwss_program_det_size(union block_sequence_params *params)
24122409
unsigned int hubp_inst = params->program_det_size_params.hubp_inst;
24132410
unsigned int det_buffer_size_kb = params->program_det_size_params.det_buffer_size_kb;
24142411

2415-
if (hubbub->funcs->program_det_size) {
2412+
if (hubbub->funcs->program_det_size)
24162413
hubbub->funcs->program_det_size(hubbub, hubp_inst, det_buffer_size_kb);
2417-
}
24182414
}
24192415

24202416
void hwss_program_det_segments(union block_sequence_params *params)
@@ -2423,9 +2419,8 @@ void hwss_program_det_segments(union block_sequence_params *params)
24232419
unsigned int hubp_inst = params->program_det_segments_params.hubp_inst;
24242420
unsigned int det_size = params->program_det_segments_params.det_size;
24252421

2426-
if (hubbub->funcs->program_det_segments) {
2422+
if (hubbub->funcs->program_det_segments)
24272423
hubbub->funcs->program_det_segments(hubbub, hubp_inst, det_size);
2428-
}
24292424
}
24302425

24312426
void hwss_opp_set_dyn_expansion(union block_sequence_params *params)
@@ -2435,9 +2430,8 @@ void hwss_opp_set_dyn_expansion(union block_sequence_params *params)
24352430
enum dc_color_depth color_depth = params->opp_set_dyn_expansion_params.color_depth;
24362431
enum signal_type signal = params->opp_set_dyn_expansion_params.signal;
24372432

2438-
if (opp->funcs->opp_set_dyn_expansion) {
2433+
if (opp->funcs->opp_set_dyn_expansion)
24392434
opp->funcs->opp_set_dyn_expansion(opp, color_space, color_depth, signal);
2440-
}
24412435
}
24422436

24432437
void hwss_opp_program_fmt(union block_sequence_params *params)
@@ -2446,9 +2440,8 @@ void hwss_opp_program_fmt(union block_sequence_params *params)
24462440
struct bit_depth_reduction_params *fmt_bit_depth = params->opp_program_fmt_params.fmt_bit_depth;
24472441
struct clamping_and_pixel_encoding_params *clamping = params->opp_program_fmt_params.clamping;
24482442

2449-
if (opp->funcs->opp_program_fmt) {
2443+
if (opp->funcs->opp_program_fmt)
24502444
opp->funcs->opp_program_fmt(opp, fmt_bit_depth, clamping);
2451-
}
24522445
}
24532446

24542447
void hwss_opp_program_bit_depth_reduction(union block_sequence_params *params)
@@ -2458,15 +2451,13 @@ void hwss_opp_program_bit_depth_reduction(union block_sequence_params *params)
24582451
struct pipe_ctx *pipe_ctx = params->opp_program_bit_depth_reduction_params.pipe_ctx;
24592452
struct bit_depth_reduction_params bit_depth_params;
24602453

2461-
if (use_default_params) {
2454+
if (use_default_params)
24622455
memset(&bit_depth_params, 0, sizeof(bit_depth_params));
2463-
} else {
2456+
else
24642457
resource_build_bit_depth_reduction_params(pipe_ctx->stream, &bit_depth_params);
2465-
}
24662458

2467-
if (opp->funcs->opp_program_bit_depth_reduction) {
2459+
if (opp->funcs->opp_program_bit_depth_reduction)
24682460
opp->funcs->opp_program_bit_depth_reduction(opp, &bit_depth_params);
2469-
}
24702461
}
24712462

24722463
void hwss_opp_set_disp_pattern_generator(union block_sequence_params *params)
@@ -2500,19 +2491,17 @@ void hwss_set_abm_level(union block_sequence_params *params)
25002491
struct abm *abm = params->set_abm_level_params.abm;
25012492
unsigned int abm_level = params->set_abm_level_params.abm_level;
25022493

2503-
if (abm->funcs->set_abm_level) {
2494+
if (abm->funcs->set_abm_level)
25042495
abm->funcs->set_abm_level(abm, abm_level);
2505-
}
25062496
}
25072497

25082498
void hwss_set_abm_immediate_disable(union block_sequence_params *params)
25092499
{
25102500
struct dc *dc = params->set_abm_immediate_disable_params.dc;
25112501
struct pipe_ctx *pipe_ctx = params->set_abm_immediate_disable_params.pipe_ctx;
25122502

2513-
if (dc && dc->hwss.set_abm_immediate_disable) {
2503+
if (dc && dc->hwss.set_abm_immediate_disable)
25142504
dc->hwss.set_abm_immediate_disable(pipe_ctx);
2515-
}
25162505
}
25172506

25182507
void hwss_mpc_remove_mpcc(union block_sequence_params *params)
@@ -2793,34 +2782,29 @@ void hwss_hubp_init(union block_sequence_params *params)
27932782
{
27942783
struct hubp *hubp = params->hubp_init_params.hubp;
27952784

2796-
if (hubp && hubp->funcs->hubp_init) {
2785+
if (hubp && hubp->funcs->hubp_init)
27972786
hubp->funcs->hubp_init(hubp);
2798-
}
27992787
}
28002788

28012789
void hwss_hubp_set_vm_system_aperture_settings(union block_sequence_params *params)
28022790
{
28032791
struct hubp *hubp = params->hubp_set_vm_system_aperture_settings_params.hubp;
2804-
//struct vm_system_aperture_param *apt = &params->hubp_set_vm_system_aperture_settings_params.apt;
28052792
struct vm_system_aperture_param apt;
28062793

28072794
apt.sys_default = params->hubp_set_vm_system_aperture_settings_params.sys_default;
28082795
apt.sys_high = params->hubp_set_vm_system_aperture_settings_params.sys_high;
28092796
apt.sys_low = params->hubp_set_vm_system_aperture_settings_params.sys_low;
28102797

2811-
if (hubp && hubp->funcs->hubp_set_vm_system_aperture_settings) {
2812-
//hubp->funcs->hubp_set_vm_system_aperture_settings(hubp, apt);
2798+
if (hubp && hubp->funcs->hubp_set_vm_system_aperture_settings)
28132799
hubp->funcs->hubp_set_vm_system_aperture_settings(hubp, &apt);
2814-
}
28152800
}
28162801

28172802
void hwss_hubp_set_flip_int(union block_sequence_params *params)
28182803
{
28192804
struct hubp *hubp = params->hubp_set_flip_int_params.hubp;
28202805

2821-
if (hubp && hubp->funcs->hubp_set_flip_int) {
2806+
if (hubp && hubp->funcs->hubp_set_flip_int)
28222807
hubp->funcs->hubp_set_flip_int(hubp);
2823-
}
28242808
}
28252809

28262810
void hwss_dpp_dppclk_control(union block_sequence_params *params)
@@ -3049,13 +3033,10 @@ void hwss_mpc_update_blending(union block_sequence_params *params)
30493033
void hwss_mpc_assert_idle_mpcc(union block_sequence_params *params)
30503034
{
30513035
struct mpc *mpc = params->mpc_assert_idle_mpcc_params.mpc;
3052-
//struct pipe_ctx *pipe_ctx = params->mpc_assert_idle_mpcc_params.pipe_ctx;
30533036
int mpcc_id = params->mpc_assert_idle_mpcc_params.mpcc_id;
30543037

30553038
if (mpc && mpc->funcs->wait_for_idle)
30563039
mpc->funcs->wait_for_idle(mpc, mpcc_id);
3057-
3058-
//pipe_ctx->stream_res.opp->mpcc_disconnect_pending[mpcc_id] = false;
30593040
}
30603041

30613042
void hwss_mpc_insert_plane(union block_sequence_params *params)

0 commit comments

Comments
 (0)