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

Commit 16823d16 authored by Alex Deucher's avatar Alex Deucher Committed by Dave Airlie
Browse files

drm/radeon/kms/evergreen: don't enable hdmi audio stuff 



Signed-off-by: default avatarAlex Deucher <alexdeucher@gmail.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent b317a9ce

drivers/gpu/drm/radeon/r600_audio.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -35,7 +35,7 @@ 
 */

 */

static int r600_audio_chipset_supported(struct radeon_device *rdev)

static int r600_audio_chipset_supported(struct radeon_device *rdev)

{

{

	return rdev->family >= CHIP_R600

	return (rdev->family >= CHIP_R600 && rdev->family < CHIP_CEDAR)

		|| rdev->family == CHIP_RS600

		|| rdev->family == CHIP_RS600

		|| rdev->family == CHIP_RS690

		|| rdev->family == CHIP_RS690

		|| rdev->family == CHIP_RS740;

		|| rdev->family == CHIP_RS740;

drivers/gpu/drm/radeon/r600_hdmi.c

+9 −0
Original line number Original line Diff line number Diff line
@@ -314,6 +314,9 @@ void r600_hdmi_setmode(struct drm_encoder *encoder, struct drm_display_mode *mod 
	struct radeon_device *rdev = dev->dev_private;

	struct radeon_device *rdev = dev->dev_private;

	uint32_t offset = to_radeon_encoder(encoder)->hdmi_offset;

	uint32_t offset = to_radeon_encoder(encoder)->hdmi_offset;





	if (ASIC_IS_DCE4(rdev))

		return;



	if (!offset)

	if (!offset)

		return;

		return;
@@ -484,6 +487,9 @@ void r600_hdmi_enable(struct drm_encoder *encoder) 
	struct radeon_device *rdev = dev->dev_private;

	struct radeon_device *rdev = dev->dev_private;

	struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);

	struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);





	if (ASIC_IS_DCE4(rdev))

		return;



	if (!radeon_encoder->hdmi_offset) {

	if (!radeon_encoder->hdmi_offset) {

		r600_hdmi_assign_block(encoder);

		r600_hdmi_assign_block(encoder);

		if (!radeon_encoder->hdmi_offset) {

		if (!radeon_encoder->hdmi_offset) {
@@ -525,6 +531,9 @@ void r600_hdmi_disable(struct drm_encoder *encoder) 
	struct radeon_device *rdev = dev->dev_private;

	struct radeon_device *rdev = dev->dev_private;

	struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);

	struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);





	if (ASIC_IS_DCE4(rdev))

		return;



	if (!radeon_encoder->hdmi_offset) {

	if (!radeon_encoder->hdmi_offset) {

		dev_err(rdev->dev, "Disabling not enabled HDMI\n");

		dev_err(rdev->dev, "Disabling not enabled HDMI\n");

		return;

		return;