diff --git a/drivers/video/msm/hdmi_msm.c b/drivers/video/msm/hdmi_msm.c index 81751e047fce..263ff5308c4a 100644 --- a/drivers/video/msm/hdmi_msm.c +++ b/drivers/video/msm/hdmi_msm.c @@ -3991,19 +3991,6 @@ static void hdmi_msm_spd_infoframe_packetsetup(void) HDMI_OUTP(0x00A4, packet_header); check_sum += IFRAME_CHECKSUM_32(packet_header); - /* Vendor Name (7bit ASCII code) */ - /* 0x00A8 GENERIC1_0 - * BYTE0 7:0 CheckSum - * BYTE1 15:8 VENDOR_NAME[0] - * BYTE2 23:16 VENDOR_NAME[1] - * BYTE3 31:24 VENDOR_NAME[2] */ - packet_payload = ((vendor_name[0] & 0x7f) << 8) - | ((vendor_name[1] & 0x7f) << 16) - | ((vendor_name[2] & 0x7f) << 24); - check_sum += IFRAME_CHECKSUM_32(packet_payload); - packet_payload |= ((0x100 - (0xff & check_sum)) & 0xff); - HDMI_OUTP(0x00A8, packet_payload); - /* 0x00AC GENERIC1_1 * BYTE4 7:0 VENDOR_NAME[3] * BYTE5 15:8 VENDOR_NAME[4] @@ -4085,6 +4072,19 @@ static void hdmi_msm_spd_infoframe_packetsetup(void) HDMI_OUTP(0x00C0, packet_payload); check_sum += IFRAME_CHECKSUM_32(packet_payload); + /* Vendor Name (7bit ASCII code) */ + /* 0x00A8 GENERIC1_0 + * BYTE0 7:0 CheckSum + * BYTE1 15:8 VENDOR_NAME[0] + * BYTE2 23:16 VENDOR_NAME[1] + * BYTE3 31:24 VENDOR_NAME[2] */ + packet_payload = ((vendor_name[0] & 0x7f) << 8) + | ((vendor_name[1] & 0x7f) << 16) + | ((vendor_name[2] & 0x7f) << 24); + check_sum += IFRAME_CHECKSUM_32(packet_payload); + packet_payload |= ((0x100 - (0xff & check_sum)) & 0xff); + HDMI_OUTP(0x00A8, packet_payload); + /* GENERIC1_LINE | GENERIC1_CONT | GENERIC1_SEND * Setup HDMI TX generic packet control * Enable this packet to transmit every frame