From d997ea5c58bb1c05df9e1f6eb030f6647d938eac Mon Sep 17 00:00:00 2001 From: Nicholas Kazlauskas Date: Wed, 19 May 2021 10:36:07 -0400 Subject: [PATCH] drm/amd/display: Add DCN3.1 yellow carp asic family IDs [Why & How] To determine whether the chip is yellow carp or not and which revision it is. Acked-by: Huang Rui Signed-off-by: Nicholas Kazlauskas Signed-off-by: Alex Deucher --- drivers/gpu/drm/amd/display/include/dal_asic_id.h | 13 +++++++++++++ drivers/gpu/drm/amd/display/include/dal_types.h | 3 +++ 2 files changed, 16 insertions(+) diff --git a/drivers/gpu/drm/amd/display/include/dal_asic_id.h b/drivers/gpu/drm/amd/display/include/dal_asic_id.h index cb35eae29ca0d..d615a8e00f8c7 100644 --- a/drivers/gpu/drm/amd/display/include/dal_asic_id.h +++ b/drivers/gpu/drm/amd/display/include/dal_asic_id.h @@ -224,6 +224,19 @@ enum { #define ASICREV_IS_GREEN_SARDINE(eChipRev) ((eChipRev >= GREEN_SARDINE_A0) && (eChipRev < 0xFF)) #endif +#if defined(CONFIG_DRM_AMD_DC_DCN3_1) +#define FAMILY_YELLOW_CARP 146 + +#define YELLOW_CARP_A0 0x01 +#define YELLOW_CARP_B0 0x02 // TODO: DCN31 - update with correct B0 ID +#define YELLOW_CARP_UNKNOWN 0xFF + +#ifndef ASICREV_IS_YELLOW_CARP +#define ASICREV_IS_YELLOW_CARP(eChipRev) ((eChipRev >= YELLOW_CARP_A0) && (eChipRev < YELLOW_CARP_UNKNOWN)) +#endif +#endif + + /* * ASIC chip ID */ diff --git a/drivers/gpu/drm/amd/display/include/dal_types.h b/drivers/gpu/drm/amd/display/include/dal_types.h index 85aed509c01fd..59453ced9ece9 100644 --- a/drivers/gpu/drm/amd/display/include/dal_types.h +++ b/drivers/gpu/drm/amd/display/include/dal_types.h @@ -55,6 +55,9 @@ enum dce_version { DCN_VERSION_3_01, DCN_VERSION_3_02, DCN_VERSION_3_03, +#if defined(CONFIG_DRM_AMD_DC_DCN3_1) + DCN_VERSION_3_1, +#endif DCN_VERSION_MAX }; -- 2.39.5