-
-
Save NffS/feabe34735a3b721de78b81b23c81153 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff -ur a/drivers/video/sunxi/disp/de/disp_display.c b/drivers/video/sunxi/disp/de/disp_display.c | |
--- a/drivers/video/sunxi/disp/de/disp_display.c 2017-01-25 08:55:42.667974247 +0200 | |
+++ b/drivers/video/sunxi/disp/de/disp_display.c 2017-01-25 09:03:21.295974247 +0200 | |
@@ -722,8 +722,8 @@ | |
break; | |
case DISP_TV_MOD_720P_50HZ: | |
case DISP_TV_MOD_720P_60HZ: | |
- width = 1280; | |
- height = 720; | |
+ width = 2160; | |
+ height = 1200; | |
break; | |
case DISP_TV_MOD_1080I_50HZ: | |
case DISP_TV_MOD_1080I_60HZ: | |
@@ -800,8 +800,8 @@ | |
break; | |
case DISP_TV_MOD_720P_50HZ: | |
case DISP_TV_MOD_720P_60HZ: | |
- width = 1280; | |
- height = 720; | |
+ width = 2160; | |
+ height = 1200; | |
break; | |
case DISP_TV_MOD_1080I_50HZ: | |
case DISP_TV_MOD_1080I_60HZ: | |
Only in b/drivers/video/sunxi/disp/de: disp_display.c~ | |
diff -ur a/drivers/video/sunxi/disp2/disp/de/disp_display.c b/drivers/video/sunxi/disp2/disp/de/disp_display.c | |
--- a/drivers/video/sunxi/disp2/disp/de/disp_display.c 2017-01-25 08:56:25.307974247 +0200 | |
+++ b/drivers/video/sunxi/disp2/disp/de/disp_display.c 2017-01-25 09:04:07.815974247 +0200 | |
@@ -732,8 +732,8 @@ | |
break; | |
case DISP_TV_MOD_720P_50HZ: | |
case DISP_TV_MOD_720P_60HZ: | |
- width = 1280; | |
- height = 720; | |
+ width = 2160; | |
+ height = 1200; | |
break; | |
case DISP_TV_MOD_1080P_50HZ: | |
case DISP_TV_MOD_1080P_60HZ: | |
@@ -808,8 +808,8 @@ | |
break; | |
case DISP_TV_MOD_720P_50HZ: | |
case DISP_TV_MOD_720P_60HZ: | |
- width = 1280; | |
- height = 720; | |
+ width = 2160; | |
+ height = 1200; | |
break; | |
case DISP_TV_MOD_1080P_50HZ: | |
case DISP_TV_MOD_1080P_60HZ: | |
Only in b/drivers/video/sunxi/disp2/disp/de: disp_display.c~ | |
diff -ur a/drivers/video/sunxi/disp2/hdmi/aw/hdmi_bsp_sun8iw7.c b/drivers/video/sunxi/disp2/hdmi/aw/hdmi_bsp_sun8iw7.c | |
--- a/drivers/video/sunxi/disp2/hdmi/aw/hdmi_bsp_sun8iw7.c 2017-01-25 12:54:55.174377784 +0200 | |
+++ b/drivers/video/sunxi/disp2/hdmi/aw/hdmi_bsp_sun8iw7.c 2017-01-26 10:30:23.645093998 +0200 | |
@@ -34,7 +34,7 @@ | |
{{19 , 4 , 0, 96, 5, 5, 2, 2, 5, 1, 0, 0, 188, 184, 40, 208, 30, 1, 1 }}, | |
{{4 , 4 , 0, 96, 5, 5, 2, 1, 5, 0, 0, 0, 114, 110, 40, 208, 30, 1, 1 }}, | |
{{20 , 4 , 0, 97, 7, 5, 4, 2, 2, 2, 0, 128, 208, 16, 44, 56, 22, 1, 1 }}, | |
- {{5 , 4 , 0, 97, 7, 5, 4, 1, 2, 0, 0, 128, 24, 88, 44, 56, 22, 1, 1 }}, | |
+ {{5 , 1 , 0, 0, 8, 2, 4, 0, 28, 0, 0, 112, 106, 40, 20, 176, 264, 1, 1 }}, | |
{{31 , 2 , 0, 96, 7, 5, 4, 2, 4, 2, 0, 128, 208, 16, 44, 56, 45, 1, 1 }}, | |
{{16 , 2 , 0, 96, 7, 5, 4, 1, 4, 0, 0, 128, 24, 88, 44, 56, 45, 1, 1 }}, | |
{{32 , 4 , 0, 96, 7, 5, 4, 3, 4, 2, 0, 128, 62, 126, 44, 56, 45, 1, 1 }}, | |
Only in b/drivers/video/sunxi/disp2/hdmi/aw: hdmi_bsp_sun8iw7.c~ | |
diff -ur a/drivers/video/sunxi/disp2/hdmi/aw/hdmi_core.c b/drivers/video/sunxi/disp2/hdmi/aw/hdmi_core.c | |
--- a/drivers/video/sunxi/disp2/hdmi/aw/hdmi_core.c 2017-01-25 08:56:51.283974247 +0200 | |
+++ b/drivers/video/sunxi/disp2/hdmi/aw/hdmi_core.c 2017-01-25 15:11:12.590411931 +0200 | |
@@ -6,7 +6,7 @@ | |
static bool video_enable = 0; | |
static bool audio_enable = false; | |
static __u32 cts_enable = 0; | |
-static __u32 hdcp_enable = 0; | |
+static __u32 hdcp_enable = 1; | |
static __u8 isHDMI = 0; | |
static __u8 YCbCr444_Support = 0; | |
static __s32 HPD = 0; | |
@@ -25,13 +25,15 @@ | |
disp_video_timings video_timing[] = | |
{ | |
{HDMI1440_480I, 0,13500000, 1, 720, 480, 858, 57, 19, 62, 525, 15, 4, 3, 0, 0, 1, 0, 0}, | |
{HDMI1440_576I, 0,13500000, 1, 720, 576, 864, 69, 12, 63, 625, 19, 2, 3, 0, 0, 1, 0, 0}, | |
{HDMI480P, 0,27000000, 0, 720, 480, 858, 60, 16, 62, 525, 30, 9, 6, 0, 0, 0, 0, 0}, | |
{HDMI576P, 0,27000000, 0, 720, 576, 864, 68, 12, 64, 625, 39, 5, 5, 0, 0, 0, 0, 0}, | |
{HDMI720P_50, 0,74250000, 0, 1280, 720, 1980, 220, 440, 40, 750, 20, 5, 5, 1, 1, 0, 0, 0}, | |
- {HDMI720P_60, 0,74250000, 0, 1280, 720, 1650, 220, 110, 40, 750, 20, 5, 5, 1, 1, 0, 0, 0}, | |
+ | |
+ {HDMI720P_60, 0,297000000, 0, 2160, 1200, 2266, 46, 40, 20, 1464, 234, 28, 2, 0, 0, 0, 0, 0}, | |
+ | |
{HDMI1080I_50, 0,74250000, 0, 1920, 1080, 2640, 148, 528, 44, 1125, 15, 2, 5, 1, 1, 1, 0, 0}, | |
{HDMI1080I_60, 0,74250000, 0, 1920, 1080, 2200, 148, 88, 44, 1125, 15, 2, 5, 1, 1, 1, 0, 0}, | |
{HDMI1080P_50, 0,148500000, 0, 1920, 1080, 2640, 148, 528, 44, 1125, 36, 4, 5, 1, 1, 0, 0, 0}, | |
@@ -46,7 +48,9 @@ | |
{HDMI3840_2160P_25, 0,297000000, 0, 3840, 2160, 5280, 296, 1056, 88, 2250, 72, 8, 10, 1, 1, 0, 0, 0}, | |
{HDMI800_480P, 0,27000000, 0, 800, 480, 1028, 88, 80, 60, 525, 29, 13, 3, 0, 0, 0, 0, 0}, | |
{HDMI1024_768P, 0,65000000, 0, 1024, 768, 1344, 160, 24, 136, 806, 29, 3, 6, 0, 0, 0, 0, 0}, | |
+ | |
{HDMI1280_1024P, 0,108000000, 0, 1280, 1024, 1688, 248, 48, 112, 1066, 38, 1, 3, 1, 1, 0, 0, 0}, | |
+ | |
{HDMI1360_768P, 0,85500000, 0, 1360, 768, 1792, 256, 64, 112, 805, 17, 3, 17, 0, 0, 0, 0, 0}, | |
{HDMI1440_900P, 0,108000000, 0, 1440, 900, 1848, 248, 48, 112, 942, 38, 1, 3, 1, 1, 0, 0, 0}, | |
{HDMI1680_1050P, 0,147140000, 0, 1680, 1050, 2256, 288, 104, 184, 1087, 33, 1, 3, 1, 1, 0, 0, 0}, | |
Only in b/drivers/video/sunxi/disp2/hdmi/aw: hdmi_core.c~ | |
diff -ur a/drivers/video/sunxi/disp2/hdmi/aw/hdmi_edid.c b/drivers/video/sunxi/disp2/hdmi/aw/hdmi_edid.c | |
--- a/drivers/video/sunxi/disp2/hdmi/aw/hdmi_edid.c 2017-01-25 08:57:05.027974247 +0200 | |
+++ b/drivers/video/sunxi/disp2/hdmi/aw/hdmi_edid.c 2017-01-25 09:48:42.011974247 +0200 | |
@@ -156,7 +156,7 @@ | |
frame_rate = (pclk * 10000) /pixels_total; | |
} | |
- if ((frame_rate == 59) || (frame_rate == 60)) { | |
+ if ((frame_rate == 59) || (frame_rate == 60) || (frame_rate == 90) || (frame_rate == 89)) { | |
if ((sizex== 720) && (sizey == 240)) { | |
Device_Support_VIC[HDMI1440_480I] = 1; | |
} | |
@@ -181,7 +181,7 @@ | |
if ((sizex== 1680) && (sizey == 1050)) { | |
Device_Support_VIC[HDMI1680_1050P] = 1; | |
} | |
- if ((sizex== 1280) && (sizey == 720)) { | |
+ if ((sizex== 2160)) { | |
Device_Support_VIC[HDMI720P_60] = 1; | |
} | |
if ((sizex== 1920) && (sizey == 540)) { | |
@@ -216,8 +216,8 @@ | |
if ((sizex== 1680) && (sizey == 1050)) { | |
Device_Support_VIC[HDMI1680_1050P] = 1; | |
} | |
- if ((sizex== 1280) && (sizey == 720)) { | |
- Device_Support_VIC[HDMI720P_50] = 1; | |
+ if ((sizex== 2160)) { | |
+ Device_Support_VIC[HDMI720P_60] = 1; | |
} | |
if ((sizex== 1920) && (sizey == 540)) { | |
Device_Support_VIC[HDMI1080I_50] = 1; | |
@@ -228,7 +228,7 @@ | |
} | |
else if ((frame_rate == 23) || (frame_rate == 24)) { | |
if ((sizex== 1920) && (sizey == 1080)) { | |
- Device_Support_VIC[HDMI1080P_24] = 1; | |
+ Device_Support_VIC[HDMI720P_60] = 1; | |
} | |
} | |
__inf("PCLK=%d\tXsize=%d\tYsize=%d\tFrame_rate=%d\n", | |
Only in b/drivers/video/sunxi/disp2/hdmi/aw: hdmi_edid.c~ |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment