All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/2] drm/amd/display: Fix warning storm on Raven2
@ 2018-10-09 17:50 Roman.Li-5C7GfCeVMHo
       [not found] ` <1539107410-28823-1-git-send-email-Roman.Li-5C7GfCeVMHo@public.gmane.org>
  0 siblings, 1 reply; 4+ messages in thread
From: Roman.Li-5C7GfCeVMHo @ 2018-10-09 17:50 UTC (permalink / raw)
  To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
  Cc: sunpeng.li-5C7GfCeVMHo, Hersen Wu, harry.wentland-5C7GfCeVMHo, Roman Li

From: Roman Li <Roman.Li@amd.com>

[Why]
Wrong index for pstate debug test register

[How]
Add correct index value for dcn1_01 in hubbub1_construct()

Signed-off-by: Hersen Wu <hersenxs.wu@amd.com>
Signed-off-by: Roman Li <Roman.Li@amd.com>
---
 .../gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.c    | 43 +++++++++++++++++++++-
 1 file changed, 41 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.c b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.c
index 69345ce6..4254e7e 100644
--- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.c
@@ -133,7 +133,43 @@ bool hubbub1_verify_allow_pstate_change_high(
 		forced_pstate_allow = false;
 	}
 
-	/* RV1:
+	/* RV2:
+	 * dchubbubdebugind, at: 0xB
+	 * description
+	 * 0:     Pipe0 Plane0 Allow Pstate Change
+	 * 1:     Pipe0 Plane1 Allow Pstate Change
+	 * 2:     Pipe0 Cursor0 Allow Pstate Change
+	 * 3:     Pipe0 Cursor1 Allow Pstate Change
+	 * 4:     Pipe1 Plane0 Allow Pstate Change
+	 * 5:     Pipe1 Plane1 Allow Pstate Change
+	 * 6:     Pipe1 Cursor0 Allow Pstate Change
+	 * 7:     Pipe1 Cursor1 Allow Pstate Change
+	 * 8:     Pipe2 Plane0 Allow Pstate Change
+	 * 9:     Pipe2 Plane1 Allow Pstate Change
+	 * 10:    Pipe2 Cursor0 Allow Pstate Change
+	 * 11:    Pipe2 Cursor1 Allow Pstate Change
+	 * 12:    Pipe3 Plane0 Allow Pstate Change
+	 * 13:    Pipe3 Plane1 Allow Pstate Change
+	 * 14:    Pipe3 Cursor0 Allow Pstate Change
+	 * 15:    Pipe3 Cursor1 Allow Pstate Change
+	 * 16:    Pipe4 Plane0 Allow Pstate Change
+	 * 17:    Pipe4 Plane1 Allow Pstate Change
+	 * 18:    Pipe4 Cursor0 Allow Pstate Change
+	 * 19:    Pipe4 Cursor1 Allow Pstate Change
+	 * 20:    Pipe5 Plane0 Allow Pstate Change
+	 * 21:    Pipe5 Plane1 Allow Pstate Change
+	 * 22:    Pipe5 Cursor0 Allow Pstate Change
+	 * 23:    Pipe5 Cursor1 Allow Pstate Change
+	 * 24:    Pipe6 Plane0 Allow Pstate Change
+	 * 25:    Pipe6 Plane1 Allow Pstate Change
+	 * 26:    Pipe6 Cursor0 Allow Pstate Change
+	 * 27:    Pipe6 Cursor1 Allow Pstate Change
+	 * 28:    WB0 Allow Pstate Change
+	 * 29:    WB1 Allow Pstate Change
+	 * 30:    Arbiter's allow_pstate_change
+	 * 31:    SOC pstate change request"
+	 *
+	 * RV1:
 	 * dchubbubdebugind, at: 0x7
 	 * description "3-0:   Pipe0 cursor0 QOS
 	 * 7-4:   Pipe1 cursor0 QOS
@@ -157,7 +193,6 @@ bool hubbub1_verify_allow_pstate_change_high(
 	 * 31:    SOC pstate change request
 	 */
 
-
 	REG_WRITE(DCHUBBUB_TEST_DEBUG_INDEX, hubbub->debug_test_index_pstate);
 
 	for (i = 0; i < pstate_wait_timeout_us; i++) {
@@ -819,5 +854,9 @@ void hubbub1_construct(struct hubbub *hubbub,
 	hubbub->masks = hubbub_mask;
 
 	hubbub->debug_test_index_pstate = 0x7;
+#if defined(CONFIG_DRM_AMD_DC_DCN1_01)
+	if (ctx->dce_version == DCN_VERSION_1_01)
+		hubbub->debug_test_index_pstate = 0xB;
+#endif
 }
 
-- 
2.7.4

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

^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [PATCH 2/2] drm/amd/display: RV2 DP MST 2nd display within daisy chain not light up
       [not found] ` <1539107410-28823-1-git-send-email-Roman.Li-5C7GfCeVMHo@public.gmane.org>
