linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH -next] drm/amd/display: clean up some inconsistent indenting
@ 2022-01-29  1:04 Yang Li
  2022-01-31 15:17 ` Harry Wentland
  0 siblings, 1 reply; 7+ messages in thread
From: Yang Li @ 2022-01-29  1:04 UTC (permalink / raw)
  To: airlied
  Cc: daniel, Xinhui.Pan, christian.koenig, alexander.deucher,
	Rodrigo.Siqueira, sunpeng.li, harry.wentland, amd-gfx, dri-devel,
	linux-kernel, Yang Li, Abaci Robot

Eliminate the follow smatch warning:
drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c:2246
dp_perform_8b_10b_link_training() warn: inconsistent indenting

Reported-by: Abaci Robot <abaci@linux.alibaba.com>
Signed-off-by: Yang Li <yang.lee@linux.alibaba.com>
---
 drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c b/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c
index daaec3164875..34ffcd5bb1d7 100644
--- a/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c
@@ -2243,11 +2243,11 @@ static enum link_training_result dp_perform_8b_10b_link_training(
 
 	if (status == LINK_TRAINING_SUCCESS) {
 		status = perform_clock_recovery_sequence(link, link_res, lt_settings, DPRX);
-	if (status == LINK_TRAINING_SUCCESS) {
-		status = perform_channel_equalization_sequence(link,
-					link_res,
-					lt_settings,
-					DPRX);
+		if (status == LINK_TRAINING_SUCCESS) {
+			status = perform_channel_equalization_sequence(link,
+								       link_res,
+								       lt_settings,
+								       DPRX);
 		}
 	}
 
-- 
2.20.1.7.g153144c


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* Re: [PATCH -next] drm/amd/display: clean up some inconsistent indenting
  2022-01-29  1:04 [PATCH -next] drm/amd/display: clean up some inconsistent indenting Yang Li
@ 2022-01-31 15:17 ` Harry Wentland
  2022-01-31 20:15   ` Alex Deucher
  0 siblings, 1 reply; 7+ messages in thread
From: Harry Wentland @ 2022-01-31 15:17 UTC (permalink / raw)
  To: Yang Li, airlied
  Cc: daniel, Xinhui.Pan, christian.koenig, alexander.deucher,
	Rodrigo.Siqueira, sunpeng.li, amd-gfx, dri-devel, linux-kernel,
	Abaci Robot

On 2022-01-28 20:04, Yang Li wrote:
> Eliminate the follow smatch warning:
> drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c:2246
> dp_perform_8b_10b_link_training() warn: inconsistent indenting
> 
> Reported-by: Abaci Robot <abaci@linux.alibaba.com>
> Signed-off-by: Yang Li <yang.lee@linux.alibaba.com>

Reviewed-by: Harry Wentland <harry.wentland@amd.com>

Harry

> ---
>  drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c b/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c
> index daaec3164875..34ffcd5bb1d7 100644
> --- a/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c
> +++ b/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c
> @@ -2243,11 +2243,11 @@ static enum link_training_result dp_perform_8b_10b_link_training(
>  
>  	if (status == LINK_TRAINING_SUCCESS) {
>  		status = perform_clock_recovery_sequence(link, link_res, lt_settings, DPRX);
> -	if (status == LINK_TRAINING_SUCCESS) {
> -		status = perform_channel_equalization_sequence(link,
> -					link_res,
> -					lt_settings,
> -					DPRX);
> +		if (status == LINK_TRAINING_SUCCESS) {
> +			status = perform_channel_equalization_sequence(link,
> +								       link_res,
> +								       lt_settings,
> +								       DPRX);
>  		}
>  	}
>  


^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH -next] drm/amd/display: clean up some inconsistent indenting
  2022-01-31 15:17 ` Harry Wentland
