Re: [PATCH] drm/amd/display: Add ENGINE_ID_DIGD condition check for Navi14

2019-11-04 Thread Harry Wentland 
On 2019-11-01 9:37 p.m., Wu, Hersen wrote:
> 
> Reviewed-by: Hersen Wu 
> 
> 
> 
> -Original Message-
> From: Liu, Zhan  
> Sent: Friday, November 1, 2019 9:35 PM
> To: Wu, Hersen ; amd-gfx@lists.freedesktop.org; 
> Kazlauskas, Nicholas ; Lakha, Bhawanpreet 
> ; Li, Roman ; Siqueira, Rodrigo 
> ; Wentland, Harry ; Zuo, 
> Jerry 
> Cc: Yeh, Eagle ; Lazare, Jordan 
> Subject: RE: [PATCH] drm/amd/display: Add ENGINE_ID_DIGD condition check for 
> Navi14
> 
> Thank you Hersen. Please check the updated patch:
> 
> From: Liu, Zhan 
> Sent: Friday, November 1, 2019 9:18 PM
> To: amd-gfx@lists.freedesktop.org; Kazlauskas, Nicholas 
> ; Lakha, Bhawanpreet 
> ; Li, Roman ; Liu, Zhan 
> ; Siqueira, Rodrigo ; Wentland, 
> Harry ; Wu, Hersen ; Zuo, Jerry 
> 
> Cc: Yeh, Eagle ; Lazare, Jordan 
> Subject: [PATCH] drm/amd/display: Add ENGINE_ID_DIGD condition check for 
> Navi14
> 
> From: Zhan liu 
> Date: Fri, 1 Nov 2019 21:10:17 -0400
> Subject: [PATCH] drm/amd/display: Add ENGINE_ID_DIGD condition check for 
> Navi14
> 
> [Why]
> Navi10 has 6 PHY, but Navi14 only has 5 PHY, that is because there is no 
> ENGINE_ID_DIGD in Navi14. Without this patch, many HDMI related issues (e.g. 
> HDMI S3 resume failure, HDMI pink screen on boot) will be observed.

