Merge "adv7481: Support 1080p60 in EDID" (4926f1bc) · Commits · e / devices / android_kernel_sony_msm8998

drivers/media/i2c/adv7481.c

+22 −21

Original line number	Diff line number	Diff line
		@@ -193,19 +193,20 @@ const uint8_t adv7481_default_edid_data[] = {
		/* Display Parameters */
		0x80, 0x10, 0x09, 0x78, 0x0A,
		/* Color characteristics */
		0x0D, 0xC9, 0xA0, 0x57, 0x47, 0x98, 0x27, 0x12, 0x48, 0x4C,
		0x0D, 0xC9, 0xA0, 0x57, 0x47, 0x98, 0x27, 0x12,
		0x48, 0x4C,
		/* Established Timings */
		0x21, 0x08, 0x00,
		/* Standard Timings */
		0x81, 0xC0, 0x81, 0x40, 0x3B, 0xC0, 0x3B, 0x40,
		0x31, 0xC0, 0x31, 0x40, 0x01, 0x01, 0x01, 0x01,
		0xD1, 0xC0, 0xD1, 0x40, 0x81, 0xC0, 0x81, 0x40,
		0x3B, 0xC0, 0x3B, 0x40, 0x31, 0xC0, 0x31, 0x40,
		/* Detailed Timings Block */
		0x01, 0x1D, 0x00, 0xBC, 0x52, 0xD0, 0x1E, 0x20,
		0xB8, 0x28, 0x55, 0x40, 0xA0, 0x5A, 0x00, 0x00,
		0x1A, 0x36, 0x80, 0xA0, 0x70, 0x38, 0x1F, 0x40,
		0x30, 0x20, 0x35, 0x00, 0x40, 0x44, 0x21, 0x00,
		0x00, 0x1E,
		/* Monitor Descriptor Block 2 */
		0x8C, 0x0A, 0xD0, 0xB4, 0x20, 0xE0, 0x14, 0x10,
		0x12, 0x48, 0x3A, 0x00, 0xD8, 0xA2, 0x00, 0x00,
		0x00, 0x19, 0x00, 0xA0, 0x50, 0xD0, 0x15, 0x20,
		0x30, 0x20, 0x35, 0x00, 0x80, 0xD8, 0x10, 0x00,
		0x00, 0x1E,
		/* Monitor Descriptor Block 3 */
		0x00, 0x00, 0x00, 0xFD, 0x00, 0x17, 0x4B, 0x0F,
		@@ -218,16 +219,16 @@ const uint8_t adv7481_default_edid_data[] = {
		/* Extension Flag CEA */
		0x01,
		/* Checksum */
		0x5B,
		0x16,

		/* Block 1 (Extension Block) */
		/* Extension Header */
		0x02, 0x03, 0x1E,
		0x02, 0x03, 0x22,
		/* Display supports */
		0x71,
		/* Video Data Bock */
		0x48, 0x84, 0x13, 0x3C, 0x03, 0x02, 0x11, 0x12,
		0x01,
		/* Video Data Block */
		0x4C, 0x84, 0x13, 0x3C, 0x03, 0x02, 0x11, 0x12,
		0x01, 0x90, 0x1F, 0x20, 0x22,
		/* HDMI VSDB */
		/* Deep color All, Max_TMDS_Clock = 150 MHz */
		0x68, 0x03, 0x0C, 0x00, 0x10, 0x00, 0x80,
		@@ -239,17 +240,17 @@ const uint8_t adv7481_default_edid_data[] = {
		/* Speaker Allocation Data Block */
		0x83, 0x01, 0x00, 0x00,
		/* Detailed Timing Descriptor */
		0x01, 0x1D, 0x00, 0x72, 0x51, 0xD0, 0x1E, 0x20,
		0x6E, 0x28, 0x55, 0x00, 0xA0, 0x2A, 0x53, 0x00,
		0x1A, 0x36, 0x80, 0xA0, 0x70, 0x38, 0x1F, 0x40,
		0x30, 0x20, 0x35, 0x00, 0x40, 0x44, 0x21, 0x00,
		0x00, 0x1E,
		/* Detailed Timing Descriptor */
		0x8C, 0x0A, 0xD0, 0xB4, 0x20, 0xE0, 0x14, 0x10,
		0x12, 0x48, 0x3A, 0x00, 0xD8, 0xA2, 0x00, 0x00,
		0x00, 0x19, 0x00, 0xA0, 0x50, 0xD0, 0x15, 0x20,
		0x30, 0x20, 0x35, 0x00, 0x80, 0xD8, 0x10, 0x00,
		0x00, 0x1E,
		/* Detailed Timing Descriptor */
		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
		0x00, 0x00,
		0x41, 0x0A, 0xD0, 0xA0, 0x20, 0xE0, 0x13, 0x10,
		0x30, 0x20, 0x3A, 0x00, 0xD8, 0x90, 0x00, 0x00,
		0x00, 0x18,
		/* Detailed Timing Descriptor */
		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
		@@ -259,9 +260,9 @@ const uint8_t adv7481_default_edid_data[] = {
		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
		0x00, 0x00,
		/* DTD padding */
		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
		0x00, 0x00, 0x00,
		/* Checksum */
		0xC6
		0x8C
		};

		#define ADV7481_EDID_SIZE ARRAY_SIZE(adv7481_default_edid_data)