[PATCH v2] drm/amd/display: fix indentation in commit_planes_for_stream()

[PATCH v2] drm/amd/display: fix indentation in commit_planes_for_stream()

[Hamza Mahfooz]

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 <hamza.mahfooz@amd.com>
---
v2: implement feedback from Alvin
---
 drivers/gpu/drm/amd/display/dc/core/dc.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 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..9860bf38c547 100644
--- a/drivers/gpu/drm/amd/display/dc/core/dc.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc.c
@@ -3507,9 +3507,10 @@ static void commit_planes_for_stream(struct dc *dc,
 
 	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 (update_type != UPDATE_TYPE_FAST)
+		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

Re: [PATCH v2] drm/amd/display: fix indentation in commit_planes_for_stream()

[Deucher, Alexander]

[-- Attachment #1: Type: text/plain, Size: 2863 bytes --]

[Public]

Acked-by: Alex Deucher <alexander.deucher@amd.com>
________________________________
From: Mahfooz, Hamza <Hamza.Mahfooz@amd.com>
Sent: Thursday, September 1, 2022 10:15 AM
To: linux-kernel@vger.kernel.org <linux-kernel@vger.kernel.org>
Cc: Mahfooz, Hamza <Hamza.Mahfooz@amd.com>; Wentland, Harry <Harry.Wentland@amd.com>; Li, Sun peng (Leo) <Sunpeng.Li@amd.com>; Siqueira, Rodrigo <Rodrigo.Siqueira@amd.com>; Deucher, Alexander <Alexander.Deucher@amd.com>; Koenig, Christian <Christian.Koenig@amd.com>; Pan, Xinhui <Xinhui.Pan@amd.com>; David Airlie <airlied@linux.ie>; Daniel Vetter <daniel@ffwll.ch>; Kazlauskas, Nicholas <Nicholas.Kazlauskas@amd.com>; Lei, Jun <Jun.Lei@amd.com>; Somasundaram, Meenakshikumar <Meenakshikumar.Somasundaram@amd.com>; Lee, Alvin <Alvin.Lee2@amd.com>; Leung, Martin <Martin.Leung@amd.com>; Tam, Samson <Samson.Tam@amd.com>; Hung, Alex <Alex.Hung@amd.com>; Liu, Wenjing <Wenjing.Liu@amd.com>; Aberback, Joshua <Joshua.Aberback@amd.com>; amd-gfx@lists.freedesktop.org <amd-gfx@lists.freedesktop.org>; dri-devel@lists.freedesktop.org <dri-devel@lists.freedesktop.org>
Subject: [PATCH v2] 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 <hamza.mahfooz@amd.com>
---
v2: implement feedback from Alvin
---
 drivers/gpu/drm/amd/display/dc/core/dc.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 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..9860bf38c547 100644
--- a/drivers/gpu/drm/amd/display/dc/core/dc.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc.c
@@ -3507,9 +3507,10 @@ static void commit_planes_for_stream(struct dc *dc,

         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 (update_type != UPDATE_TYPE_FAST)
+               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


[-- Attachment #2: Type: text/html, Size: 5093 bytes --]

Re: [PATCH v2] drm/amd/display: fix indentation in commit_planes_for_stream()

[Rodrigo Siqueira Jordao]

On 2022-09-01 10:15, Hamza Mahfooz wrote:
> 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 <hamza.mahfooz@amd.com>
> ---
> v2: implement feedback from Alvin
> ---
>   drivers/gpu/drm/amd/display/dc/core/dc.c | 7 ++++---
>   1 file changed, 4 insertions(+), 3 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..9860bf38c547 100644
> --- a/drivers/gpu/drm/amd/display/dc/core/dc.c
> +++ b/drivers/gpu/drm/amd/display/dc/core/dc.c
> @@ -3507,9 +3507,10 @@ static void commit_planes_for_stream(struct dc *dc,
>   
>   	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 (update_type != UPDATE_TYPE_FAST)
> +		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

Reviewed-by: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>
and applied to amd-staging-drm-next.

Thanks
Siqueira