Patch "drm/radeon: fix ordering of AVI packet setup" has been added to the 4.0-stable tree

This is a note to let you know that I've just added the patch titled

drm/radeon: fix ordering of AVI packet setup

to the 4.0-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
drm-radeon-fix-ordering-of-avi-packet-setup.patch
and it can be found in the queue-4.0 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

From: Alex Deucher <[email protected]>
Date: Tue, 31 Mar 2015 10:33:05 -0400
Subject: drm/radeon: fix ordering of AVI packet setup

From: Alex Deucher <[email protected]>

commit 304f07e9c8d302cf3183248cbabb40598eb5b732 upstream.

Set the line first, then enable the stream. May fix pink line problems on some displays.

---
 drivers/gpu/drm/radeon/evergreen_hdmi.c |   12 ++++++------
 drivers/gpu/drm/radeon/r600_hdmi.c      |    9 +++++----
 2 files changed, 11 insertions(+), 10 deletions(-)

@@ -219,13 +219,13 @@ void evergreen_set_avi_packet(struct rad
 	WREG32(AFMT_AVI_INFO3 + offset,
 		frame[0xC] | (frame[0xD] << 8) | (buffer[1] << 24));
 
-	WREG32_OR(HDMI_INFOFRAME_CONTROL0 + offset,
-		HDMI_AVI_INFO_SEND |	/* enable AVI info frames */
-		HDMI_AVI_INFO_CONT);	/* required for audio info values to be updated */
-
 	WREG32_P(HDMI_INFOFRAME_CONTROL1 + offset,
-		HDMI_AVI_INFO_LINE(2),	/* anything other than 0 */
-		~HDMI_AVI_INFO_LINE_MASK);
+		 HDMI_AVI_INFO_LINE(2),	/* anything other than 0 */
+		 ~HDMI_AVI_INFO_LINE_MASK);
+
+	WREG32_OR(HDMI_INFOFRAME_CONTROL0 + offset,
+		  HDMI_AVI_INFO_SEND |	/* enable AVI info frames */
+		  HDMI_AVI_INFO_CONT);	/* required for audio info values to be updated */
 }
 
 void dce4_hdmi_audio_set_dto(struct radeon_device *rdev,

@@ -228,12 +228,13 @@ void r600_set_avi_packet(struct radeon_d
 	WREG32(HDMI0_AVI_INFO3 + offset,
 		frame[0xC] | (frame[0xD] << 8) | (buffer[1] << 24));
 
+	WREG32_OR(HDMI0_INFOFRAME_CONTROL1 + offset,
+		  HDMI0_AVI_INFO_LINE(2));	/* anything other than 0 */
+
 	WREG32_OR(HDMI0_INFOFRAME_CONTROL0 + offset,
-		HDMI0_AVI_INFO_SEND |	/* enable AVI info frames */
-		HDMI0_AVI_INFO_CONT);	/* send AVI info frames every frame/field */
+		  HDMI0_AVI_INFO_SEND |	/* enable AVI info frames */
+		  HDMI0_AVI_INFO_CONT);	/* send AVI info frames every frame/field */
 
-	WREG32_OR(HDMI0_INFOFRAME_CONTROL1 + offset,
-		HDMI0_AVI_INFO_LINE(2));	/* anything other than 0 */
 }
 
 /*

Patches currently in stable-queue which might be from [email protected] are

queue-4.0/drm-radeon-fix-lockup-when-bos-aren-t-part-of-the-vm-on-release.patch queue-4.0/drm-radeon-reset-bos-address-after-clearing-it.patch queue-4.0/drm-radeon-adjust-pll-when-audio-is-not-enabled.patch queue-4.0/drm-radeon-add-si-dpm-quirk-for-sapphire-r9-270-dual-x-2g-gddr5.patch queue-4.0/drm-radeon-only-enable-audio-streams-if-the-monitor-supports-it.patch queue-4.0/drm-radeon-only-mark-audio-as-connected-if-the-monitor-supports-it-v3.patch queue-4.0/drm-radeon-drop-dce6_dp_enable.patch queue-4.0/drm-radeon-audio-don-t-enable-packets-until-the-end.patch queue-4.0/drm-radeon-check-new-address-before-removing-old-one.patch queue-4.0/drm-radeon-fix-ordering-of-avi-packet-setup.patch queue-4.0/drm-radeon-use-drm_calloc_ab-for-cs-relocs.patch