Address the following warning:
drivers/gpu/drm/amd/amdgpu/../display/dc/core/dc.c:3508:9: warning: this ‘if’ clause does not guard... [-Wmisleading-indentation]
3508 | if (update_type != UPDATE_TYPE_FAST)
| ^~
drivers/gpu/drm/amd/amdgpu/../display/dc/core/dc.c:3510:17: note: ...this statement, but the latter is misleadingly indented as if it were guarded by the ‘if’
3510 | if (update_type != UPDATE_TYPE_FAST)
| ^~
Signed-off-by: Hamza Mahfooz <[email protected]>
---
drivers/gpu/drm/amd/display/dc/core/dc.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c
index b49237390cce..6c4948916e7e 100644
--- a/drivers/gpu/drm/amd/display/dc/core/dc.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc.c
@@ -3505,11 +3505,11 @@ static void commit_planes_for_stream(struct dc *dc,
top_pipe_to_program->stream_res.tg);
}
- if (update_type != UPDATE_TYPE_FAST)
+ if (update_type != UPDATE_TYPE_FAST) {
dc->hwss.post_unlock_program_front_end(dc, context);
- if (update_type != UPDATE_TYPE_FAST)
- if (dc->hwss.commit_subvp_config)
- dc->hwss.commit_subvp_config(dc, context);
+ if (dc->hwss.commit_subvp_config)
+ dc->hwss.commit_subvp_config(dc, context);
+ }
/* Since phantom pipe programming is moved to post_unlock_program_front_end,
* move the SubVP lock to after the phantom pipes have been setup
--
2.37.2
[AMD Official Use Only - General]
> -----Original Message-----
> From: Mahfooz, Hamza <[email protected]>
> Sent: Wednesday, August 31, 2022 1:58 PM
> To: [email protected]
> Cc: Mahfooz, Hamza <[email protected]>; Wentland, Harry
> <[email protected]>; Li, Sun peng (Leo) <[email protected]>;
> Siqueira, Rodrigo <[email protected]>; Deucher, Alexander
> <[email protected]>; Koenig, Christian
> <[email protected]>; Pan, Xinhui <[email protected]>; David
> Airlie <[email protected]>; Daniel Vetter <[email protected]>; Kazlauskas,
> Nicholas <[email protected]>; Lei, Jun <[email protected]>;
> Somasundaram, Meenakshikumar
> <[email protected]>; Lee, Alvin
> <[email protected]>; Leung, Martin <[email protected]>; Tam,
> Samson <[email protected]>; Hung, Alex <[email protected]>;
> Aberback, Joshua <[email protected]>; Liu, Wenjing
> <[email protected]>; [email protected]; dri-
> [email protected]
> Subject: [PATCH] drm/amd/display: fix indentation in
> commit_planes_for_stream()
>
> Address the following warning:
> drivers/gpu/drm/amd/amdgpu/../display/dc/core/dc.c:3508:9: warning: this
> ‘if’ clause does not guard... [-Wmisleading-indentation]
> 3508 | if (update_type != UPDATE_TYPE_FAST)
> | ^~
> drivers/gpu/drm/amd/amdgpu/../display/dc/core/dc.c:3510:17: note: ...this
> statement, but the latter is misleadingly indented as if it were guarded by the
> ‘if’
> 3510 | if (update_type != UPDATE_TYPE_FAST)
> | ^~
>
> Signed-off-by: Hamza Mahfooz <[email protected]>
Acked-by: Alex Deucher <[email protected]>
> ---
> drivers/gpu/drm/amd/display/dc/core/dc.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c
> b/drivers/gpu/drm/amd/display/dc/core/dc.c
> index b49237390cce..6c4948916e7e 100644
> --- a/drivers/gpu/drm/amd/display/dc/core/dc.c
> +++ b/drivers/gpu/drm/amd/display/dc/core/dc.c
> @@ -3505,11 +3505,11 @@ static void commit_planes_for_stream(struct dc
> *dc,
> top_pipe_to_program-
> >stream_res.tg);
> }
>
> - if (update_type != UPDATE_TYPE_FAST)
> + if (update_type != UPDATE_TYPE_FAST) {
> dc->hwss.post_unlock_program_front_end(dc, context);
> - if (update_type != UPDATE_TYPE_FAST)
> - if (dc->hwss.commit_subvp_config)
> - dc->hwss.commit_subvp_config(dc,
> context);
> + if (dc->hwss.commit_subvp_config)
> + dc->hwss.commit_subvp_config(dc, context);
> + }
>
> /* Since phantom pipe programming is moved to
> post_unlock_program_front_end,
> * move the SubVP lock to after the phantom pipes have been setup
> --
> 2.37.2