1 files changed, 2 insertions, 9 deletions

diff --git a/drivers/gpu/drm/radeon/r600_hdmi.c b/drivers/gpu/drm/radeon/r600_hdmi.c
index 456750a0daa5..e73b2a73494a 100644
--- a/drivers/gpu/drm/radeon/r600_hdmi.c
+++ b/drivers/gpu/drm/radeon/r600_hdmi.c
@@ -133,14 +133,7 @@ static void r600_hdmi_update_avi_infoframe(struct drm_encoder *encoder,
         struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv;
         uint32_t offset = dig->afmt->offset;
         uint8_t *frame = buffer + 3;
-
-        /* Our header values (type, version, length) should be alright, Intel
-         * is using the same. Checksum function also seems to be OK, it works
-         * fine for audio infoframe. However calculated value is always lower
-         * by 2 in comparison to fglrx. It breaks displaying anything in case
-         * of TVs that strictly check the checksum. Hack it manually here to
-         * workaround this issue. */
-        frame[0x0] += 2;
+        uint8_t *header = buffer;
 
         WREG32(HDMI0_AVI_INFO0 + offset,
                 frame[0x0] | (frame[0x1] << 8) | (frame[0x2] << 16) | (frame[0x3] << 24));
@@ -149,7 +142,7 @@ static void r600_hdmi_update_avi_infoframe(struct drm_encoder *encoder,
         WREG32(HDMI0_AVI_INFO2 + offset,
                 frame[0x8] | (frame[0x9] << 8) | (frame[0xA] << 16) | (frame[0xB] << 24));
         WREG32(HDMI0_AVI_INFO3 + offset,
-                frame[0xC] | (frame[0xD] << 8));
+                frame[0xC] | (frame[0xD] << 8) | (header[1] << 24));
 }
 
 /*