Skip to content

Commit d663db7

Browse files
marcanstramzel
authored andcommitted
radeon: always enable audio pin fail0verflow#3 on Liverpool
1 parent 0dde0c5 commit d663db7

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

drivers/gpu/drm/radeon/radeon.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2656,10 +2656,10 @@ void r100_pll_errata_after_index(struct radeon_device *rdev);
26562656
#define ASIC_IS_NODCE(rdev) ((rdev->family == CHIP_HAINAN))
26572657
#define ASIC_IS_DCE8(rdev) ((rdev->family >= CHIP_BONAIRE))
26582658
#define ASIC_IS_DCE81(rdev) ((rdev->family == CHIP_KAVERI))
2659-
#define ASIC_IS_DCE82(rdev) ((rdev->family == CHIP_BONAIRE) || \
2660-
(rdev->family == CHIP_LIVERPOOL))
2659+
#define ASIC_IS_DCE82(rdev) ((rdev->family == CHIP_BONAIRE))
26612660
#define ASIC_IS_DCE83(rdev) ((rdev->family == CHIP_KABINI) || \
2662-
(rdev->family == CHIP_MULLINS))
2661+
(rdev->family == CHIP_MULLINS) || \
2662+
(rdev->family == CHIP_LIVERPOOL))
26632663

26642664
#define ASIC_IS_LOMBOK(rdev) ((rdev->ddev->pdev->device == 0x6849) || \
26652665
(rdev->ddev->pdev->device == 0x6850) || \

drivers/gpu/drm/radeon/radeon_audio.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -338,6 +338,10 @@ int radeon_audio_init(struct radeon_device *rdev)
338338
for (i = 0; i < rdev->audio.num_pins; i++)
339339
radeon_audio_enable(rdev, &rdev->audio.pin[i], 0);
340340

341+
/* LVP has standalone S/PDIF on the third pin, always enable */
342+
if (rdev->family == CHIP_LIVERPOOL) {
343+
radeon_audio_enable(rdev, &rdev->audio.pin[2], 0xf);
344+
}
341345
return 0;
342346
}
343347

0 commit comments

Comments
 (0)