Merge remote-tracking branch 'origin/develop-3.10' into develop-3.10-next

[firefly-linux-kernel-4.4.55.git] / drivers / video / rockchip / transmitter / dpcd_edid.h

diff --git a/drivers/video/rockchip/transmitter/dpcd_edid.h b/drivers/video/rockchip/transmitter/dpcd_edid.h
index 405283e41affbdaddf6e01d36163e7c3b58e3abc..4fdbf6a1d6960cad5396c41edc77dcd5ad0e73ce 100644 (file)
--- a/drivers/video/rockchip/transmitter/dpcd_edid.h
+++ b/drivers/video/rockchip/transmitter/dpcd_edid.h
@@ -3,8 +3,8 @@
 #include "../../edid.h"
 
 #define DPCD_REV                                       0x00
-#define DPCD_MAX_LINK_RATE                                     0x01
-#define DPCD_MAX_LANE_CNT                                      0x02    
+#define DPCD_MAX_LINK_RATE                             0x01
+#define DPCD_MAX_LANE_CNT                              0x02    
 
 #define DPCD_MAX_DOWNSPREAD                            0x03
 #define DPCD_NORP                                      0x04
@@ -36,6 +36,7 @@
 #define DPCD_TRAINING_SCORE_LANE1                       0x209
 #define DPCD_TRAINING_SCORE_LANE2                       0x20a
 #define DPCD_TRAINING_SCORE_LANE3                       0x20b
+#define DPCD_SYMBOL_ERR_CONUT_LANE0                    0x210
 #define DPCD_SINK_POWER_STATE                          0x0600
 
 /* DPCD_ADDR_MAX_LANE_COUNT */
@@ -120,7 +121,7 @@
 #define EDID_EXTENSION_FLAG                            0x7e
 #define EDID_CHECKSUM                                  0x7f    
 
-static unsigned char edp_calc_edid_check_sum(unsigned char *edid_data)
+static unsigned char inline edp_calc_edid_check_sum(unsigned char *edid_data)
 {
        int i;
        unsigned char sum = 0;