Skip to content

Commit 6cc47f3

Browse files
Aly-Tawfikalexdeucher
authored andcommitted
drm/amdgpu/display: Fix Pollock Variant Detection
Problem Description: Currently we are checking internal fused rev id with pci rev id. However, fused internal rev id is the same on all raven2 parts (in which Dali and Pollock were based on too), thus Pollock detection fails Fix: use the pci rev to preform the detection for bandwidth calculations. Reviewed-by: Feifei Xu <[email protected]> Signed-off-by: Aly-Tawfik <[email protected]> Signed-off-by: Alex Deucher <[email protected]>
1 parent 2dc31ca commit 6cc47f3

File tree

2 files changed

+11
-10
lines changed

2 files changed

+11
-10
lines changed

drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -712,6 +712,11 @@ unsigned int get_highest_allowed_voltage_level(uint32_t hw_internal_rev, uint32_
712712
case PRID_DALI_DF:
713713
case PRID_DALI_E3:
714714
case PRID_DALI_E4:
715+
case PRID_POLLOCK_94:
716+
case PRID_POLLOCK_95:
717+
case PRID_POLLOCK_E9:
718+
case PRID_POLLOCK_EA:
719+
case PRID_POLLOCK_EB:
715720
return 0;
716721
default:
717722
break;

drivers/gpu/drm/amd/display/include/dal_asic_id.h

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -134,11 +134,6 @@
134134
#define PICASSO_A0 0x41
135135
/* DCN1_01 */
136136
#define RAVEN2_A0 0x81
137-
#define RAVEN2_15D8_REV_94 0x94
138-
#define RAVEN2_15D8_REV_95 0x95
139-
#define RAVEN2_15D8_REV_E9 0xE9
140-
#define RAVEN2_15D8_REV_EA 0xEA
141-
#define RAVEN2_15D8_REV_EB 0xEB
142137
#define RAVEN1_F0 0xF0
143138
#define RAVEN_UNKNOWN 0xFF
144139
#ifndef ASICREV_IS_RAVEN
@@ -149,16 +144,17 @@
149144
#define PRID_DALI_E3 0xE3
150145
#define PRID_DALI_E4 0xE4
151146

147+
#define PRID_POLLOCK_94 0x94
148+
#define PRID_POLLOCK_95 0x95
149+
#define PRID_POLLOCK_E9 0xE9
150+
#define PRID_POLLOCK_EA 0xEA
151+
#define PRID_POLLOCK_EB 0xEB
152+
152153
#define ASICREV_IS_PICASSO(eChipRev) ((eChipRev >= PICASSO_A0) && (eChipRev < RAVEN2_A0))
153154
#ifndef ASICREV_IS_RAVEN2
154155
#define ASICREV_IS_RAVEN2(eChipRev) ((eChipRev >= RAVEN2_A0) && (eChipRev < RENOIR_A0))
155156
#endif
156157
#define ASICREV_IS_RV1_F0(eChipRev) ((eChipRev >= RAVEN1_F0) && (eChipRev < RAVEN_UNKNOWN))
157-
#define ASICREV_IS_POLLOCK(eChipRev) (eChipRev == RAVEN2_15D8_REV_94 \
158-
|| eChipRev == RAVEN2_15D8_REV_95 \
159-
|| eChipRev == RAVEN2_15D8_REV_E9 \
160-
|| eChipRev == RAVEN2_15D8_REV_EA \
161-
|| eChipRev == RAVEN2_15D8_REV_EB)
162158

163159
#define FAMILY_RV 142 /* DCN 1*/
164160

0 commit comments

Comments
 (0)