@ 2022-01-31 20:15   ` Alex Deucher
  0 siblings, 0 replies; 7+ messages in thread
From: Alex Deucher @ 2022-01-31 20:15 UTC (permalink / raw)
  To: Harry Wentland
  Cc: Yang Li, Dave Airlie, Leo (Sunpeng) Li, Abaci Robot, xinhui pan,
	Siqueira, Rodrigo, LKML, amd-gfx list,
	Maling list - DRI developers, Daniel Vetter, Deucher, Alexander,
	Christian Koenig

Applied.  Thanks!

Alex

On Mon, Jan 31, 2022 at 10:17 AM Harry Wentland <harry.wentland@amd.com> wrote:
>
> On 2022-01-28 20:04, Yang Li wrote:
> > Eliminate the follow smatch warning:
> > drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c:2246
> > dp_perform_8b_10b_link_training() warn: inconsistent indenting
> >
> > Reported-by: Abaci Robot <abaci@linux.alibaba.com>
> > Signed-off-by: Yang Li <yang.lee@linux.alibaba.com>
>
> Reviewed-by: Harry Wentland <harry.wentland@amd.com>
>
> Harry
>
> > ---
> >  drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 10 +++++-----
> >  1 file changed, 5 insertions(+), 5 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c b/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c
> > index daaec3164875..34ffcd5bb1d7 100644
> > --- a/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c
> > +++ b/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c
> > @@ -2243,11 +2243,11 @@ static enum link_training_result dp_perform_8b_10b_link_training(
> >
> >       if (status == LINK_TRAINING_SUCCESS) {
> >               status = perform_clock_recovery_sequence(link, link_res, lt_settings, DPRX);
> > -     if (status == LINK_TRAINING_SUCCESS) {
> > -             status = perform_channel_equalization_sequence(link,
> > -                                     link_res,
> > -                                     lt_settings,
> > -                                     DPRX);
> > +             if (status == LINK_TRAINING_SUCCESS) {
> > +                     status = perform_channel_equalization_sequence(link,
> > +                                                                    link_res,
> > +                                                                    lt_settings,
> > +                                                                    DPRX);
> >               }
> >       }
> >
>

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH -next] drm/amd/display: clean up some inconsistent indenting
  2022-07-07  1:38 Yang Li
@ 2022-07-07 18:17 ` Alex Deucher
  0 siblings, 0 replies; 7+ messages in thread
From: Alex Deucher @ 2022-07-07 18:17 UTC (permalink / raw)
  To: Yang Li
  Cc: Deucher, Alexander, Leo (Sunpeng) Li, xinhui pan, Siqueira,
	Rodrigo, LKML, amd-gfx list, Dave Airlie,
	Maling list - DRI developers, Christian Koenig

Applied.  Thanks!

Alex

