Skip to contentSkip to conversation

Fixes for DCN42B enablement

PATCH New Matthew Stewart 1 participant 3 messages Jun 3

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

cover Fixes for DCN42B enablement

These patches fix issues which prevent DCN42B from functioning.

Matthew Stewart (2):
drm/amd/display: Fix DCN42B version detection drm/amd/display: Add DCN42B to dml21_translation_helper

 .../amd/display/dc/dml2_0/dml21/dml21_translation_helper.c    | 1 +
 drivers/gpu/drm/amd/display/include/dal_asic_id.h             | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)
Signature · 1 line
2.54.0
#1 lore raw

PATCH 1/2 drm/amd/display: Fix DCN42B version detection

In resource_parse_asic_id, the check for GC_11_0_4 was unbounded, which caused it to override the detection of DCN42B.

---
 drivers/gpu/drm/amd/display/include/dal_asic_id.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/display/include/dal_asic_id.h +2 -2
index 7d8944d27d92..ca77d29ebacc 100644
@@ -261,8 +261,8 @@ enum {
 
 #define ASICREV_IS_GC_11_0_0(eChipRev) (eChipRev < GC_11_0_2_A0)
 #define ASICREV_IS_GC_11_0_2(eChipRev) (eChipRev >= GC_11_0_2_A0 && eChipRev < GC_11_0_3_A0)
-#define ASICREV_IS_GC_11_0_3(eChipRev) (eChipRev >= GC_11_0_3_A0 && eChipRev < GC_11_UNKNOWN)
-#define ASICREV_IS_GC_11_0_4(eChipRev) (eChipRev >= GC_11_0_4_A0 && eChipRev < GC_11_UNKNOWN)
+#define ASICREV_IS_GC_11_0_3(eChipRev) (eChipRev >= GC_11_0_3_A0 && eChipRev < GC_11_0_4_A0)
+#define ASICREV_IS_GC_11_0_4(eChipRev) (eChipRev >= GC_11_0_4_A0 && eChipRev < DCN4A_SOC_VAR_B_A0)
 #define ASICREV_IS_DCN36(eChipRev) ((eChipRev) >= 0x50 && (eChipRev) < 0xC0)
 
 #define AMDGPU_FAMILY_GC_12_0_0         152 /* GC 12.0.0 */
Signature · 1 line
2.54.0
#2 lore raw

PATCH 2/2 drm/amd/display: Add DCN42B to dml21_translation_helper

In reply to Matthew Stewart

Needed for DML to function with DCN42B.

---
 .../drm/amd/display/dc/dml2_0/dml21/dml21_translation_helper.c   | 1 +
 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/display/dc/dml2_0/dml21/dml21_translation_helper.c +1 -0
index c6ff7a290c7f..c1a3e2496983 100644
@@ -48,6 +48,7 @@ static enum dml2_project_id dml21_dcn_revision_to_dml2_project_id(enum dce_versi
 		project_id = dml2_project_dcn4x_stage2_auto_drr_svp;
 		break;
 	case DCN_VERSION_4_2:
+	case DCN_VERSION_4_2B:
 		project_id = dml2_project_dcn42;
 		break;
 	default:
Signature · 1 line
2.54.0