[PATCH 1/2] drm/amd/display: Disable dmcu fw loading for dcn314

[PATCH 1/2] drm/amd/display: Disable dmcu fw loading for dcn314

[Roman.Li]

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

[Why]
DCN 3.1.4 uses dmub not dmcu. Attempt to identify
dmcu firmware for dcn314 results in dm init error:
"Unsupported ASIC type"

[How]
Add dcn314 to the list of asics that don't require dmcu

Signed-off-by: Roman Li <roman.li@amd.com>
---
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index dae998e014b0..9fff5aa86567 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -1893,6 +1893,7 @@ static int load_dmcu_fw(struct amdgpu_device *adev)
 		case IP_VERSION(3, 0, 1):
 		case IP_VERSION(3, 1, 2):
 		case IP_VERSION(3, 1, 3):
+		case IP_VERSION(3, 1, 4):
 		case IP_VERSION(3, 1, 5):
 		case IP_VERSION(3, 1, 6):
 		case IP_VERSION(3, 2, 0):
-- 
2.17.1

[PATCH 2/2] drm/amdgpu: add dm ip block for dcn 3.1.4

[Roman.Li]

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

Adding dm ip block to enable display on dcn 3.1.4.

Signed-off-by: Roman Li <Roman.Li@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
index 0ba56e2ebf09..242d1847c4aa 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
@@ -1716,6 +1716,7 @@ static int amdgpu_discovery_set_display_ip_blocks(struct amdgpu_device *adev)
 		case IP_VERSION(3, 0, 1):
 		case IP_VERSION(3, 1, 2):
 		case IP_VERSION(3, 1, 3):
+		case IP_VERSION(3, 1, 4):
 		case IP_VERSION(3, 1, 5):
 		case IP_VERSION(3, 1, 6):
 		case IP_VERSION(3, 2, 0):
-- 
2.17.1

Re: [PATCH 2/2] drm/amdgpu: add dm ip block for dcn 3.1.4

[Alex Deucher]

Series is:
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>

On Tue, Jul 19, 2022 at 2:26 PM <Roman.Li@amd.com> wrote:
>
> From: Roman Li <Roman.Li@amd.com>
>
> Adding dm ip block to enable display on dcn 3.1.4.
>
> Signed-off-by: Roman Li <Roman.Li@amd.com>
> ---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
> index 0ba56e2ebf09..242d1847c4aa 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
> @@ -1716,6 +1716,7 @@ static int amdgpu_discovery_set_display_ip_blocks(struct amdgpu_device *adev)
>                 case IP_VERSION(3, 0, 1):
>                 case IP_VERSION(3, 1, 2):
>                 case IP_VERSION(3, 1, 3):
> +               case IP_VERSION(3, 1, 4):
>                 case IP_VERSION(3, 1, 5):
>                 case IP_VERSION(3, 1, 6):
>                 case IP_VERSION(3, 2, 0):
> --
> 2.17.1
>

Re: [PATCH 1/2] drm/amd/display: Disable dmcu fw loading for dcn314

[Harry Wentland]

On 2022-07-19 14:26, Roman.Li@amd.com wrote:
> From: Roman Li <roman.li@amd.com>
> 
> [Why]
> DCN 3.1.4 uses dmub not dmcu. Attempt to identify
> dmcu firmware for dcn314 results in dm init error:
> "Unsupported ASIC type"
> 
> [How]
> Add dcn314 to the list of asics that don't require dmcu
> 
> Signed-off-by: Roman Li <roman.li@amd.com>

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

Might be easier going forward if we simply return 0 in the
outside case statement instead of explicitly calling out
IPs that don't support DMCU. The default (any new ASIC) won't
support DMCU.

Harry

> ---
>  drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> index dae998e014b0..9fff5aa86567 100644
> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> @@ -1893,6 +1893,7 @@ static int load_dmcu_fw(struct amdgpu_device *adev)
>  		case IP_VERSION(3, 0, 1):
>  		case IP_VERSION(3, 1, 2):
>  		case IP_VERSION(3, 1, 3):
> +		case IP_VERSION(3, 1, 4):
>  		case IP_VERSION(3, 1, 5):
>  		case IP_VERSION(3, 1, 6):
>  		case IP_VERSION(3, 2, 0):