2 files changed, 11 insertions, 4 deletions

diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index d51f27faa202..3e0918834e7e 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -280,12 +280,12 @@ struct dip_infoframe {
                         uint16_t bottom_bar_start;
                         uint16_t left_bar_end;
                         uint16_t right_bar_start;
-                } avi;
+                } __attribute__ ((packed)) avi;
                 struct {
                         uint8_t vn[8];
                         uint8_t pd[16];
                         uint8_t sdi;
-                } spd;
+                } __attribute__ ((packed)) spd;
                 uint8_t payload[27];
         } __attribute__ ((packed)) body;
 } __attribute__((packed));
diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
index 7d3f238e8265..125228e77c50 100644
--- a/drivers/gpu/drm/i915/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/intel_sdvo.c
@@ -887,17 +887,24 @@ static bool intel_sdvo_set_avi_infoframe(struct intel_sdvo *intel_sdvo)
         };
         uint8_t tx_rate = SDVO_HBUF_TX_VSYNC;
         uint8_t set_buf_index[2] = { 1, 0 };
-        uint64_t *data = (uint64_t *)&avi_if;
+        uint8_t sdvo_data[4 + sizeof(avi_if.body.avi)];
+        uint64_t *data = (uint64_t *)sdvo_data;
         unsigned i;
 
         intel_dip_infoframe_csum(&avi_if);
 
+        /* sdvo spec says that the ecc is handled by the hw, and it looks like
+         * we must not send the ecc field, either. */
+        memcpy(sdvo_data, &avi_if, 3);
+        sdvo_data[3] = avi_if.checksum;
+        memcpy(&sdvo_data[4], &avi_if.body, sizeof(avi_if.body.avi));
+
         if (!intel_sdvo_set_value(intel_sdvo,
                                   SDVO_CMD_SET_HBUF_INDEX,
                                   set_buf_index, 2))
                 return false;
 
-        for (i = 0; i < sizeof(avi_if); i += 8) {
+        for (i = 0; i < sizeof(sdvo_data); i += 8) {
                 if (!intel_sdvo_set_value(intel_sdvo,
                                           SDVO_CMD_SET_HBUF_DATA,
                                           data, 8))