@ 2018-10-09 17:50   ` Roman.Li-5C7GfCeVMHo
  2018-10-09 17:52   ` [PATCH 1/2] drm/amd/display: Fix warning storm on Raven2 Deucher, Alexander
  2018-10-10  3:19   ` Huang, Ray
  2 siblings, 0 replies; 4+ messages in thread
From: Roman.Li-5C7GfCeVMHo @ 2018-10-09 17:50 UTC (permalink / raw)
  To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
  Cc: sunpeng.li-5C7GfCeVMHo, Hersen Wu, harry.wentland-5C7GfCeVMHo

From: Hersen Wu <hersenxs.wu@amd.com>

RV2 resource is limit to 3 pipes. Limitation should apply to all HW
blocks instead of front pipe.

Change-Id: I87e5d7084df2d60e1b2fa8a33d0d06ea73f8f71b
Signed-off-by: Hersen Wu <hersenxs.wu@amd.com>
---
 drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c
index 563847c..a71453a 100644
--- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c
@@ -507,6 +507,18 @@ static const struct resource_caps res_cap = {
 		.num_ddc = 4,
 };
 
+#if defined(CONFIG_DRM_AMD_DC_DCN1_01)
+static const struct resource_caps rv2_res_cap = {
+		.num_timing_generator = 3,
+		.num_opp = 3,
+		.num_video_plane = 3,
+		.num_audio = 3,
+		.num_stream_encoder = 3,
+		.num_pll = 3,
+		.num_ddc = 3,
+};
+#endif
+
 static const struct dc_debug_options debug_defaults_drv = {
 		.sanity_checks = true,
 		.disable_dmcu = true,
@@ -1172,7 +1184,12 @@ static bool construct(
 
 	ctx->dc_bios->regs = &bios_regs;
 
-	pool->base.res_cap = &res_cap;
+#if defined(CONFIG_DRM_AMD_DC_DCN1_01)
+	if (ctx->dce_version == DCN_VERSION_1_01)
+		pool->base.res_cap = &rv2_res_cap;
+	else
+#endif
+		pool->base.res_cap = &res_cap;
 	pool->base.funcs = &dcn10_res_pool_funcs;
 
 	/*
-- 
2.7.4

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

^ permalink raw reply related	[flat|nested] 4+ messages in thread
* Re: [PATCH 1/2] drm/amd/display: Fix warning storm on Raven2
       [not found] ` <1539107410-28823-1-git-send-email-Roman.Li-5C7GfCeVMHo@public.gmane.org>
  2018-10-09 17:50   ` [PATCH 2/2] drm/amd/display: RV2 DP MST 2nd display within daisy chain not light up Roman.Li-5C7GfCeVMHo
@ 2018-10-09 17:52   ` Deucher, Alexander
  2018-10-10  3:19   ` Huang, Ray
  2 siblings, 0 replies; 4+ messages in thread
From: Deucher, Alexander @ 2018-10-09 17:52 UTC (permalink / raw)
  To: Li, Roman, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
  Cc: Li, Sun peng (Leo), Wentland, Harry, Wu, Hersen


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

Series is:

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

________________________________
From: amd-gfx <amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org> on behalf of Roman.Li@amd.com <Roman.Li-5C7GfCeVMHo@public.gmane.org>
Sent: Tuesday, October 9, 2018 1:50:09 PM
To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org
Cc: Li, Sun peng (Leo); Wu, Hersen; Wentland, Harry; Li, Roman
Subject: [PATCH 1/2] drm/amd/display: Fix warning storm on Raven2

From: Roman Li <Roman.Li-5C7GfCeVMHo@public.gmane.org>

[Why]
Wrong index for pstate debug test register

[How]
Add correct index value for dcn1_01 in hubbub1_construct()

Signed-off-by: Hersen Wu <hersenxs.wu-5C7GfCeVMHo@public.gmane.org>
Signed-off-by: Roman Li <Roman.Li-5C7GfCeVMHo@public.gmane.org>
---
 .../gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.c    | 43 +++++++++++++++++++++-
 1 file changed, 41 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.c b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.c
index 69345ce6..4254e7e 100644
--- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.c
@@ -133,7 +133,43 @@ bool hubbub1_verify_allow_pstate_change_high(
                 forced_pstate_allow = false;
         }

-       /* RV1:
+       /* RV2:
+        * dchubbubdebugind, at: 0xB
+        * description
+        * 0:     Pipe0 Plane0 Allow Pstate Change
+        * 1:     Pipe0 Plane1 Allow Pstate Change
+        * 2:     Pipe0 Cursor0 Allow Pstate Change
+        * 3:     Pipe0 Cursor1 Allow Pstate Change
+        * 4:     Pipe1 Plane0 Allow Pstate Change
+        * 5:     Pipe1 Plane1 Allow Pstate Change
+        * 6:     Pipe1 Cursor0 Allow Pstate Change
+        * 7:     Pipe1 Cursor1 Allow Pstate Change
+        * 8:     Pipe2 Plane0 Allow Pstate Change
+        * 9:     Pipe2 Plane1 Allow Pstate Change
+        * 10:    Pipe2 Cursor0 Allow Pstate Change
+        * 11:    Pipe2 Cursor1 Allow Pstate Change
+        * 12:    Pipe3 Plane0 Allow Pstate Change
+        * 13:    Pipe3 Plane1 Allow Pstate Change
+        * 14:    Pipe3 Cursor0 Allow Pstate Change
+        * 15:    Pipe3 Cursor1 Allow Pstate Change
+        * 16:    Pipe4 Plane0 Allow Pstate Change
+        * 17:    Pipe4 Plane1 Allow Pstate Change
+        * 18:    Pipe4 Cursor0 Allow Pstate Change
+        * 19:    Pipe4 Cursor1 Allow Pstate Change
+        * 20:    Pipe5 Plane0 Allow Pstate Change
+        * 21:    Pipe5 Plane1 Allow Pstate Change
+        * 22:    Pipe5 Cursor0 Allow Pstate Change
+        * 23:    Pipe5 Cursor1 Allow Pstate Change
+        * 24:    Pipe6 Plane0 Allow Pstate Change
+        * 25:    Pipe6 Plane1 Allow Pstate Change
+        * 26:    Pipe6 Cursor0 Allow Pstate Change
+        * 27:    Pipe6 Cursor1 Allow Pstate Change
+        * 28:    WB0 Allow Pstate Change
+        * 29:    WB1 Allow Pstate Change
+        * 30:    Arbiter's allow_pstate_change
+        * 31:    SOC pstate change request"
+        *
+        * RV1:
          * dchubbubdebugind, at: 0x7
          * description "3-0:   Pipe0 cursor0 QOS
          * 7-4:   Pipe1 cursor0 QOS
@@ -157,7 +193,6 @@ bool hubbub1_verify_allow_pstate_change_high(
          * 31:    SOC pstate change request
          */

-
         REG_WRITE(DCHUBBUB_TEST_DEBUG_INDEX, hubbub->debug_test_index_pstate);

         for (i = 0; i < pstate_wait_timeout_us; i++) {
@@ -819,5 +854,9 @@ void hubbub1_construct(struct hubbub *hubbub,
         hubbub->masks = hubbub_mask;

         hubbub->debug_test_index_pstate = 0x7;
+#if defined(CONFIG_DRM_AMD_DC_DCN1_01)
+       if (ctx->dce_version == DCN_VERSION_1_01)
+               hubbub->debug_test_index_pstate = 0xB;
+#endif
 }

--
2.7.4

_______________________________________________
amd-gfx mailing list
amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
amd-gfx Info Page - freedesktop.org<https://lists.freedesktop.org/mailman/listinfo/amd-gfx>
lists.freedesktop.org
To see the collection of prior postings to the list, visit the amd-gfx Archives.. Using amd-gfx: To post a message to all the list members, send email to amd-gfx-PD4FTy7X32lNgt0PjOBp9xlNPtJONSTn@public.gmane.org You can subscribe to the list, or change your existing subscription, in the sections below.



[-- Attachment #1.2: Type: text/html, Size: 10829 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

^ permalink raw reply related	[flat|nested] 4+ messages in thread
* RE: [PATCH 1/2] drm/amd/display: Fix warning storm on Raven2
       [not found] ` <1539107410-28823-1-git-send-email-Roman.Li-5C7GfCeVMHo@public.gmane.org>
  2018-10-09 17:50   ` [PATCH 2/2] drm/amd/display: RV2 DP MST 2nd display within daisy chain not light up Roman.Li-5C7GfCeVMHo
  2018-10-09 17:52   ` [PATCH 1/2] drm/amd/display: Fix warning storm on Raven2 Deucher, Alexander
