Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
drm/radeon: add missing revision check for CI
The memory level workarounds only apply to revision 0 SKUs.
Link: https://gitlab.freedesktop.org/drm/amd/-/work_items/1816
Fixes: 127e056e2a82 ("drm/radeon: fix mclk vddc configuration for cards for hawaii")
Fixes: 21b8a369046f ("drm/radeon: fix dram timing for certain hawaii boards")
Fixes: 90b2fee35cb9 ("drm/radeon: fix dpm mc init for certain hawaii boards")
Reviewed-by: Timur Kristóf <timur.kristof@gmail.com>
Reviewed-by: Kent Russell <kent.russell@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
(cherry picked from commit 4d8dcc14311515077062b5740f39f427075de5c9)
Cc: stable@vger.kernel.org
+6
-3
+6
-3
drivers/gpu/drm/radeon/ci_dpm.c
+6
-3
drivers/gpu/drm/radeon/ci_dpm.c
···
2461
2461
2462
2462
if (patch &&
2463
2463
((rdev->pdev->device == 0x67B0) ||
2464
-
(rdev->pdev->device == 0x67B1))) {
2464
+
(rdev->pdev->device == 0x67B1)) &&
2465
+
(rdev->pdev->revision == 0)) {
2465
2466
if ((memory_clock > 100000) && (memory_clock <= 125000)) {
2466
2467
tmp2 = (((0x31 * engine_clock) / 125000) - 1) & 0xff;
2467
2468
*dram_timimg2 &= ~0x00ff0000;
···
3305
3304
pi->smc_state_table.MemoryLevel[0].EnabledForActivity = 1;
3306
3305
3307
3306
if ((dpm_table->mclk_table.count >= 2) &&
3308
-
((rdev->pdev->device == 0x67B0) || (rdev->pdev->device == 0x67B1))) {
3307
+
((rdev->pdev->device == 0x67B0) || (rdev->pdev->device == 0x67B1)) &&
3308
+
(rdev->pdev->revision == 0)) {
3309
3309
pi->smc_state_table.MemoryLevel[1].MinVddc =
3310
3310
pi->smc_state_table.MemoryLevel[0].MinVddc;
3311
3311
pi->smc_state_table.MemoryLevel[1].MinVddcPhases =
···
4495
4493
4496
4494
if (patch &&
4497
4495
((rdev->pdev->device == 0x67B0) ||
4498
-
(rdev->pdev->device == 0x67B1))) {
4496
+
(rdev->pdev->device == 0x67B1)) &&
4497
+
(rdev->pdev->revision == 0)) {
4499
4498
for (i = 0; i < table->last; i++) {
4500
4499
if (table->last >= SMU7_DISCRETE_MC_REGISTER_ARRAY_SIZE)
4501
4500
return -EINVAL;