[PATCH 1/2] drm/amd/display: Fix dc_version detect for dcn314

[PATCH 1/2] drm/amd/display: Fix dc_version detect for dcn314

[Roman.Li]

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

[Why]
While parsing dc_version redundant check leads to
invalid dc_version for dcn314.

[How]
Remove redundant check

Fixes: 923989c9cc31b ("drm/amd/display: Enable DCN314 in DC")

Signed-off-by: Roman Li <roman.li@amd.com>
---
 drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
index bdaad4ce4b2d..752ba4ab2b1e 100644
--- a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
@@ -74,6 +74,7 @@
 enum dce_version resource_parse_asic_id(struct hw_asic_id asic_id)
 {
 	enum dce_version dc_version = DCE_VERSION_UNKNOWN;
+
 	switch (asic_id.chip_family) {
 
 #if defined(CONFIG_DRM_AMD_DC_SI)
@@ -169,8 +170,7 @@ enum dce_version resource_parse_asic_id(struct hw_asic_id asic_id)
 			dc_version = DCN_VERSION_3_21;
 		break;
 	case AMDGPU_FAMILY_GC_11_0_2:
-		if (ASICREV_IS_GC_11_0_2(asic_id.hw_internal_rev))
-			dc_version = DCN_VERSION_3_14;
+		dc_version = DCN_VERSION_3_14;
 		break;
 	default:
 		dc_version = DCE_VERSION_UNKNOWN;
-- 
2.17.1

[PATCH 2/2] drm/amd/display: Specify supported modifiers for dcn314

[Roman.Li]

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

Use same modifiers as for AMDGPU_FAMILY_GC_11_0_0

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

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c
index e27621e11947..2b3de9d0d3f3 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c
@@ -1404,6 +1404,7 @@ static bool dm_plane_format_mod_supported(struct drm_plane *plane,
 		}
 		break;
 	case AMDGPU_FAMILY_GC_11_0_0:
+	case AMDGPU_FAMILY_GC_11_0_2:
 		switch (AMD_FMT_MOD_GET(TILE, modifier)) {
 		case AMD_FMT_MOD_TILE_GFX11_256K_R_X:
 		case AMD_FMT_MOD_TILE_GFX9_64K_R_X:
-- 
2.17.1

Re: [PATCH 2/2] drm/amd/display: Specify supported modifiers for dcn314

[Alex Deucher]

[-- Attachment #1: Type: text/plain, Size: 1077 bytes --]

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

On Thu, Jul 21, 2022 at 6:04 PM <Roman.Li@amd.com> wrote:

> From: Roman Li <roman.li@amd.com>
>
> Use same modifiers as for AMDGPU_FAMILY_GC_11_0_0
>
> Signed-off-by: Roman Li <roman.li@amd.com>
> ---
>  drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c
> b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c
> index e27621e11947..2b3de9d0d3f3 100644
> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c
> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c
> @@ -1404,6 +1404,7 @@ static bool dm_plane_format_mod_supported(struct
> drm_plane *plane,
>                 }
>                 break;
>         case AMDGPU_FAMILY_GC_11_0_0:
> +       case AMDGPU_FAMILY_GC_11_0_2:
>                 switch (AMD_FMT_MOD_GET(TILE, modifier)) {
>                 case AMD_FMT_MOD_TILE_GFX11_256K_R_X:
>                 case AMD_FMT_MOD_TILE_GFX9_64K_R_X:
> --
> 2.17.1
>
>

[-- Attachment #2: Type: text/html, Size: 1672 bytes --]