All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH][next] drm/amd/display: fix indentation issue on a hunk of code
@ 2020-02-28 13:16 ` Colin King
  0 siblings, 0 replies; 8+ messages in thread
From: Colin King @ 2020-02-28 13:16 UTC (permalink / raw)
  To: Harry Wentland, Leo Li, Alex Deucher, Christian König,
	David Zhou, David Airlie, Daniel Vetter, amd-gfx, dri-devel
  Cc: kernel-janitors, linux-kernel

From: Colin Ian King <colin.king@canonical.com>

There are multiple statements that are indented incorrectly. Add
in the missing tabs.

Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
 .../gpu/drm/amd/display/dc/calcs/dce_calcs.c  | 46 +++++++++----------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c b/drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c
index 5d081c42e81b..2c6db379afae 100644
--- a/drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c
+++ b/drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c
@@ -3265,33 +3265,33 @@ bool bw_calcs(struct dc_context *ctx,
 				bw_fixed_to_int(bw_mul(data->
 					stutter_exit_watermark[9], bw_int_to_fixed(1000)));
 
-		calcs_output->stutter_entry_wm_ns[0].b_mark =
-			bw_fixed_to_int(bw_mul(data->
-				stutter_entry_watermark[4], bw_int_to_fixed(1000)));
-		calcs_output->stutter_entry_wm_ns[1].b_mark =
-			bw_fixed_to_int(bw_mul(data->
-				stutter_entry_watermark[5], bw_int_to_fixed(1000)));
-		calcs_output->stutter_entry_wm_ns[2].b_mark =
-			bw_fixed_to_int(bw_mul(data->
-				stutter_entry_watermark[6], bw_int_to_fixed(1000)));
-		if (ctx->dc->caps.max_slave_planes) {
-			calcs_output->stutter_entry_wm_ns[3].b_mark =
+			calcs_output->stutter_entry_wm_ns[0].b_mark =
 				bw_fixed_to_int(bw_mul(data->
-					stutter_entry_watermark[0], bw_int_to_fixed(1000)));
-			calcs_output->stutter_entry_wm_ns[4].b_mark =
+					stutter_entry_watermark[4], bw_int_to_fixed(1000)));
+			calcs_output->stutter_entry_wm_ns[1].b_mark =
 				bw_fixed_to_int(bw_mul(data->
-					stutter_entry_watermark[1], bw_int_to_fixed(1000)));
-		} else {
-			calcs_output->stutter_entry_wm_ns[3].b_mark =
+					stutter_entry_watermark[5], bw_int_to_fixed(1000)));
+			calcs_output->stutter_entry_wm_ns[2].b_mark =
 				bw_fixed_to_int(bw_mul(data->
-					stutter_entry_watermark[7], bw_int_to_fixed(1000)));
-			calcs_output->stutter_entry_wm_ns[4].b_mark =
+					stutter_entry_watermark[6], bw_int_to_fixed(1000)));
+			if (ctx->dc->caps.max_slave_planes) {
+				calcs_output->stutter_entry_wm_ns[3].b_mark =
+					bw_fixed_to_int(bw_mul(data->
+						stutter_entry_watermark[0], bw_int_to_fixed(1000)));
+				calcs_output->stutter_entry_wm_ns[4].b_mark =
+					bw_fixed_to_int(bw_mul(data->
+						stutter_entry_watermark[1], bw_int_to_fixed(1000)));
+			} else {
+				calcs_output->stutter_entry_wm_ns[3].b_mark =
+					bw_fixed_to_int(bw_mul(data->
+						stutter_entry_watermark[7], bw_int_to_fixed(1000)));
+				calcs_output->stutter_entry_wm_ns[4].b_mark =
+					bw_fixed_to_int(bw_mul(data->
+						stutter_entry_watermark[8], bw_int_to_fixed(1000)));
+			}
+			calcs_output->stutter_entry_wm_ns[5].b_mark =
 				bw_fixed_to_int(bw_mul(data->
-					stutter_entry_watermark[8], bw_int_to_fixed(1000)));
-		}
-		calcs_output->stutter_entry_wm_ns[5].b_mark =
-			bw_fixed_to_int(bw_mul(data->
-				stutter_entry_watermark[9], bw_int_to_fixed(1000)));
+					stutter_entry_watermark[9], bw_int_to_fixed(1000)));
 
 			calcs_output->urgent_wm_ns[0].b_mark =
 				bw_fixed_to_int(bw_mul(data->
-- 
2.25.0


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

* [PATCH][next] drm/amd/display: fix indentation issue on a hunk of code
@ 2020-02-28 13:16 ` Colin King
  0 siblings, 0 replies; 8+ messages in thread
From: Colin King @ 2020-02-28 13:16 UTC (permalink / raw)
  To: Harry Wentland, Leo Li, Alex Deucher, Christian König,
	David Zhou, David Airlie, Daniel Vetter, amd-gfx, dri-devel
  Cc: kernel-janitors, linux-kernel