Are we sure it's always DIGD that's missing on Navi14? It just seems odd
that it's not the last one or that it's not harvested (i.e. potentially
being any one that's missing).

Harry

> 
> [How]
> If eng_id is larger than ENGINE_ID_DIGD, then add eng_id by 1.
> 
> Signed-off-by: Zhan liu 
> ---
>  drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 3 +++
>  1 file changed, 5 insertions(+)
> 
> diff --git a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c 
> b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c
> index 924c2e303588..cf886483e380 100644
> --- a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c
> +++ b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c
> @@ -1152,6 +1152,11 @@ struct stream_encoder *dcn20_stream_encoder_create(
> if (!enc1)
> return NULL;
> 
> + if (ASIC_REV_IS_NAVI14_M(ctx->asic_id.hw_internal_rev)) {
> + if (eng_id >= ENGINE_ID_DIGD)
> + eng_id++;
> + }
> +
> dcn20_stream_encoder_construct(enc1, ctx, ctx->dc_bios, eng_id,
> _enc_regs[eng_id],
> _shift, _mask);
> --
> 2.21.0
> 
>> -Original Message-
>> From: Wu, Hersen 
>> Sent: 2019/November/01, Friday 9:23 PM
>> To: Liu, Zhan ; amd-gfx@lists.freedesktop.org; 
>> Kazlauskas, Nicholas ; Lakha, Bhawanpreet 
>> ; Li, Roman ; Siqueira, 
>> Rodrigo ; Wentland, Harry 
>> ; Zuo, Jerry 
>> Cc: Yeh, Eagle ; Lazare, Jordan 
>> 
>> Subject: RE: [PATCH] drm/amd/display: Add ENGINE_ID_DIGD condition 
>> check for Navi14
>>
>> Hi Zhan,
>>
>> The function is shared by NV10,12,14.
>>
>> Please add ASIC ID check  for the DIG D skip.
>>
>> Thanks!
>> Hersen
>>
>>
>> -Original Message-----
>> From: Liu, Zhan 
>> Sent: Friday, November 1, 2019 9:18 PM
>> To: amd-gfx@lists.freedesktop.org; Kazlauskas, Nicholas 
>> ; Lakha, Bhawanpreet 
>> ; Li, Roman ; Liu, Zhan 
>> ; Siqueira, Rodrigo ; 
>> Wentland, Harry ; Wu, Hersen 
>> ; Zuo, Jerry 
>> Cc: Yeh, Eagle ; Lazare, Jordan 
>> 
>> Subject: [PATCH] drm/amd/display: Add ENGINE_ID_DIGD condition check 
>> for Navi14
>>
>> From: Zhan liu 
>> Date: Fri, 1 Nov 2019 21:10:17 -0400
>> Subject: [PATCH] drm/amd/display: Add ENGINE_ID_DIGD condition check 
>> for Navi14
>>
>> [Why]
>> Navi10 has 6 PHY, but Navi14 only has 5 PHY, that is because there is 
>> no ENGINE_ID_DIGD in Navi14. Without this patch, many HDMI related 
>> issues (e.g. HDMI S3 resume failure, HDMI pink screen on boot) will be 
>> observed.
>>
>> [How]
>> If eng_id is larger than ENGINE_ID_DIGD, then add eng_id by 1.
>>
>> Signed-off-by: Zhan liu 
>> ---
>>  drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 3 +++
>>  1 file changed, 3 insertions(+)
>>
>> diff --git a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c
>> b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c
>> index 924c2e303588..cf886483e380 100644
>> --- a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c
>> +++ b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c
>> @@ -1152,6 +1152,9 @@ struct stream_encoder 
>> *dcn20_stream_encoder_create(

RE: [PATCH] drm/amd/display: Add ENGINE_ID_DIGD condition check for Navi14

2019-11-01 Thread Wu, Hersen 

Reviewed-by: Hersen Wu 



-Original Message-
From: Liu, Zhan  
Sent: Friday, November 1, 2019 9:35 PM
To: Wu, Hersen ; amd-gfx@lists.freedesktop.org; 
Kazlauskas, Nicholas ; Lakha, Bhawanpreet 
; Li, Roman ; Siqueira, Rodrigo 
; Wentland, Harry ; Zuo, 
Jerry 
Cc: Yeh, Eagle ; Lazare, Jordan 
Subject: RE: [PATCH] drm/amd/display: Add ENGINE_ID_DIGD condition check for 
Navi14

Thank you Hersen. Please check the updated patch:

From: Liu, Zhan 
Sent: Friday, November 1, 2019 9:18 PM
To: amd-gfx@lists.freedesktop.org; Kazlauskas, Nicholas 
; Lakha, Bhawanpreet ; 
Li, Roman ; Liu, Zhan ; Siqueira, Rodrigo 
; Wentland, Harry ; Wu, 
Hersen ; Zuo, Jerry 
Cc: Yeh, Eagle ; Lazare, Jordan 
Subject: [PATCH] drm/amd/display: Add ENGINE_ID_DIGD condition check for Navi14

From: Zhan liu 
Date: Fri, 1 Nov 2019 21:10:17 -0400
Subject: [PATCH] drm/amd/display: Add ENGINE_ID_DIGD condition check for Navi14

[Why]
Navi10 has 6 PHY, but Navi14 only has 5 PHY, that is because there is no 
ENGINE_ID_DIGD in Navi14. Without this patch, many HDMI related issues (e.g. 
HDMI S3 resume failure, HDMI pink screen on boot) will be observed.

[How]
If eng_id is larger than ENGINE_ID_DIGD, then add eng_id by 1.

Signed-off-by: Zhan liu 
---
 drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 3 +++
 1 file changed, 5 insertions(+)

diff --git a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c 
b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c
index 924c2e303588..cf886483e380 100644
--- a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c
@@ -1152,6 +1152,11 @@ struct stream_encoder *dcn20_stream_encoder_create(
if (!enc1)
return NULL;

+   if (ASIC_REV_IS_NAVI14_M(ctx->asic_id.hw_internal_rev)) {
+   if (eng_id >= ENGINE_ID_DIGD)
+   eng_id++;
+   }
+
dcn20_stream_encoder_construct(enc1, ctx, ctx->dc_bios, eng_id,
_enc_regs[eng_id],
_shift, _mask);
--
2.21.0

> -Original Message-
> From: Wu, Hersen 
> Sent: 2019/November/01, Friday 9:23 PM
> To: Liu, Zhan ; amd-gfx@lists.freedesktop.org; 
> Kazlauskas, Nicholas ; Lakha, Bhawanpreet 
> ; Li, Roman ; Siqueira, 
> Rodrigo ; Wentland, Harry 
> ; Zuo, Jerry 
> Cc: Yeh, Eagle ; Lazare, Jordan 
> 
> Subject: RE: [PATCH] drm/amd/display: Add ENGINE_ID_DIGD condition 
> check for Navi14
> 
> Hi Zhan,
> 
> The function is shared by NV10,12,14.
> 
> Please add ASIC ID check  for the DIG D skip.
> 
> Thanks!
> Hersen
> 
> 
> -Original Message-
> From: Liu, Zhan 
> Sent: Friday, November 1, 2019 9:18 PM
> To: amd-gfx@lists.freedesktop.org; Kazlauskas, Nicholas 
> ; Lakha, Bhawanpreet 
> ; Li, Roman ; Liu, Zhan 
> ; Siqueira, Rodrigo ; 
> Wentland, Harry ; Wu, Hersen 
> ; Zuo, Jerry 
> Cc: Yeh, Eagle ; Lazare, Jordan 
> 
> Subject: [PATCH] drm/amd/display: Add ENGINE_ID_DIGD condition check 
> for Navi14
> 
> From: Zhan liu 
> Date: Fri, 1 Nov 2019 21:10:17 -0400
> Subject: [PATCH] drm/amd/display: Add ENGINE_ID_DIGD condition check 
> for Navi14
> 
> [Why]
> Navi10 has 6 PHY, but Navi14 only has 5 PHY, that is because there is 
> no ENGINE_ID_DIGD in Navi14. Without this patch, many HDMI related 
> issues (e.g. HDMI S3 resume failure, HDMI pink screen on boot) will be 
> observed.
> 
> [How]
> If eng_id is larger than ENGINE_ID_DIGD, then add eng_id by 1.
> 
> Signed-off-by: Zhan liu 
> ---
>  drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c
> b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c
> index 924c2e303588..cf886483e380 100644
> --- a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c
> +++ b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c
> @@ -1152,6 +1152,9 @@ struct stream_encoder 
> *dcn20_stream_encoder_create(
> if (!enc1)
> return NULL;
> 
> +   if (eng_id >= ENGINE_ID_DIGD)
> +   eng_id++;
> +
> dcn20_stream_encoder_construct(enc1, ctx, ctx->dc_bios, eng_id,
> _enc_regs[eng_id],
> _shift, _mask);
> --
> 2.21.0
> 
> ___
> 
> 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

RE: [PATCH] drm/amd/display: Add ENGINE_ID_DIGD condition check for Navi14

2019-11-01 Thread Liu, Zhan 
Thank you Hersen. Please check the updated patch:

From: Liu, Zhan  
Sent: Friday, November 1, 2019 9:18 PM
To: amd-gfx@lists.freedesktop.org; Kazlauskas, Nicholas 
; Lakha, Bhawanpreet ; 
Li, Roman ; Liu, Zhan ; Siqueira, Rodrigo 
; Wentland, Harry ; Wu, 
Hersen ; Zuo, Jerry 
Cc: Yeh, Eagle ; Lazare, Jordan 
Subject: [PATCH] drm/amd/display: Add ENGINE_ID_DIGD condition check for Navi14

From: Zhan liu 
Date: Fri, 1 Nov 2019 21:10:17 -0400
Subject: [PATCH] drm/amd/display: Add ENGINE_ID_DIGD condition check for Navi14

[Why]
Navi10 has 6 PHY, but Navi14 only has 5 PHY, that is because there is no 
ENGINE_ID_DIGD in Navi14. Without this patch, many HDMI related issues (e.g. 
HDMI S3 resume failure, HDMI pink screen on boot) will be observed.

[How]
If eng_id is larger than ENGINE_ID_DIGD, then add eng_id by 1.

Signed-off-by: Zhan liu 
---
 drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 3 +++
 1 file changed, 5 insertions(+)

diff --git a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c 
b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c
index 924c2e303588..cf886483e380 100644
--- a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c
@@ -1152,6 +1152,11 @@ struct stream_encoder *dcn20_stream_encoder_create(
if (!enc1)
return NULL;

+   if (ASIC_REV_IS_NAVI14_M(ctx->asic_id.hw_internal_rev)) {
+   if (eng_id >= ENGINE_ID_DIGD)
+   eng_id++;
+   }
+
dcn20_stream_encoder_construct(enc1, ctx, ctx->dc_bios, eng_id,
_enc_regs[eng_id],
_shift, _mask);
--
2.21.0

> -Original Message-
> From: Wu, Hersen 
> Sent: 2019/November/01, Friday 9:23 PM
> To: Liu, Zhan ; amd-gfx@lists.freedesktop.org;
> Kazlauskas, Nicholas ; Lakha, Bhawanpreet
> ; Li, Roman ;
> Siqueira, Rodrigo ; Wentland, Harry
> ; Zuo, Jerry 
> Cc: Yeh, Eagle ; Lazare, Jordan
> 
> Subject: RE: [PATCH] drm/amd/display: Add ENGINE_ID_DIGD condition
> check for Navi14
> 
> Hi Zhan,
> 
> The function is shared by NV10,12,14.
> 
> Please add ASIC ID check  for the DIG D skip.
> 
> Thanks!
> Hersen
> 
> 
> -Original Message-
> From: Liu, Zhan 
> Sent: Friday, November 1, 2019 9:18 PM
> To: amd-gfx@lists.freedesktop.org; Kazlauskas, Nicholas
> ; Lakha, Bhawanpreet
> ; Li, Roman ; Liu,
> Zhan ; Siqueira, Rodrigo ;
> Wentland, Harry ; Wu, Hersen
> ; Zuo, Jerry 
> Cc: Yeh, Eagle ; Lazare, Jordan
> 
> Subject: [PATCH] drm/amd/display: Add ENGINE_ID_DIGD condition check
> for Navi14
> 
> From: Zhan liu 
> Date: Fri, 1 Nov 2019 21:10:17 -0400
> Subject: [PATCH] drm/amd/display: Add ENGINE_ID_DIGD condition check
> for Navi14
> 
> [Why]
> Navi10 has 6 PHY, but Navi14 only has 5 PHY, that is because there is no
> ENGINE_ID_DIGD in Navi14. Without this patch, many HDMI related issues
> (e.g. HDMI S3 resume failure, HDMI pink screen on boot) will be observed.
> 
> [How]
> If eng_id is larger than ENGINE_ID_DIGD, then add eng_id by 1.
> 
> Signed-off-by: Zhan liu 
> ---
>  drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c
> b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c
> index 924c2e303588..cf886483e380 100644
> --- a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c
> +++ b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c
> @@ -1152,6 +1152,9 @@ struct stream_encoder
> *dcn20_stream_encoder_create(
> if (!enc1)
> return NULL;
> 
> +   if (eng_id >= ENGINE_ID_DIGD)
> +   eng_id++;
> +
> dcn20_stream_encoder_construct(enc1, ctx, ctx->dc_bios, eng_id,
> _enc_regs[eng_id],
> _shift, _mask);
> --
> 2.21.0
> 
> ___
> 
> 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

RE: [PATCH] drm/amd/display: Add ENGINE_ID_DIGD condition check for Navi14

2019-11-01 Thread Wu, Hersen 
Hi Zhan,

The function is shared by NV10,12,14.

Please add ASIC ID check  for the DIG D skip. 

Thanks!
Hersen


-Original Message-
From: Liu, Zhan  
Sent: Friday, November 1, 2019 9:18 PM
To: amd-gfx@lists.freedesktop.org; Kazlauskas, Nicholas 
; Lakha, Bhawanpreet ; 
Li, Roman ; Liu, Zhan ; Siqueira, Rodrigo 
; Wentland, Harry ; Wu, 
Hersen ; Zuo, Jerry 
Cc: Yeh, Eagle ; Lazare, Jordan 
Subject: [PATCH] drm/amd/display: Add ENGINE_ID_DIGD condition check for Navi14

From: Zhan liu 
Date: Fri, 1 Nov 2019 21:10:17 -0400
Subject: [PATCH] drm/amd/display: Add ENGINE_ID_DIGD condition check for Navi14

[Why]
Navi10 has 6 PHY, but Navi14 only has 5 PHY, that is because there is no 
ENGINE_ID_DIGD in Navi14. Without this patch, many HDMI related issues (e.g. 
HDMI S3 resume failure, HDMI pink screen on boot) will be observed.

[How]
If eng_id is larger than ENGINE_ID_DIGD, then add eng_id by 1.

Signed-off-by: Zhan liu 
---
 drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c 
b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c
index 924c2e303588..cf886483e380 100644
--- a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c
@@ -1152,6 +1152,9 @@ struct stream_encoder *dcn20_stream_encoder_create(
if (!enc1)
return NULL;

+   if (eng_id >= ENGINE_ID_DIGD)
+   eng_id++;
+
dcn20_stream_encoder_construct(enc1, ctx, ctx->dc_bios, eng_id,
_enc_regs[eng_id],
_shift, _mask);
--
2.21.0

___

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

[PATCH] drm/amd/display: Add ENGINE_ID_DIGD condition check for Navi14

2019-11-01 Thread Liu, Zhan 
From: Zhan liu 
Date: Fri, 1 Nov 2019 21:10:17 -0400
Subject: [PATCH] drm/amd/display: Add ENGINE_ID_DIGD condition check for Navi14

[Why]
Navi10 has 6 PHY, but Navi14 only has 5 PHY, that is
because there is no ENGINE_ID_DIGD in Navi14. Without
this patch, many HDMI related issues (e.g. HDMI S3
resume failure, HDMI pink screen on boot) will be
observed.

[How]
If eng_id is larger than ENGINE_ID_DIGD, then
add eng_id by 1.

Signed-off-by: Zhan liu 
---
 drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c 
b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c
index 924c2e303588..cf886483e380 100644
--- a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c
@@ -1152,6 +1152,9 @@ struct stream_encoder *dcn20_stream_encoder_create(
if (!enc1)
return NULL;

+   if (eng_id >= ENGINE_ID_DIGD)
+   eng_id++;
+
dcn20_stream_encoder_construct(enc1, ctx, ctx->dc_bios, eng_id,
_enc_regs[eng_id],
_shift, _mask);
--
2.21.0

___

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