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

Commit 0546b72b authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'drm-fixes-4.1' of git://people.freedesktop.org/~agd5f/linux into drm-fixes 

One more small r7xx audio regression fix for 4.1

* 'drm-fixes-4.1' of git://people.freedesktop.org/~agd5f/linux:
  drm/radeon: use proper ACR regisiter for DCE3.2
parents c65b99f0 091f0a70

drivers/gpu/drm/radeon/dce3_1_afmt.c

+1 −1
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ void dce3_2_hdmi_update_acr(struct drm_encoder *encoder, long offset, 
	struct drm_device *dev = encoder->dev;

	struct radeon_device *rdev = dev->dev_private;



	WREG32(HDMI0_ACR_PACKET_CONTROL + offset,

	WREG32(DCE3_HDMI0_ACR_PACKET_CONTROL + offset,

		HDMI0_ACR_SOURCE |		/* select SW CTS value */

		HDMI0_ACR_AUTO_SEND);	/* allow hw to sent ACR packets when required */