Skip to contentSkip to conversation

drm/amd/display: Fix dc_version detect for dcn314

PATCH In review [email protected] 2 participants 3 messages Jul 21, 2022

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

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

From: Roman Li <[email protected]>

[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")
---
 drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/display/dc/core/dc_resource.c +2 -2
index bdaad4ce4b2d..752ba4ab2b1e 100644
@@ -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;
Signature · 1 line
2.17.1
#1 lore raw

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

From: Roman Li <[email protected]>

Use same modifiers as for AMDGPU_FAMILY_GC_11_0_0

---
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c | 1 +
 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c +1 -0
index e27621e11947..2b3de9d0d3f3 100644
@@ -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:
Signature · 1 line
2.17.1
Reviewed-by on v1 2/2
#2 lore raw

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

Series is:

Quoted 27 lines · On Thu, Jul 21, 2022 at 6:04 PM <[email protected]> wrote:

From: Roman Li <[email protected]>

Use same modifiers as for AMDGPU_FAMILY_GC_11_0_0

---
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c | 1 +
 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c +1 -0
index e27621e11947..2b3de9d0d3f3 100644
@@ -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