From: Colin Ian King <colin.king@canonical.com>

There are multiple statements that are indented incorrectly. Add
in the missing tabs.

Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
 .../gpu/drm/amd/display/dc/calcs/dce_calcs.c  | 46 +++++++++----------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c b/drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c
index 5d081c42e81b..2c6db379afae 100644
--- a/drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c
+++ b/drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c
@@ -3265,33 +3265,33 @@ bool bw_calcs(struct dc_context *ctx,
 				bw_fixed_to_int(bw_mul(data->
 					stutter_exit_watermark[9], bw_int_to_fixed(1000)));
 
-		calcs_output->stutter_entry_wm_ns[0].b_mark -			bw_fixed_to_int(bw_mul(data->
-				stutter_entry_watermark[4], bw_int_to_fixed(1000)));
-		calcs_output->stutter_entry_wm_ns[1].b_mark -			bw_fixed_to_int(bw_mul(data->
-				stutter_entry_watermark[5], bw_int_to_fixed(1000)));
-		calcs_output->stutter_entry_wm_ns[2].b_mark -			bw_fixed_to_int(bw_mul(data->
-				stutter_entry_watermark[6], bw_int_to_fixed(1000)));
-		if (ctx->dc->caps.max_slave_planes) {
-			calcs_output->stutter_entry_wm_ns[3].b_mark +			calcs_output->stutter_entry_wm_ns[0].b_mark  				bw_fixed_to_int(bw_mul(data->
-					stutter_entry_watermark[0], bw_int_to_fixed(1000)));
-			calcs_output->stutter_entry_wm_ns[4].b_mark +					stutter_entry_watermark[4], bw_int_to_fixed(1000)));
+			calcs_output->stutter_entry_wm_ns[1].b_mark  				bw_fixed_to_int(bw_mul(data->
-					stutter_entry_watermark[1], bw_int_to_fixed(1000)));
-		} else {
-			calcs_output->stutter_entry_wm_ns[3].b_mark +					stutter_entry_watermark[5], bw_int_to_fixed(1000)));
+			calcs_output->stutter_entry_wm_ns[2].b_mark  				bw_fixed_to_int(bw_mul(data->
-					stutter_entry_watermark[7], bw_int_to_fixed(1000)));
-			calcs_output->stutter_entry_wm_ns[4].b_mark +					stutter_entry_watermark[6], bw_int_to_fixed(1000)));
+			if (ctx->dc->caps.max_slave_planes) {
+				calcs_output->stutter_entry_wm_ns[3].b_mark +					bw_fixed_to_int(bw_mul(data->
+						stutter_entry_watermark[0], bw_int_to_fixed(1000)));
+				calcs_output->stutter_entry_wm_ns[4].b_mark +					bw_fixed_to_int(bw_mul(data->
+						stutter_entry_watermark[1], bw_int_to_fixed(1000)));
+			} else {
+				calcs_output->stutter_entry_wm_ns[3].b_mark +					bw_fixed_to_int(bw_mul(data->
+						stutter_entry_watermark[7], bw_int_to_fixed(1000)));
+				calcs_output->stutter_entry_wm_ns[4].b_mark +					bw_fixed_to_int(bw_mul(data->
+						stutter_entry_watermark[8], bw_int_to_fixed(1000)));
+			}
+			calcs_output->stutter_entry_wm_ns[5].b_mark  				bw_fixed_to_int(bw_mul(data->
-					stutter_entry_watermark[8], bw_int_to_fixed(1000)));
-		}
-		calcs_output->stutter_entry_wm_ns[5].b_mark -			bw_fixed_to_int(bw_mul(data->
-				stutter_entry_watermark[9], bw_int_to_fixed(1000)));
+					stutter_entry_watermark[9], bw_int_to_fixed(1000)));
 
 			calcs_output->urgent_wm_ns[0].b_mark  				bw_fixed_to_int(bw_mul(data->
-- 
2.25.0

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

* [PATCH][next] drm/amd/display: fix indentation issue on a hunk of code
@ 2020-02-28 13:16 ` Colin King
  0 siblings, 0 replies; 8+ messages in thread
From: Colin King @ 2020-02-28 13:16 UTC (permalink / raw)
  To: Harry Wentland, Leo Li, Alex Deucher, Christian König,
	David Zhou, David Airlie, Daniel Vetter, amd-gfx, dri-devel
  Cc: kernel-janitors, linux-kernel

From: Colin Ian King <colin.king@canonical.com>

There are multiple statements that are indented incorrectly. Add
in the missing tabs.

Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
 .../gpu/drm/amd/display/dc/calcs/dce_calcs.c  | 46 +++++++++----------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c b/drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c
index 5d081c42e81b..2c6db379afae 100644
--- a/drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c
+++ b/drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c
@@ -3265,33 +3265,33 @@ bool bw_calcs(struct dc_context *ctx,
 				bw_fixed_to_int(bw_mul(data->
 					stutter_exit_watermark[9], bw_int_to_fixed(1000)));
 
-		calcs_output->stutter_entry_wm_ns[0].b_mark =
-			bw_fixed_to_int(bw_mul(data->
-				stutter_entry_watermark[4], bw_int_to_fixed(1000)));
-		calcs_output->stutter_entry_wm_ns[1].b_mark =
-			bw_fixed_to_int(bw_mul(data->
-				stutter_entry_watermark[5], bw_int_to_fixed(1000)));
-		calcs_output->stutter_entry_wm_ns[2].b_mark =
-			bw_fixed_to_int(bw_mul(data->
-				stutter_entry_watermark[6], bw_int_to_fixed(1000)));
-		if (ctx->dc->caps.max_slave_planes) {
-			calcs_output->stutter_entry_wm_ns[3].b_mark =
+			calcs_output->stutter_entry_wm_ns[0].b_mark =
 				bw_fixed_to_int(bw_mul(data->
-					stutter_entry_watermark[0], bw_int_to_fixed(1000)));
-			calcs_output->stutter_entry_wm_ns[4].b_mark =
+					stutter_entry_watermark[4], bw_int_to_fixed(1000)));
+			calcs_output->stutter_entry_wm_ns[1].b_mark =
 				bw_fixed_to_int(bw_mul(data->
-					stutter_entry_watermark[1], bw_int_to_fixed(1000)));
-		} else {
-			calcs_output->stutter_entry_wm_ns[3].b_mark =
+					stutter_entry_watermark[5], bw_int_to_fixed(1000)));
+			calcs_output->stutter_entry_wm_ns[2].b_mark =
 				bw_fixed_to_int(bw_mul(data->
-					stutter_entry_watermark[7], bw_int_to_fixed(1000)));
-			calcs_output->stutter_entry_wm_ns[4].b_mark =
+					stutter_entry_watermark[6], bw_int_to_fixed(1000)));
+			if (ctx->dc->caps.max_slave_planes) {
+				calcs_output->stutter_entry_wm_ns[3].b_mark =
+					bw_fixed_to_int(bw_mul(data->
+						stutter_entry_watermark[0], bw_int_to_fixed(1000)));
+				calcs_output->stutter_entry_wm_ns[4].b_mark =
+					bw_fixed_to_int(bw_mul(data->
+						stutter_entry_watermark[1], bw_int_to_fixed(1000)));
+			} else {
+				calcs_output->stutter_entry_wm_ns[3].b_mark =
+					bw_fixed_to_int(bw_mul(data->
+						stutter_entry_watermark[7], bw_int_to_fixed(1000)));
+				calcs_output->stutter_entry_wm_ns[4].b_mark =
+					bw_fixed_to_int(bw_mul(data->
+						stutter_entry_watermark[8], bw_int_to_fixed(1000)));
+			}
+			calcs_output->stutter_entry_wm_ns[5].b_mark =
 				bw_fixed_to_int(bw_mul(data->
-					stutter_entry_watermark[8], bw_int_to_fixed(1000)));
-		}
-		calcs_output->stutter_entry_wm_ns[5].b_mark =
-			bw_fixed_to_int(bw_mul(data->
-				stutter_entry_watermark[9], bw_int_to_fixed(1000)));
+					stutter_entry_watermark[9], bw_int_to_fixed(1000)));
 
 			calcs_output->urgent_wm_ns[0].b_mark =
 				bw_fixed_to_int(bw_mul(data->
-- 
2.25.0

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

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

* [PATCH][next] drm/amd/display: fix indentation issue on a hunk of code
@ 2020-02-28 13:16 ` Colin King
  0 siblings, 0 replies; 8+ messages in thread
From: Colin King @ 2020-02-28 13:16 UTC (permalink / raw)
  To: Harry Wentland, Leo Li, Alex Deucher, Christian König,
	David Zhou, David Airlie, Daniel Vetter, amd-gfx, dri-devel
  Cc: kernel-janitors, linux-kernel

From: Colin Ian King <colin.king@canonical.com>

There are multiple statements that are indented incorrectly. Add
in the missing tabs.

Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
 .../gpu/drm/amd/display/dc/calcs/dce_calcs.c  | 46 +++++++++----------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c b/drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c
index 5d081c42e81b..2c6db379afae 100644
--- a/drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c
+++ b/drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c
@@ -3265,33 +3265,33 @@ bool bw_calcs(struct dc_context *ctx,
 				bw_fixed_to_int(bw_mul(data->
 					stutter_exit_watermark[9], bw_int_to_fixed(1000)));
 
-		calcs_output->stutter_entry_wm_ns[0].b_mark =
-			bw_fixed_to_int(bw_mul(data->
-				stutter_entry_watermark[4], bw_int_to_fixed(1000)));
-		calcs_output->stutter_entry_wm_ns[1].b_mark =
-			bw_fixed_to_int(bw_mul(data->
-				stutter_entry_watermark[5], bw_int_to_fixed(1000)));
-		calcs_output->stutter_entry_wm_ns[2].b_mark =
-			bw_fixed_to_int(bw_mul(data->
-				stutter_entry_watermark[6], bw_int_to_fixed(1000)));
-		if (ctx->dc->caps.max_slave_planes) {
-			calcs_output->stutter_entry_wm_ns[3].b_mark =
+			calcs_output->stutter_entry_wm_ns[0].b_mark =
 				bw_fixed_to_int(bw_mul(data->
-					stutter_entry_watermark[0], bw_int_to_fixed(1000)));
-			calcs_output->stutter_entry_wm_ns[4].b_mark =
+					stutter_entry_watermark[4], bw_int_to_fixed(1000)));
+			calcs_output->stutter_entry_wm_ns[1].b_mark =
 				bw_fixed_to_int(bw_mul(data->
-					stutter_entry_watermark[1], bw_int_to_fixed(1000)));
-		} else {
-			calcs_output->stutter_entry_wm_ns[3].b_mark =
+					stutter_entry_watermark[5], bw_int_to_fixed(1000)));
+			calcs_output->stutter_entry_wm_ns[2].b_mark =
 				bw_fixed_to_int(bw_mul(data->
-					stutter_entry_watermark[7], bw_int_to_fixed(1000)));
-			calcs_output->stutter_entry_wm_ns[4].b_mark =
+					stutter_entry_watermark[6], bw_int_to_fixed(1000)));
+			if (ctx->dc->caps.max_slave_planes) {
+				calcs_output->stutter_entry_wm_ns[3].b_mark =
+					bw_fixed_to_int(bw_mul(data->
+						stutter_entry_watermark[0], bw_int_to_fixed(1000)));
+				calcs_output->stutter_entry_wm_ns[4].b_mark =
+					bw_fixed_to_int(bw_mul(data->
+						stutter_entry_watermark[1], bw_int_to_fixed(1000)));
+			} else {
+				calcs_output->stutter_entry_wm_ns[3].b_mark =
+					bw_fixed_to_int(bw_mul(data->
+						stutter_entry_watermark[7], bw_int_to_fixed(1000)));
+				calcs_output->stutter_entry_wm_ns[4].b_mark =
+					bw_fixed_to_int(bw_mul(data->
+						stutter_entry_watermark[8], bw_int_to_fixed(1000)));
+			}
+			calcs_output->stutter_entry_wm_ns[5].b_mark =
 				bw_fixed_to_int(bw_mul(data->
-					stutter_entry_watermark[8], bw_int_to_fixed(1000)));
-		}
-		calcs_output->stutter_entry_wm_ns[5].b_mark =
-			bw_fixed_to_int(bw_mul(data->
-				stutter_entry_watermark[9], bw_int_to_fixed(1000)));
+					stutter_entry_watermark[9], bw_int_to_fixed(1000)));
 
 			calcs_output->urgent_wm_ns[0].b_mark =
 				bw_fixed_to_int(bw_mul(data->
-- 
2.25.0

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

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

* Re: [PATCH][next] drm/amd/display: fix indentation issue on a hunk of code
  2020-02-28 13:16 ` Colin King
  (?)
  (?)
@ 2020-02-28 22:23   ` Alex Deucher
  -1 siblings, 0 replies; 8+ messages in thread
From: Alex Deucher @ 2020-02-28 22:23 UTC (permalink / raw)
  To: Colin King
  Cc: Harry Wentland, Leo Li, Alex Deucher, Christian König,
	David Zhou, David Airlie, Daniel Vetter, amd-gfx list,
	Maling list - DRI developers, kernel-janitors, LKML

On Fri, Feb 28, 2020 at 8:16 AM Colin King <colin.king@canonical.com> wrote:
>
> From: Colin Ian King <colin.king@canonical.com>
>
> There are multiple statements that are indented incorrectly. Add
> in the missing tabs.
>
> Signed-off-by: Colin Ian King <colin.king@canonical.com>

Applied.  Thanks!

Alex

> ---
>  .../gpu/drm/amd/display/dc/calcs/dce_calcs.c  | 46 +++++++++----------
>  1 file changed, 23 insertions(+), 23 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c b/drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c
> index 5d081c42e81b..2c6db379afae 100644
> --- a/drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c
> +++ b/drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c
> @@ -3265,33 +3265,33 @@ bool bw_calcs(struct dc_context *ctx,
>                                 bw_fixed_to_int(bw_mul(data->
>                                         stutter_exit_watermark[9], bw_int_to_fixed(1000)));
>
> -               calcs_output->stutter_entry_wm_ns[0].b_mark =
> -                       bw_fixed_to_int(bw_mul(data->
> -                               stutter_entry_watermark[4], bw_int_to_fixed(1000)));
> -               calcs_output->stutter_entry_wm_ns[1].b_mark =
> -                       bw_fixed_to_int(bw_mul(data->
> -                               stutter_entry_watermark[5], bw_int_to_fixed(1000)));
> -               calcs_output->stutter_entry_wm_ns[2].b_mark =
> -                       bw_fixed_to_int(bw_mul(data->
> -                               stutter_entry_watermark[6], bw_int_to_fixed(1000)));
> -               if (ctx->dc->caps.max_slave_planes) {
> -                       calcs_output->stutter_entry_wm_ns[3].b_mark =
> +                       calcs_output->stutter_entry_wm_ns[0].b_mark =
>                                 bw_fixed_to_int(bw_mul(data->
> -                                       stutter_entry_watermark[0], bw_int_to_fixed(1000)));
> -                       calcs_output->stutter_entry_wm_ns[4].b_mark =
> +                                       stutter_entry_watermark[4], bw_int_to_fixed(1000)));
> +                       calcs_output->stutter_entry_wm_ns[1].b_mark =
>                                 bw_fixed_to_int(bw_mul(data->
> -                                       stutter_entry_watermark[1], bw_int_to_fixed(1000)));
> -               } else {
> -                       calcs_output->stutter_entry_wm_ns[3].b_mark =
> +                                       stutter_entry_watermark[5], bw_int_to_fixed(1000)));
> +                       calcs_output->stutter_entry_wm_ns[2].b_mark =
>                                 bw_fixed_to_int(bw_mul(data->
> -                                       stutter_entry_watermark[7], bw_int_to_fixed(1000)));
> -                       calcs_output->stutter_entry_wm_ns[4].b_mark =
> +                                       stutter_entry_watermark[6], bw_int_to_fixed(1000)));
> +                       if (ctx->dc->caps.max_slave_planes) {
> +                               calcs_output->stutter_entry_wm_ns[3].b_mark =
> +                                       bw_fixed_to_int(bw_mul(data->
> +                                               stutter_entry_watermark[0], bw_int_to_fixed(1000)));
> +                               calcs_output->stutter_entry_wm_ns[4].b_mark =
> +                                       bw_fixed_to_int(bw_mul(data->
> +                                               stutter_entry_watermark[1], bw_int_to_fixed(1000)));
> +                       } else {
> +                               calcs_output->stutter_entry_wm_ns[3].b_mark =
> +                                       bw_fixed_to_int(bw_mul(data->
> +                                               stutter_entry_watermark[7], bw_int_to_fixed(1000)));
> +                               calcs_output->stutter_entry_wm_ns[4].b_mark =
> +                                       bw_fixed_to_int(bw_mul(data->
> +                                               stutter_entry_watermark[8], bw_int_to_fixed(1000)));
> +                       }
> +                       calcs_output->stutter_entry_wm_ns[5].b_mark =
>                                 bw_fixed_to_int(bw_mul(data->
> -                                       stutter_entry_watermark[8], bw_int_to_fixed(1000)));
> -               }
> -               calcs_output->stutter_entry_wm_ns[5].b_mark =
> -                       bw_fixed_to_int(bw_mul(data->
> -                               stutter_entry_watermark[9], bw_int_to_fixed(1000)));
> +                                       stutter_entry_watermark[9], bw_int_to_fixed(1000)));
>
>                         calcs_output->urgent_wm_ns[0].b_mark =
>                                 bw_fixed_to_int(bw_mul(data->
> --
> 2.25.0
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel

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

* Re: [PATCH][next] drm/amd/display: fix indentation issue on a hunk of code
@ 2020-02-28 22:23   ` Alex Deucher
  0 siblings, 0 replies; 8+ messages in thread
From: Alex Deucher @ 2020-02-28 22:23 UTC (permalink / raw)
  To: Colin King
  Cc: David Zhou, Leo Li, kernel-janitors, LKML, amd-gfx list,
	David Airlie, Maling list - DRI developers, Daniel Vetter,
	Alex Deucher, Harry Wentland, Christian König

On Fri, Feb 28, 2020 at 8:16 AM Colin King <colin.king@canonical.com> wrote:
>
> From: Colin Ian King <colin.king@canonical.com>
>
> There are multiple statements that are indented incorrectly. Add
> in the missing tabs.
>
> Signed-off-by: Colin Ian King <colin.king@canonical.com>

Applied.  Thanks!

Alex

> ---
>  .../gpu/drm/amd/display/dc/calcs/dce_calcs.c  | 46 +++++++++----------
>  1 file changed, 23 insertions(+), 23 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c b/drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c
> index 5d081c42e81b..2c6db379afae 100644
> --- a/drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c
> +++ b/drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c
> @@ -3265,33 +3265,33 @@ bool bw_calcs(struct dc_context *ctx,
>                                 bw_fixed_to_int(bw_mul(data->
>                                         stutter_exit_watermark[9], bw_int_to_fixed(1000)));
>
> -               calcs_output->stutter_entry_wm_ns[0].b_mark > -                       bw_fixed_to_int(bw_mul(data->
> -                               stutter_entry_watermark[4], bw_int_to_fixed(1000)));
> -               calcs_output->stutter_entry_wm_ns[1].b_mark > -                       bw_fixed_to_int(bw_mul(data->
> -                               stutter_entry_watermark[5], bw_int_to_fixed(1000)));
> -               calcs_output->stutter_entry_wm_ns[2].b_mark > -                       bw_fixed_to_int(bw_mul(data->
> -                               stutter_entry_watermark[6], bw_int_to_fixed(1000)));
> -               if (ctx->dc->caps.max_slave_planes) {
> -                       calcs_output->stutter_entry_wm_ns[3].b_mark > +                       calcs_output->stutter_entry_wm_ns[0].b_mark >                                 bw_fixed_to_int(bw_mul(data->
> -                                       stutter_entry_watermark[0], bw_int_to_fixed(1000)));
> -                       calcs_output->stutter_entry_wm_ns[4].b_mark > +                                       stutter_entry_watermark[4], bw_int_to_fixed(1000)));
> +                       calcs_output->stutter_entry_wm_ns[1].b_mark >                                 bw_fixed_to_int(bw_mul(data->
> -                                       stutter_entry_watermark[1], bw_int_to_fixed(1000)));
> -               } else {
> -                       calcs_output->stutter_entry_wm_ns[3].b_mark > +                                       stutter_entry_watermark[5], bw_int_to_fixed(1000)));
> +                       calcs_output->stutter_entry_wm_ns[2].b_mark >                                 bw_fixed_to_int(bw_mul(data->
> -                                       stutter_entry_watermark[7], bw_int_to_fixed(1000)));
> -                       calcs_output->stutter_entry_wm_ns[4].b_mark > +                                       stutter_entry_watermark[6], bw_int_to_fixed(1000)));
> +                       if (ctx->dc->caps.max_slave_planes) {
> +                               calcs_output->stutter_entry_wm_ns[3].b_mark > +                                       bw_fixed_to_int(bw_mul(data->
> +                                               stutter_entry_watermark[0], bw_int_to_fixed(1000)));
> +                               calcs_output->stutter_entry_wm_ns[4].b_mark > +                                       bw_fixed_to_int(bw_mul(data->
> +                                               stutter_entry_watermark[1], bw_int_to_fixed(1000)));
> +                       } else {
> +                               calcs_output->stutter_entry_wm_ns[3].b_mark > +                                       bw_fixed_to_int(bw_mul(data->
> +                                               stutter_entry_watermark[7], bw_int_to_fixed(1000)));
> +                               calcs_output->stutter_entry_wm_ns[4].b_mark > +                                       bw_fixed_to_int(bw_mul(data->
> +                                               stutter_entry_watermark[8], bw_int_to_fixed(1000)));
> +                       }
> +                       calcs_output->stutter_entry_wm_ns[5].b_mark >                                 bw_fixed_to_int(bw_mul(data->
> -                                       stutter_entry_watermark[8], bw_int_to_fixed(1000)));
> -               }
> -               calcs_output->stutter_entry_wm_ns[5].b_mark > -                       bw_fixed_to_int(bw_mul(data->
> -                               stutter_entry_watermark[9], bw_int_to_fixed(1000)));
> +                                       stutter_entry_watermark[9], bw_int_to_fixed(1000)));
>
>                         calcs_output->urgent_wm_ns[0].b_mark >                                 bw_fixed_to_int(bw_mul(data->
> --
> 2.25.0
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel

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

* Re: [PATCH][next] drm/amd/display: fix indentation issue on a hunk of code
@ 2020-02-28 22:23   ` Alex Deucher
  0 siblings, 0 replies; 8+ messages in thread
From: Alex Deucher @ 2020-02-28 22:23 UTC (permalink / raw)
  To: Colin King
  Cc: Leo Li, kernel-janitors, LKML, amd-gfx list, David Airlie,
	Maling list - DRI developers, Alex Deucher, Christian König

On Fri, Feb 28, 2020 at 8:16 AM Colin King <colin.king@canonical.com> wrote:
>
> From: Colin Ian King <colin.king@canonical.com>
>
> There are multiple statements that are indented incorrectly. Add
> in the missing tabs.
>
> Signed-off-by: Colin Ian King <colin.king@canonical.com>

Applied.  Thanks!

Alex

> ---
>  .../gpu/drm/amd/display/dc/calcs/dce_calcs.c  | 46 +++++++++----------
>  1 file changed, 23 insertions(+), 23 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c b/drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c
> index 5d081c42e81b..2c6db379afae 100644
> --- a/drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c
> +++ b/drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c
> @@ -3265,33 +3265,33 @@ bool bw_calcs(struct dc_context *ctx,
>                                 bw_fixed_to_int(bw_mul(data->
>                                         stutter_exit_watermark[9], bw_int_to_fixed(1000)));
>
> -               calcs_output->stutter_entry_wm_ns[0].b_mark =
> -                       bw_fixed_to_int(bw_mul(data->
> -                               stutter_entry_watermark[4], bw_int_to_fixed(1000)));
> -               calcs_output->stutter_entry_wm_ns[1].b_mark =
> -                       bw_fixed_to_int(bw_mul(data->
> -                               stutter_entry_watermark[5], bw_int_to_fixed(1000)));
> -               calcs_output->stutter_entry_wm_ns[2].b_mark =
> -                       bw_fixed_to_int(bw_mul(data->
> -                               stutter_entry_watermark[6], bw_int_to_fixed(1000)));
> -               if (ctx->dc->caps.max_slave_planes) {
> -                       calcs_output->stutter_entry_wm_ns[3].b_mark =
> +                       calcs_output->stutter_entry_wm_ns[0].b_mark =
>                                 bw_fixed_to_int(bw_mul(data->
> -                                       stutter_entry_watermark[0], bw_int_to_fixed(1000)));
> -                       calcs_output->stutter_entry_wm_ns[4].b_mark =
> +                                       stutter_entry_watermark[4], bw_int_to_fixed(1000)));
> +                       calcs_output->stutter_entry_wm_ns[1].b_mark =
>                                 bw_fixed_to_int(bw_mul(data->
> -                                       stutter_entry_watermark[1], bw_int_to_fixed(1000)));
> -               } else {
> -                       calcs_output->stutter_entry_wm_ns[3].b_mark =
> +                                       stutter_entry_watermark[5], bw_int_to_fixed(1000)));
> +                       calcs_output->stutter_entry_wm_ns[2].b_mark =
>                                 bw_fixed_to_int(bw_mul(data->
> -                                       stutter_entry_watermark[7], bw_int_to_fixed(1000)));
> -                       calcs_output->stutter_entry_wm_ns[4].b_mark =
> +                                       stutter_entry_watermark[6], bw_int_to_fixed(1000)));
> +                       if (ctx->dc->caps.max_slave_planes) {
> +                               calcs_output->stutter_entry_wm_ns[3].b_mark =
> +                                       bw_fixed_to_int(bw_mul(data->
> +                                               stutter_entry_watermark[0], bw_int_to_fixed(1000)));
> +                               calcs_output->stutter_entry_wm_ns[4].b_mark =
> +                                       bw_fixed_to_int(bw_mul(data->
> +                                               stutter_entry_watermark[1], bw_int_to_fixed(1000)));
> +                       } else {
> +                               calcs_output->stutter_entry_wm_ns[3].b_mark =
> +                                       bw_fixed_to_int(bw_mul(data->
> +                                               stutter_entry_watermark[7], bw_int_to_fixed(1000)));
> +                               calcs_output->stutter_entry_wm_ns[4].b_mark =
> +                                       bw_fixed_to_int(bw_mul(data->
> +                                               stutter_entry_watermark[8], bw_int_to_fixed(1000)));
> +                       }
> +                       calcs_output->stutter_entry_wm_ns[5].b_mark =
>                                 bw_fixed_to_int(bw_mul(data->
> -                                       stutter_entry_watermark[8], bw_int_to_fixed(1000)));
> -               }
> -               calcs_output->stutter_entry_wm_ns[5].b_mark =
> -                       bw_fixed_to_int(bw_mul(data->
> -                               stutter_entry_watermark[9], bw_int_to_fixed(1000)));
> +                                       stutter_entry_watermark[9], bw_int_to_fixed(1000)));
>
>                         calcs_output->urgent_wm_ns[0].b_mark =
>                                 bw_fixed_to_int(bw_mul(data->
> --
> 2.25.0
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

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

* Re: [PATCH][next] drm/amd/display: fix indentation issue on a hunk of code
@ 2020-02-28 22:23   ` Alex Deucher
  0 siblings, 0 replies; 8+ messages in thread
From: Alex Deucher @ 2020-02-28 22:23 UTC (permalink / raw)
  To: Colin King
  Cc: David Zhou, Leo Li, kernel-janitors, LKML, amd-gfx list,
	David Airlie, Maling list - DRI developers, Daniel Vetter,
	Alex Deucher, Harry Wentland, Christian König

On Fri, Feb 28, 2020 at 8:16 AM Colin King <colin.king@canonical.com> wrote:
>
> From: Colin Ian King <colin.king@canonical.com>
>
> There are multiple statements that are indented incorrectly. Add
> in the missing tabs.
>
> Signed-off-by: Colin Ian King <colin.king@canonical.com>

Applied.  Thanks!

Alex

> ---
>  .../gpu/drm/amd/display/dc/calcs/dce_calcs.c  | 46 +++++++++----------
>  1 file changed, 23 insertions(+), 23 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c b/drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c
> index 5d081c42e81b..2c6db379afae 100644
> --- a/drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c
> +++ b/drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c
> @@ -3265,33 +3265,33 @@ bool bw_calcs(struct dc_context *ctx,
>                                 bw_fixed_to_int(bw_mul(data->
>                                         stutter_exit_watermark[9], bw_int_to_fixed(1000)));
>
> -               calcs_output->stutter_entry_wm_ns[0].b_mark =
> -                       bw_fixed_to_int(bw_mul(data->
> -                               stutter_entry_watermark[4], bw_int_to_fixed(1000)));
> -               calcs_output->stutter_entry_wm_ns[1].b_mark =
> -                       bw_fixed_to_int(bw_mul(data->
> -                               stutter_entry_watermark[5], bw_int_to_fixed(1000)));
> -               calcs_output->stutter_entry_wm_ns[2].b_mark =
> -                       bw_fixed_to_int(bw_mul(data->
> -                               stutter_entry_watermark[6], bw_int_to_fixed(1000)));
> -               if (ctx->dc->caps.max_slave_planes) {
> -                       calcs_output->stutter_entry_wm_ns[3].b_mark =
> +                       calcs_output->stutter_entry_wm_ns[0].b_mark =
>                                 bw_fixed_to_int(bw_mul(data->
> -                                       stutter_entry_watermark[0], bw_int_to_fixed(1000)));
> -                       calcs_output->stutter_entry_wm_ns[4].b_mark =
> +                                       stutter_entry_watermark[4], bw_int_to_fixed(1000)));
> +                       calcs_output->stutter_entry_wm_ns[1].b_mark =
>                                 bw_fixed_to_int(bw_mul(data->
> -                                       stutter_entry_watermark[1], bw_int_to_fixed(1000)));
> -               } else {
> -                       calcs_output->stutter_entry_wm_ns[3].b_mark =
> +                                       stutter_entry_watermark[5], bw_int_to_fixed(1000)));
> +                       calcs_output->stutter_entry_wm_ns[2].b_mark =
>                                 bw_fixed_to_int(bw_mul(data->
> -                                       stutter_entry_watermark[7], bw_int_to_fixed(1000)));
> -                       calcs_output->stutter_entry_wm_ns[4].b_mark =
> +                                       stutter_entry_watermark[6], bw_int_to_fixed(1000)));
> +                       if (ctx->dc->caps.max_slave_planes) {
> +                               calcs_output->stutter_entry_wm_ns[3].b_mark =
> +                                       bw_fixed_to_int(bw_mul(data->
> +                                               stutter_entry_watermark[0], bw_int_to_fixed(1000)));
> +                               calcs_output->stutter_entry_wm_ns[4].b_mark =
> +                                       bw_fixed_to_int(bw_mul(data->
> +                                               stutter_entry_watermark[1], bw_int_to_fixed(1000)));
> +                       } else {
> +                               calcs_output->stutter_entry_wm_ns[3].b_mark =
> +                                       bw_fixed_to_int(bw_mul(data->
> +                                               stutter_entry_watermark[7], bw_int_to_fixed(1000)));
> +                               calcs_output->stutter_entry_wm_ns[4].b_mark =
> +                                       bw_fixed_to_int(bw_mul(data->
> +                                               stutter_entry_watermark[8], bw_int_to_fixed(1000)));
> +                       }
> +                       calcs_output->stutter_entry_wm_ns[5].b_mark =
>                                 bw_fixed_to_int(bw_mul(data->
> -                                       stutter_entry_watermark[8], bw_int_to_fixed(1000)));
> -               }
> -               calcs_output->stutter_entry_wm_ns[5].b_mark =
> -                       bw_fixed_to_int(bw_mul(data->
> -                               stutter_entry_watermark[9], bw_int_to_fixed(1000)));
> +                                       stutter_entry_watermark[9], bw_int_to_fixed(1000)));
>
>                         calcs_output->urgent_wm_ns[0].b_mark =
>                                 bw_fixed_to_int(bw_mul(data->
> --
> 2.25.0
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

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

end of thread, other threads:[~2020-02-28 22:23 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-02-28 13:16 [PATCH][next] drm/amd/display: fix indentation issue on a hunk of code Colin King
2020-02-28 13:16 ` Colin King
2020-02-28 13:16 ` Colin King
2020-02-28 13:16 ` Colin King
2020-02-28 22:23 ` Alex Deucher
2020-02-28 22:23   ` Alex Deucher
2020-02-28 22:23   ` Alex Deucher
2020-02-28 22:23   ` Alex Deucher

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.