From 66dbecc94910c794a97bbae6fd3081bb42987180 Mon Sep 17 00:00:00 2001 From: Igor Pecovnik Date: Tue, 9 May 2017 19:44:37 +0200 Subject: [PATCH] Patch fix https://github.com/armbian/build/issues/594#issuecomment-300236026 --- .../z-0003-add-additional-video-modes.patch | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/patch/kernel/sun8i-default/z-0003-add-additional-video-modes.patch b/patch/kernel/sun8i-default/z-0003-add-additional-video-modes.patch index a638c43001..a055bc50c3 100644 --- a/patch/kernel/sun8i-default/z-0003-add-additional-video-modes.patch +++ b/patch/kernel/sun8i-default/z-0003-add-additional-video-modes.patch @@ -28,7 +28,7 @@ index b3f1075..9148329 100755 + break; + case DISP_TV_MOD_1680_1050P: + width = 1680; -+ height = 1050; ++ height = 1050; + break; + case DISP_TV_MOD_2048_1536P: + width = 2048; @@ -37,7 +37,7 @@ index b3f1075..9148329 100755 default: printk("err:function:%s, line:%d,output_mode=%d\n", __func__, __LINE__, output_mode); } -@@ -798,6 +826,30 @@ s32 bsp_disp_get_screen_height_from_output_type(u32 screen_id, u32 output_type, +@@ -798,6 +826,34 @@ s32 bsp_disp_get_screen_height_from_output_type(u32 screen_id, u32 output_type, width = 3840; height = 2160; break; @@ -63,7 +63,7 @@ index b3f1075..9148329 100755 + break; + case DISP_TV_MOD_1680_1050P: + width = 1680; -+ height = 1050; ++ height = 1050; + break; + case DISP_TV_MOD_2048_1536P: + width = 2048; @@ -102,7 +102,7 @@ index a390049..1af8af5 100755 + break; + case DISP_TV_MOD_1680_1050P: + width = 1680; -+ height = 1050; ++ height = 1050; + break; + case DISP_TV_MOD_2048_1536P: + width = 2048; @@ -111,7 +111,7 @@ index a390049..1af8af5 100755 } } /* FIXME: add other output device res */ -@@ -807,6 +835,30 @@ s32 bsp_disp_get_screen_height_from_output_type(u32 disp, u32 output_type, u32 o +@@ -807,6 +835,34 @@ s32 bsp_disp_get_screen_height_from_output_type(u32 disp, u32 output_type, u32 o width = 3840; height = 2160; break; @@ -178,10 +178,10 @@ index ddcb2b0..95b9a0f 100755 + {{37 , 4 , 0, 96, 5, 3, 4, 1, 1, 0, 0, 0, 152, 48, 112, 0, 42, 1, 1 }}, + {{38 , 4 , 0, 96, 5, 7, 3, 1, 3, 0, 0, 80, 176, 64, 112, 0, 32, 1, 1 }}, + {{39 , 4 , 0, 96, 5, 9, 3, 1, 18, 0, 1, 160, 216, 32, 152, 132, 37, 1, 1 }}, -+ {{40 , 2 , 0, 96, 6, 3, 4, 2, 1, 0, 0, 144, 64, 104, 184, 26, 44, 1, 1 }}, ++ {{40 , 2 , 0, 96, 6, 3, 4, 2, 1, 0, 0, 144, 64, 104, 184, 26, 44, 1, 1 }}, + {{41 , 1 , 0, 96, 8, 3, 6, 0, 1, 0, 0, 128, 208, 128, 216, 0, 45, 1, 1 }}, }; - + static unsigned char ca_table[64]= diff --git a/drivers/video/sunxi/disp2/hdmi/aw/hdmi_core.c b/drivers/video/sunxi/disp2/hdmi/aw/hdmi_core.c index 80580b4..5851d02 100755 @@ -199,7 +199,7 @@ index 80580b4..5851d02 100755 + {HDMI2048_1536P, 0,172040000, 0, 2048, 1536, 2736, 344, 128, 216, 1572, 32, 1, 3, 1, 1, 0, 0 ,0}, { HDMI_EDID, }, }; - + diff --git a/drivers/video/sunxi/disp2/hdmi/aw/hdmi_edid.c b/drivers/video/sunxi/disp2/hdmi/aw/hdmi_edid.c index 71ae0d3..e7437d8 100755 --- a/drivers/video/sunxi/disp2/hdmi/aw/hdmi_edid.c @@ -232,7 +232,7 @@ index 71ae0d3..e7437d8 100755 if ((sizex== 1280) && (sizey == 720)) { Device_Support_VIC[HDMI720P_60] = 1; } -@@ -183,6 +204,24 @@ static __s32 Parse_DTD_Block(__u8 *pbuf) +@@ -183,6 +204,27 @@ static __s32 Parse_DTD_Block(__u8 *pbuf) if ((sizex== 720) && (sizey == 576)) { Device_Support_VIC[HDMI576P] = 1; } @@ -275,7 +275,7 @@ index f0d2ae3..b510375 100755 + {DISP_TV_MOD_1680_1050P, HDMI1680_1050P, }, + {DISP_TV_MOD_2048_1536P, HDMI2048_1536P, }, }; - + __u32 Hdmi_get_vic(u32 mode) diff --git a/drivers/video/sunxi/disp2/hdmi/hdmi_hal.h b/drivers/video/sunxi/disp2/hdmi/hdmi_hal.h index 9074103..cf4a07f 100755 @@ -311,5 +311,5 @@ index c59aafb..98be01b 100755 + DISP_TV_MOD_2048_1536P = 0x25, + DISP_TV_MODE_NUM = 0x26, }disp_tv_mode; - - + +