[PATCH] drm/amd/display: Fix DCN build breakage

[PATCH] drm/amd/display: Fix DCN build breakage

[Harry Wentland]

Fixes: 680acc64120c (drm/amd/display: Set disp clk in a safe way to avoid
over high dpp clk.)

Signed-off-by: Harry Wentland <harry.wentland@amd.com>
---
 drivers/gpu/drm/amd/display/dc/dce/dce_clocks.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_clocks.c b/drivers/gpu/drm/amd/display/dc/dce/dce_clocks.c
index 76fc903515ba..78e6beb6cf26 100644
--- a/drivers/gpu/drm/amd/display/dc/dce/dce_clocks.c
+++ b/drivers/gpu/drm/amd/display/dc/dce/dce_clocks.c
@@ -623,6 +623,7 @@ static bool dce_apply_clock_voltage_request(
 		}
 	}
 	if (send_request) {
+#if defined(CONFIG_DRM_AMD_DC_DCN1_0)
 		if (clk->ctx->dce_version >= DCN_VERSION_1_0) {
 			struct dc *core_dc = clk->ctx->dc;
 			/*use dcfclk request voltage*/
@@ -630,6 +631,7 @@ static bool dce_apply_clock_voltage_request(
 			clock_voltage_req.clocks_in_khz =
 				dcn_find_dcfclk_suits_all(core_dc, &clk->cur_clocks_value);
 		}
+#endif
 		dm_pp_apply_clock_for_voltage_request(
 			clk->ctx, &clock_voltage_req);
 	}
-- 
2.14.1

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

Re: [PATCH] drm/amd/display: Fix DCN build breakage

[Deucher, Alexander]

[-- Attachment #1.1: Type: text/plain, Size: 1918 bytes --]

Reviewed-by: Alex Deucher <alexander.deucher-5C7GfCeVMHo@public.gmane.org>

________________________________
From: amd-gfx <amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org> on behalf of Harry Wentland <harry.wentland-5C7GfCeVMHo@public.gmane.org>
Sent: Tuesday, March 13, 2018 3:31:40 PM
To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org
Cc: Wentland, Harry
Subject: [PATCH] drm/amd/display: Fix DCN build breakage

Fixes: 680acc64120c (drm/amd/display: Set disp clk in a safe way to avoid
over high dpp clk.)

Signed-off-by: Harry Wentland <harry.wentland-5C7GfCeVMHo@public.gmane.org>
---
 drivers/gpu/drm/amd/display/dc/dce/dce_clocks.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_clocks.c b/drivers/gpu/drm/amd/display/dc/dce/dce_clocks.c
index 76fc903515ba..78e6beb6cf26 100644
--- a/drivers/gpu/drm/amd/display/dc/dce/dce_clocks.c
+++ b/drivers/gpu/drm/amd/display/dc/dce/dce_clocks.c
@@ -623,6 +623,7 @@ static bool dce_apply_clock_voltage_request(
                 }
         }
         if (send_request) {
+#if defined(CONFIG_DRM_AMD_DC_DCN1_0)
                 if (clk->ctx->dce_version >= DCN_VERSION_1_0) {
                         struct dc *core_dc = clk->ctx->dc;
                         /*use dcfclk request voltage*/
@@ -630,6 +631,7 @@ static bool dce_apply_clock_voltage_request(
                         clock_voltage_req.clocks_in_khz =
                                 dcn_find_dcfclk_suits_all(core_dc, &clk->cur_clocks_value);
                 }
+#endif
                 dm_pp_apply_clock_for_voltage_request(
                         clk->ctx, &clock_voltage_req);
         }
--
2.14.1

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

[-- Attachment #1.2: Type: text/html, Size: 4059 bytes --]

[-- Attachment #2: Type: text/plain, Size: 154 bytes --]

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

Re: [PATCH] drm/amd/display: Fix DCN build breakage

[Mike Lothian]

[-- Attachment #1.1: Type: text/plain, Size: 1658 bytes --]

On Tue, 13 Mar 2018 at 19:32 Harry Wentland <harry.wentland-5C7GfCeVMHo@public.gmane.org> wrote:

> Fixes: 680acc64120c (drm/amd/display: Set disp clk in a safe way to avoid
> over high dpp clk.)
>
> Signed-off-by: Harry Wentland <harry.wentland-5C7GfCeVMHo@public.gmane.org>
> ---
>  drivers/gpu/drm/amd/display/dc/dce/dce_clocks.c | 2 ++
>  1 file changed, 2 insertions(+)
>
> diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_clocks.c
> b/drivers/gpu/drm/amd/display/dc/dce/dce_clocks.c
> index 76fc903515ba..78e6beb6cf26 100644
> --- a/drivers/gpu/drm/amd/display/dc/dce/dce_clocks.c
> +++ b/drivers/gpu/drm/amd/display/dc/dce/dce_clocks.c
> @@ -623,6 +623,7 @@ static bool dce_apply_clock_voltage_request(
>                 }
>         }
>         if (send_request) {
> +#if defined(CONFIG_DRM_AMD_DC_DCN1_0)
>                 if (clk->ctx->dce_version >= DCN_VERSION_1_0) {
>                         struct dc *core_dc = clk->ctx->dc;
>                         /*use dcfclk request voltage*/
> @@ -630,6 +631,7 @@ static bool dce_apply_clock_voltage_request(
>                         clock_voltage_req.clocks_in_khz =
>                                 dcn_find_dcfclk_suits_all(core_dc,
> &clk->cur_clocks_value);
>                 }
> +#endif
>                 dm_pp_apply_clock_for_voltage_request(
>                         clk->ctx, &clock_voltage_req);
>         }
> --
> 2.14.1
>
> _______________________________________________
> amd-gfx mailing list
> amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx


Tested-by: Mike Lothian <mike-4+n8WJKc9ve9FHfhHBbuYA@public.gmane.org>

[-- Attachment #1.2: Type: text/html, Size: 2498 bytes --]

[-- Attachment #2: Type: text/plain, Size: 154 bytes --]

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

Re: [PATCH] drm/amd/display: Fix DCN build breakage

[Dieter Nützel]

Ups,

you were faster than ever - my 'double post' 
''CONFIG_DRM_AMD_DC_DCN1_0=y' mandatory, again'...;-)

Tested-by: Dieter Nützel <Dieter@nuetzel-hh.de>

Dieter

> Fixes: 680acc64120c (drm/amd/display: Set disp clk in a safe way to 
> avoid
> over high dpp clk.)
> 
> Signed-off-by: Harry Wentland <harry.wentland at amd.com>
> ---
>  drivers/gpu/drm/amd/display/dc/dce/dce_clocks.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_clocks.c
> b/drivers/gpu/drm/amd/display/dc/dce/dce_clocks.c
> index 76fc903515ba..78e6beb6cf26 100644
> --- a/drivers/gpu/drm/amd/display/dc/dce/dce_clocks.c
> +++ b/drivers/gpu/drm/amd/display/dc/dce/dce_clocks.c
> @@ -623,6 +623,7 @@ static bool dce_apply_clock_voltage_request(
>  		}
>  	}
>  	if (send_request) {
> +#if defined(CONFIG_DRM_AMD_DC_DCN1_0)
>  		if (clk->ctx->dce_version >= DCN_VERSION_1_0) {
>  			struct dc *core_dc = clk->ctx->dc;
>  			/*use dcfclk request voltage*/
> @@ -630,6 +631,7 @@ static bool dce_apply_clock_voltage_request(
>  			clock_voltage_req.clocks_in_khz =
>  				dcn_find_dcfclk_suits_all(core_dc, &clk->cur_clocks_value);
>  		}
> +#endif
>  		dm_pp_apply_clock_for_voltage_request(
>  			clk->ctx, &clock_voltage_req);
>  	}
> --
> 2.14.1
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx