diff --git a/longan/brandy/brandy-2.0/u-boot-2018/drivers/video/sunxi/disp2/hdmi2/hdmi_core/api/edid.c b/longan/brandy/brandy-2.0/u-boot-2018/drivers/video/sunxi/disp2/hdmi2/hdmi_core/api/edid.c index 424f68bba3..b11d53579f 100644 --- a/longan/brandy/brandy-2.0/u-boot-2018/drivers/video/sunxi/disp2/hdmi2/hdmi_core/api/edid.c +++ b/longan/brandy/brandy-2.0/u-boot-2018/drivers/video/sunxi/disp2/hdmi2/hdmi_core/api/edid.c @@ -18,8 +18,9 @@ const unsigned DTD_SIZE = 0x12; static supported_dtd_t _dtd[] = { /* pclk I/P Ha Hb Va Vb */ - {60000, { 1, 0, 0, 0, 25200, 0, 640, 160, 0, 4, 16, 96, 0, 480, 45, 0, 3, 10, 2, 0} }, + //{60000, { 1, 0, 0, 0, 25200, 0, 640, 160, 0, 4, 16, 96, 0, 480, 45, 0, 3, 10, 2, 0} }, {59940, { 1, 0, 0, 0, 25175, 0, 640, 160, 0, 4, 16, 96, 0, 480, 45, 0, 3, 10, 2, 0} }, + {60000, { 1, 0, 0, 0, 31500, 0, 640, 200, 0, 4, 16, 64, 1, 480, 20, 0, 3, 1, 3, 1} }, {60000, { 2, 0, 0, 0, 27027, 0, 720, 138, 0, 4, 16, 62, 0, 480, 45, 0, 3, 9, 6, 0} }, {59940, { 2, 0, 0, 0, 27000, 0, 720, 138, 0, 4, 16, 62, 0, 480, 45, 0, 3, 9, 6, 0} }, {60000, { 3, 0, 0, 0, 27027, 0, 720, 138, 0, 16, 16, 62, 0, 480, 45, 0, 9, 9, 6, 0} }, @@ -152,8 +153,8 @@ static supported_dtd_t _dtd[] = { {60000, {0x202, 0, 0, 0, 206000, 0, 1440, 160, 0, 9, 10, 10, 1, 2560, 15, 0, 16, 11, 2, 1} }, {60000, {0x203, 0, 0, 0, 154000, 0, 1080, 245, 0, 9, 32, 32, 0, 1920, 16, 0, 16, 8, 4, 0} }, {60000, {0x204, 0, 0, 0, 29230, 0, 800, 128, 0, 16, 40, 48, 1, 480, 45, 0, 9, 13, 3, 1} }, - {60000, {0x205, 0, 0, 0, 48960, 0, 1024, 288, 0, 16, 40, 101, 1, 600, 22, 0, 9, 11, 3, 1} }, - + //{60000, {0x205, 0, 0, 0, 48960, 0, 1024, 288, 0, 16, 40, 101, 1, 600, 22, 0, 9, 11, 3, 1} }, + {60000, {0x205, 0, 0, 0, 49000, 0, 1024, 288, 0, 16, 48, 96, 0, 600, 24, 0, 9, 3, 10, 0} }, {60000, {0x206, 0, 0, 0, 41000, 0, 960, 226, 0, 16, 190, 4, 1, 544, 32, 0, 9, 10, 4, 1} }, {60000, {0x207, 0, 0, 0, 75000, 0, 1280, 128, 0, 16, 40, 48, 0, 800, 45, 0, 9, 13, 3, 0} }, {60000, {0x208, 0, 0, 0, 96200, 0, 1920, 212, 0, 16, 120, 32, 1, 720, 32, 0, 9, 10, 12, 1} }, diff --git a/longan/brandy/brandy-2.0/u-boot-2018/drivers/video/sunxi/disp2/hdmi2/hdmi_core/api/phy.c b/longan/brandy/brandy-2.0/u-boot-2018/drivers/video/sunxi/disp2/hdmi2/hdmi_core/api/phy.c index 51c583d16c..2afab48342 100644 --- a/longan/brandy/brandy-2.0/u-boot-2018/drivers/video/sunxi/disp2/hdmi2/hdmi_core/api/phy.c +++ b/longan/brandy/brandy-2.0/u-boot-2018/drivers/video/sunxi/disp2/hdmi2/hdmi_core/api/phy.c @@ -944,7 +944,7 @@ static u32 phy301_get_freq(u32 pClk) return 44900; else if (pClk == 49500) return 49500; - else if ((pClk == 50000) || (pClk == 48960)) + else if ((pClk == 50000) || (pClk == 48960) || (pClk == 49000)) return 50000; else if (((pClk >= 50345) && (pClk <= 50355)) || ((pClk >= 50395) && (pClk <= 50405))) diff --git a/longan/kernel/linux-5.4/drivers/video/fbdev/sunxi/disp2/hdmi2/hdmi_core/api/edid.c b/longan/kernel/linux-5.4/drivers/video/fbdev/sunxi/disp2/hdmi2/hdmi_core/api/edid.c index 19ac08bef6..6380b1b1b2 100644 --- a/longan/kernel/linux-5.4/drivers/video/fbdev/sunxi/disp2/hdmi2/hdmi_core/api/edid.c +++ b/longan/kernel/linux-5.4/drivers/video/fbdev/sunxi/disp2/hdmi2/hdmi_core/api/edid.c @@ -18,7 +18,8 @@ const unsigned DTD_SIZE = 0x12; static supported_dtd_t _dtd[] = { /* pclk I/P Ha Hb Va Vb */ - {60000, { 1, 0, 0, 0, 31500, 0, 640, 160, 0, 4, 16, 96, 0, 480, 45, 0, 3, 10, 2, 0} }, + //{60000, { 1, 0, 0, 0, 25200, 0, 640, 160, 0, 4, 16, 96, 0, 480, 45, 0, 3, 10, 2, 0} }, + {60000, { 1, 0, 0, 0, 31500, 0, 640, 200, 0, 4, 16, 64, 1, 480, 20, 0, 3, 1, 3, 1} }, {59940, { 1, 0, 0, 0, 25175, 0, 640, 160, 0, 4, 16, 96, 0, 480, 45, 0, 3, 10, 2, 0} }, {60000, { 2, 0, 0, 0, 27000, 0, 720, 138, 0, 4, 16, 62, 0, 480, 45, 0, 3, 9, 6, 0} }, {59940, { 2, 0, 0, 0, 27000, 0, 720, 138, 0, 4, 16, 62, 0, 480, 45, 0, 3, 9, 6, 0} }, @@ -150,10 +151,11 @@ static supported_dtd_t _dtd[] = { /*for vesa format*/ {60000, {0x201, 0, 0, 0, 242180, 0, 2560, 160, 0, 16, 48, 32, 1, 1440, 44, 0, 9, 3, 6, 1} }, {60000, {0x202, 0, 0, 0, 206000, 0, 1440, 160, 0, 9, 10, 10, 1, 2560, 15, 0, 16, 11, 2, 1} }, - {60000, {0x203, 0, 0, 0, 154000, 0, 1080, 245, 0, 9, 32, 32, 0, 1920, 16, 0, 16, 8, 4, 0} }, + //{60000, {0x203, 0, 0, 0, 154000, 0, 1080, 245, 0, 9, 32, 32, 0, 1920, 16, 0, 16, 8, 4, 0} }, + {60000, {0x203, 0, 0, 0, 137520, 0, 1080, 245, 0, 9, 32, 32, 0, 1920, 16, 0, 16, 8, 4, 0} }, {60000, {0x204, 0, 0, 0, 29230, 0, 800, 128, 0, 16, 40, 48, 1, 480, 45, 0, 9, 13, 3, 1} }, - {60000, {0x205, 0, 0, 0, 48960, 0, 1024, 288, 0, 16, 40, 101, 1, 600, 22, 0, 9, 11, 3, 1} }, - + //{60000, {0x205, 0, 0, 0, 48960, 0, 1024, 288, 0, 16, 40, 101, 1, 600, 22, 0, 9, 11, 3, 1} }, + {60000, {0x205, 0, 0, 0, 49000, 0, 1024, 288, 0, 16, 48, 96, 0, 600, 24, 0, 9, 3, 10, 0} }, {60000, {0x206, 0, 0, 0, 41000, 0, 960, 226, 0, 16, 190, 4, 1, 544, 32, 0, 9, 10, 4, 1} }, {60000, {0x207, 0, 0, 0, 75000, 0, 1280, 128, 0, 16, 40, 48, 0, 800, 45, 0, 9, 13, 3, 0} }, {60000, {0x208, 0, 0, 0, 96200, 0, 1920, 212, 0, 16, 120, 32, 1, 720, 32, 0, 9, 10, 12, 1} }, diff --git a/longan/kernel/linux-5.4/drivers/video/fbdev/sunxi/disp2/hdmi2/hdmi_core/api/phy.c b/longan/kernel/linux-5.4/drivers/video/fbdev/sunxi/disp2/hdmi2/hdmi_core/api/phy.c index 56646e1132..1635bd170c 100644 --- a/longan/kernel/linux-5.4/drivers/video/fbdev/sunxi/disp2/hdmi2/hdmi_core/api/phy.c +++ b/longan/kernel/linux-5.4/drivers/video/fbdev/sunxi/disp2/hdmi2/hdmi_core/api/phy.c @@ -1095,7 +1095,7 @@ static u32 phy301_get_freq(u32 pClk) return 44900; else if (pClk == 49500) return 49500; - else if ((pClk == 50000) || (pClk == 48960)) + else if ((pClk == 50000) || (pClk == 48960) || (pClk == 49000)) return 50000; else if (((pClk >= 50345) && (pClk <= 50355)) || ((pClk >= 50395) && (pClk <= 50405))) @@ -1183,7 +1183,7 @@ static u32 phy301_get_freq(u32 pClk) else if (((pClk >= 148347) && (pClk <= 148357)) || ((pClk >= 148495) && (pClk <= 148505))) return 148500; - else if (pClk == 154000) + else if ((pClk == 154000) ||(pClk == 137520)) return 154000; else if (pClk == 156000) return 156000;