@ 2018-10-10  3:19   ` Huang, Ray
  2 siblings, 0 replies; 4+ messages in thread
From: Huang, Ray @ 2018-10-10  3:19 UTC (permalink / raw)
  To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
  Cc: Li, Sun peng (Leo),
	Wentland, Harry, Deucher, Alexander, Wu, Hersen, Li, Roman

> -----Original Message-----
> From: amd-gfx [mailto:amd-gfx-bounces@lists.freedesktop.org] On Behalf
> Of Roman.Li@amd.com
> Sent: Wednesday, October 10, 2018 1:50 AM
> To: amd-gfx@lists.freedesktop.org
> Cc: Li, Sun peng (Leo) <Sunpeng.Li@amd.com>; Wu, Hersen
> <hersenxs.wu@amd.com>; Wentland, Harry <Harry.Wentland@amd.com>;
> Li, Roman <Roman.Li@amd.com>
> Subject: [PATCH 1/2] drm/amd/display: Fix warning storm on Raven2
> 
> From: Roman Li <Roman.Li@amd.com>
> 
> [Why]
> Wrong index for pstate debug test register
> 
> [How]
> Add correct index value for dcn1_01 in hubbub1_construct()
> 
> Signed-off-by: Hersen Wu <hersenxs.wu@amd.com>
> Signed-off-by: Roman Li <Roman.Li@amd.com>

Thanks, Roman.

Series are also
Reviewed-by: Huang Rui <ray.huang@amd.com>

I will apply them directly to drm-next and dkms-4.18 for testing.

Thanks,
Ray	

> ---
>  .../gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.c    | 43
> +++++++++++++++++++++-
>  1 file changed, 41 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.c
> b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.c
> index 69345ce6..4254e7e 100644
> --- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.c
> +++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.c
> @@ -133,7 +133,43 @@ bool hubbub1_verify_allow_pstate_change_high(
>  		forced_pstate_allow = false;
>  	}
> 
> -	/* RV1:
> +	/* RV2:
> +	 * dchubbubdebugind, at: 0xB
> +	 * description
> +	 * 0:     Pipe0 Plane0 Allow Pstate Change
> +	 * 1:     Pipe0 Plane1 Allow Pstate Change
> +	 * 2:     Pipe0 Cursor0 Allow Pstate Change
> +	 * 3:     Pipe0 Cursor1 Allow Pstate Change
> +	 * 4:     Pipe1 Plane0 Allow Pstate Change
> +	 * 5:     Pipe1 Plane1 Allow Pstate Change
> +	 * 6:     Pipe1 Cursor0 Allow Pstate Change
> +	 * 7:     Pipe1 Cursor1 Allow Pstate Change
> +	 * 8:     Pipe2 Plane0 Allow Pstate Change
> +	 * 9:     Pipe2 Plane1 Allow Pstate Change
> +	 * 10:    Pipe2 Cursor0 Allow Pstate Change
> +	 * 11:    Pipe2 Cursor1 Allow Pstate Change
> +	 * 12:    Pipe3 Plane0 Allow Pstate Change
> +	 * 13:    Pipe3 Plane1 Allow Pstate Change
> +	 * 14:    Pipe3 Cursor0 Allow Pstate Change
> +	 * 15:    Pipe3 Cursor1 Allow Pstate Change
> +	 * 16:    Pipe4 Plane0 Allow Pstate Change
> +	 * 17:    Pipe4 Plane1 Allow Pstate Change
> +	 * 18:    Pipe4 Cursor0 Allow Pstate Change
> +	 * 19:    Pipe4 Cursor1 Allow Pstate Change
> +	 * 20:    Pipe5 Plane0 Allow Pstate Change
> +	 * 21:    Pipe5 Plane1 Allow Pstate Change
> +	 * 22:    Pipe5 Cursor0 Allow Pstate Change
> +	 * 23:    Pipe5 Cursor1 Allow Pstate Change
> +	 * 24:    Pipe6 Plane0 Allow Pstate Change
> +	 * 25:    Pipe6 Plane1 Allow Pstate Change
> +	 * 26:    Pipe6 Cursor0 Allow Pstate Change
> +	 * 27:    Pipe6 Cursor1 Allow Pstate Change
> +	 * 28:    WB0 Allow Pstate Change
> +	 * 29:    WB1 Allow Pstate Change
> +	 * 30:    Arbiter's allow_pstate_change
> +	 * 31:    SOC pstate change request"
> +	 *
> +	 * RV1:
>  	 * dchubbubdebugind, at: 0x7
>  	 * description "3-0:   Pipe0 cursor0 QOS
>  	 * 7-4:   Pipe1 cursor0 QOS
> @@ -157,7 +193,6 @@ bool hubbub1_verify_allow_pstate_change_high(
>  	 * 31:    SOC pstate change request
>  	 */
> 
> -
>  	REG_WRITE(DCHUBBUB_TEST_DEBUG_INDEX, hubbub-
> >debug_test_index_pstate);
> 
>  	for (i = 0; i < pstate_wait_timeout_us; i++) { @@ -819,5 +854,9 @@
> void hubbub1_construct(struct hubbub *hubbub,
>  	hubbub->masks = hubbub_mask;
> 
>  	hubbub->debug_test_index_pstate = 0x7;
> +#if defined(CONFIG_DRM_AMD_DC_DCN1_01)
> +	if (ctx->dce_version == DCN_VERSION_1_01)
> +		hubbub->debug_test_index_pstate = 0xB; #endif
>  }
> 
> --
> 2.7.4
> 
> _______________________________________________
> amd-gfx mailing list
> amd-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

^ permalink raw reply	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-10-10  3:19 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-10-09 17:50 [PATCH 1/2] drm/amd/display: Fix warning storm on Raven2 Roman.Li-5C7GfCeVMHo
     [not found] ` <1539107410-28823-1-git-send-email-Roman.Li-5C7GfCeVMHo@public.gmane.org>
2018-10-09 17:50   ` [PATCH 2/2] drm/amd/display: RV2 DP MST 2nd display within daisy chain not light up Roman.Li-5C7GfCeVMHo
2018-10-09 17:52   ` [PATCH 1/2] drm/amd/display: Fix warning storm on Raven2 Deucher, Alexander
2018-10-10  3:19   ` Huang, Ray

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.