Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit be0949f5 authored by Alex Deucher's avatar Alex Deucher Committed by Christian König
Browse files

drm/radeon: fix audio pin counts for DCE6+ (v2) 



There is actually quite a bit of variance based on
the asic.

v2: fix typo noticed by Jerome.

Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Cc: stable@vger.kernel.org
parent 379dfc25

drivers/gpu/drm/radeon/dce6_afmt.c

+10 −4
Original line number Diff line number Diff line
@@ -309,11 +309,17 @@ int dce6_audio_init(struct radeon_device *rdev) 


	rdev->audio.enabled = true;



	if (ASIC_IS_DCE8(rdev))

	if (ASIC_IS_DCE81(rdev)) /* KV: 4 streams, 7 endpoints */

		rdev->audio.num_pins = 7;

	else if (ASIC_IS_DCE83(rdev)) /* KB: 2 streams, 3 endpoints */

		rdev->audio.num_pins = 3;

	else if (ASIC_IS_DCE8(rdev)) /* BN/HW: 6 streams, 7 endpoints */

		rdev->audio.num_pins = 7;

	else if (ASIC_IS_DCE61(rdev)) /* TN: 4 streams, 6 endpoints */

		rdev->audio.num_pins = 6;

	else if (ASIC_IS_DCE61(rdev))

		rdev->audio.num_pins = 4;

	else

	else if (ASIC_IS_DCE64(rdev)) /* OL: 2 streams, 2 endpoints */

		rdev->audio.num_pins = 2;

	else /* SI: 6 streams, 6 endpoints */

		rdev->audio.num_pins = 6;



	for (i = 0; i < rdev->audio.num_pins; i++) {

drivers/gpu/drm/radeon/radeon.h

+4 −1
Original line number Diff line number Diff line
@@ -739,7 +739,7 @@ union radeon_irq_stat_regs { 
	struct cik_irq_stat_regs cik;

};



#define RADEON_MAX_HPD_PINS 6

#define RADEON_MAX_HPD_PINS 7

#define RADEON_MAX_CRTCS 6

#define RADEON_MAX_AFMT_BLOCKS 7
@@ -2631,6 +2631,9 @@ void r100_pll_errata_after_index(struct radeon_device *rdev); 
#define ASIC_IS_DCE64(rdev) ((rdev->family == CHIP_OLAND))

#define ASIC_IS_NODCE(rdev) ((rdev->family == CHIP_HAINAN))

#define ASIC_IS_DCE8(rdev) ((rdev->family >= CHIP_BONAIRE))

#define ASIC_IS_DCE81(rdev) ((rdev->family == CHIP_KAVERI))

#define ASIC_IS_DCE82(rdev) ((rdev->family == CHIP_BONAIRE))

#define ASIC_IS_DCE83(rdev) ((rdev->family == CHIP_KABINI))



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

			      (rdev->ddev->pdev->device == 0x6850) || \