On Wed, Jul 6, 2022 at 9:38 PM Yang Li <yang.lee@linux.alibaba.com> wrote:
>
> Eliminate the follow smatch warnings:
> drivers/gpu/drm/amd/amdgpu/../display/dc/bios/bios_parser2.c:405 get_bios_object_from_path_v3() warn: inconsistent indenting
> drivers/gpu/drm/amd/amdgpu/../display/dc/bios/bios_parser2.c:611 bios_parser_get_hpd_info() warn: inconsistent indenting
> drivers/gpu/drm/amd/amdgpu/../display/dc/bios/bios_parser2.c:818 bios_parser_get_device_tag() warn: inconsistent indenting
> drivers/gpu/drm/amd/amdgpu/../display/dc/bios/bios_parser2.c:1599 bios_parser_is_device_id_supported() warn: inconsistent indenting
>
> Signed-off-by: Yang Li <yang.lee@linux.alibaba.com>
> ---
>  .../gpu/drm/amd/display/dc/bios/bios_parser2.c   | 16 ++++++++--------
>  1 file changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c b/drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c
> index c332650b7048..6f514d92b401 100644
> --- a/drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c
> +++ b/drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c
> @@ -402,7 +402,7 @@ static struct atom_display_object_path_v3 *get_bios_object_from_path_v3(
>                 return NULL;
>         }
>
> -    return NULL;
> +       return NULL;
>  }
>
>  static enum bp_result bios_parser_get_i2c_info(struct dc_bios *dcb,
> @@ -605,8 +605,8 @@ static enum bp_result bios_parser_get_hpd_info(
>             default:
>                 object = get_bios_object(bp, id);
>
> -                       if (!object)
> -                               return BP_RESULT_BADINPUT;
> +               if (!object)
> +                       return BP_RESULT_BADINPUT;
>
>                 record = get_hpd_record(bp, object);
>
> @@ -810,10 +810,10 @@ static enum bp_result bios_parser_get_device_tag(
>                 /* getBiosObject will return MXM object */
>                 object = get_bios_object(bp, connector_object_id);
>
> -                       if (!object) {
> -                               BREAK_TO_DEBUGGER(); /* Invalid object id */
> -                               return BP_RESULT_BADINPUT;
> -                       }
> +               if (!object) {
> +                       BREAK_TO_DEBUGGER(); /* Invalid object id */
> +                       return BP_RESULT_BADINPUT;
> +               }
>
>                 info->acpi_device = 0; /* BIOS no longer provides this */
>                 info->dev_id = device_type_from_device_id(object->device_tag);
> @@ -1596,7 +1596,7 @@ static bool bios_parser_is_device_id_supported(
>                         break;
>         }
>
> -    return false;
> +       return false;
>  }
>
>  static uint32_t bios_parser_get_ss_entry_number(
> --
> 2.20.1.7.g153144c
>

^ permalink raw reply	[flat|nested] 7+ messages in thread

* [PATCH -next] drm/amd/display: clean up some inconsistent indenting
@ 2022-07-07  1:38 Yang Li
  2022-07-07 18:17 ` Alex Deucher
  0 siblings, 1 reply; 7+ messages in thread
From: Yang Li @ 2022-07-07  1:38 UTC (permalink / raw)
  To: alexander.deucher
  Cc: Rodrigo.Siqueira, harry.wentland, sunpeng.li, christian.koenig,
	Xinhui.Pan, airlied, daniel, amd-gfx, dri-devel, linux-kernel,
	Yang Li

Eliminate the follow smatch warnings:
drivers/gpu/drm/amd/amdgpu/../display/dc/bios/bios_parser2.c:405 get_bios_object_from_path_v3() warn: inconsistent indenting
drivers/gpu/drm/amd/amdgpu/../display/dc/bios/bios_parser2.c:611 bios_parser_get_hpd_info() warn: inconsistent indenting
drivers/gpu/drm/amd/amdgpu/../display/dc/bios/bios_parser2.c:818 bios_parser_get_device_tag() warn: inconsistent indenting
drivers/gpu/drm/amd/amdgpu/../display/dc/bios/bios_parser2.c:1599 bios_parser_is_device_id_supported() warn: inconsistent indenting

Signed-off-by: Yang Li <yang.lee@linux.alibaba.com>
---
 .../gpu/drm/amd/display/dc/bios/bios_parser2.c   | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c b/drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c
index c332650b7048..6f514d92b401 100644
--- a/drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c
+++ b/drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c
@@ -402,7 +402,7 @@ static struct atom_display_object_path_v3 *get_bios_object_from_path_v3(
 		return NULL;
 	}
 
-    return NULL;
+	return NULL;
 }
 
 static enum bp_result bios_parser_get_i2c_info(struct dc_bios *dcb,
@@ -605,8 +605,8 @@ static enum bp_result bios_parser_get_hpd_info(
 	    default:
 	        object = get_bios_object(bp, id);
 
-			if (!object)
-				return BP_RESULT_BADINPUT;
+		if (!object)
+			return BP_RESULT_BADINPUT;
 
 	        record = get_hpd_record(bp, object);
 
@@ -810,10 +810,10 @@ static enum bp_result bios_parser_get_device_tag(
 	        /* getBiosObject will return MXM object */
 	        object = get_bios_object(bp, connector_object_id);
 
-			if (!object) {
-				BREAK_TO_DEBUGGER(); /* Invalid object id */
-				return BP_RESULT_BADINPUT;
-			}
+		if (!object) {
+			BREAK_TO_DEBUGGER(); /* Invalid object id */
+			return BP_RESULT_BADINPUT;
+		}
 
 	        info->acpi_device = 0; /* BIOS no longer provides this */
 	        info->dev_id = device_type_from_device_id(object->device_tag);
@@ -1596,7 +1596,7 @@ static bool bios_parser_is_device_id_supported(
 			break;
 	}
 
-    return false;
+	return false;
 }
 
 static uint32_t bios_parser_get_ss_entry_number(
-- 
2.20.1.7.g153144c


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* Re: [PATCH -next] drm/amd/display: clean up some inconsistent indenting
  2022-07-01  9:19 Yang Li
@ 2022-07-05 15:22 ` Alex Deucher
  0 siblings, 0 replies; 7+ messages in thread
From: Alex Deucher @ 2022-07-05 15:22 UTC (permalink / raw)
  To: Yang Li
  Cc: Wentland, Harry, Leo (Sunpeng) Li, xinhui pan, Siqueira, Rodrigo,
	LKML, amd-gfx list, Dave Airlie, Maling list - DRI developers,
	Deucher, Alexander, Christian Koenig

Applied.  Thanks!

Alex

On Fri, Jul 1, 2022 at 5:24 AM Yang Li <yang.lee@linux.alibaba.com> wrote:
>
> Eliminate the follow smatch warning:
> drivers/gpu/drm/amd/amdgpu/../display/dc/core/dc.c:3151 commit_planes_for_stream() warn: inconsistent indenting
>
> Signed-off-by: Yang Li <yang.lee@linux.alibaba.com>
> ---
>  drivers/gpu/drm/amd/display/dc/core/dc.c | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c
> index 146fd4b864b2..d31da9c0256a 100644
> --- a/drivers/gpu/drm/amd/display/dc/core/dc.c
> +++ b/drivers/gpu/drm/amd/display/dc/core/dc.c
> @@ -3148,15 +3148,15 @@ static void commit_planes_for_stream(struct dc *dc,
>                 else
>                         dc->hwss.pipe_control_lock(dc, top_pipe_to_program, false);
>
> -       if ((update_type != UPDATE_TYPE_FAST) && stream->update_flags.bits.dsc_changed)
> -               if (top_pipe_to_program->stream_res.tg->funcs->lock_doublebuffer_enable) {
> -                       top_pipe_to_program->stream_res.tg->funcs->wait_for_state(
> +               if ((update_type != UPDATE_TYPE_FAST) && stream->update_flags.bits.dsc_changed)
> +                       if (top_pipe_to_program->stream_res.tg->funcs->lock_doublebuffer_enable) {
> +                               top_pipe_to_program->stream_res.tg->funcs->wait_for_state(
>                                         top_pipe_to_program->stream_res.tg,
>                                         CRTC_STATE_VACTIVE);
> -                       top_pipe_to_program->stream_res.tg->funcs->wait_for_state(
> +                               top_pipe_to_program->stream_res.tg->funcs->wait_for_state(
>                                         top_pipe_to_program->stream_res.tg,
>                                         CRTC_STATE_VBLANK);
> -                       top_pipe_to_program->stream_res.tg->funcs->wait_for_state(
> +                               top_pipe_to_program->stream_res.tg->funcs->wait_for_state(
>                                         top_pipe_to_program->stream_res.tg,
>                                         CRTC_STATE_VACTIVE);
>
> --
> 2.20.1.7.g153144c
>

^ permalink raw reply	[flat|nested] 7+ messages in thread

* [PATCH -next] drm/amd/display: clean up some inconsistent indenting
@ 2022-07-01  9:19 Yang Li
  2022-07-05 15:22 ` Alex Deucher
  0 siblings, 1 reply; 7+ messages in thread
From: Yang Li @ 2022-07-01  9:19 UTC (permalink / raw)
  To: harry.wentland
  Cc: sunpeng.li, Rodrigo.Siqueira, alexander.deucher,
	christian.koenig, Xinhui.Pan, airlied, daniel, amd-gfx,
	dri-devel, linux-kernel, Yang Li

Eliminate the follow smatch warning:
drivers/gpu/drm/amd/amdgpu/../display/dc/core/dc.c:3151 commit_planes_for_stream() warn: inconsistent indenting

Signed-off-by: Yang Li <yang.lee@linux.alibaba.com>
---
 drivers/gpu/drm/amd/display/dc/core/dc.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c
index 146fd4b864b2..d31da9c0256a 100644
--- a/drivers/gpu/drm/amd/display/dc/core/dc.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc.c
@@ -3148,15 +3148,15 @@ static void commit_planes_for_stream(struct dc *dc,
 		else
 			dc->hwss.pipe_control_lock(dc, top_pipe_to_program, false);
 
-	if ((update_type != UPDATE_TYPE_FAST) && stream->update_flags.bits.dsc_changed)
-		if (top_pipe_to_program->stream_res.tg->funcs->lock_doublebuffer_enable) {
-			top_pipe_to_program->stream_res.tg->funcs->wait_for_state(
+		if ((update_type != UPDATE_TYPE_FAST) && stream->update_flags.bits.dsc_changed)
+			if (top_pipe_to_program->stream_res.tg->funcs->lock_doublebuffer_enable) {
+				top_pipe_to_program->stream_res.tg->funcs->wait_for_state(
 					top_pipe_to_program->stream_res.tg,
 					CRTC_STATE_VACTIVE);
-			top_pipe_to_program->stream_res.tg->funcs->wait_for_state(
+				top_pipe_to_program->stream_res.tg->funcs->wait_for_state(
 					top_pipe_to_program->stream_res.tg,
 					CRTC_STATE_VBLANK);
-			top_pipe_to_program->stream_res.tg->funcs->wait_for_state(
+				top_pipe_to_program->stream_res.tg->funcs->wait_for_state(
 					top_pipe_to_program->stream_res.tg,
 					CRTC_STATE_VACTIVE);
 
-- 
2.20.1.7.g153144c


^ permalink raw reply related	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2022-07-07 18:17 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-01-29  1:04 [PATCH -next] drm/amd/display: clean up some inconsistent indenting Yang Li
2022-01-31 15:17 ` Harry Wentland
2022-01-31 20:15   ` Alex Deucher
2022-07-01  9:19 Yang Li
2022-07-05 15:22 ` Alex Deucher
2022-07-07  1:38 Yang Li
2022-07-07 18:17 ` Alex Deucher

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).