From 055f34c9e0d26fadf8168571fdd4705de51b325f Mon Sep 17 00:00:00 2001
From: Marijan Limov <marijan.limov@gmail.com>
Date: Mon, 23 May 2022 23:08:19 +0200
Subject: [PATCH] beryllium: Add display size in panel xml and add more
 resolutions The resolutions either use: the full display, the display without
 notch and corners or 16:9(4:3) ratio. 1080p, 720p and 480p standards were
 used.

---
 beryllium/DSDT.AML           | Bin 253172 -> 253320 bytes
 beryllium/ebbgpanelcfg.asl   |   9 +++
 beryllium/graphics.asl       | 153 +++++------------------------------
 beryllium/panel.asl          |   3 +-
 beryllium/tianmapanelcfg.asl |   9 +++
 5 files changed, 39 insertions(+), 135 deletions(-)

diff --git a/beryllium/DSDT.AML b/beryllium/DSDT.AML
index 8a6283ad49ceb9922826224e9240a7f21d0dee40..320e454ff119415715d6205e23e4fd55e087435e 100644
GIT binary patch
delta 562
zcmeyelfPp(KbK3eOGw9EW(KAW6S<_Bny)pgx2iL4RcCtmo~h~jcCHUh3z+$xmb&`6
z2QzTEI)%CkIV{<}^D~nP8<U^n_V+)THZa!vuyOMS1bO;821UjP`-cWOyT<$aySN53
zaB&K8FmYS3a3AA<GNfRP26m9h1t#vBtWZW8jKKhAJYeL0#tf1IGG@XU4NOAba{Rmj
zj_$4@j!r%xD|m&rzx~6+y_2mugOR&dZ2P~h%*-tHt}dP~3eNd?X_@JzMTsSu`FZMg
zT%0x@`9+yk`FSOYIl;+Asi}FvnN_KF<~I6R#ewR>Qj1D5lTlO~n%L-L5$3YdcQ48>
zEwJOV0n+uQ1qzudw(2gaC5f3isVNE}nYo#H=|DFq00CBK`1;zJSzvbwPzs_C(_WyI
hp@{*8i~NE9g6l$f4y%5H3Im`4_!Vt`y_1<!830RNvLyfj

delta 416
zcmeC!&HrU5KbK3eOURcy%nVE)CUQwL^`B`}Z&hd9s?PNAJyYY8?OY$27BKTWZgTZ=
z4`$$SbqaM8^53w1=VvApHYQ)a?eBjwZD6eT7FOa72=erG42p~o_74qmc8&M-cX177
z;8GCcVB&6I;(ovgWn_RE3e4OQOdyd1%-k|y1_LYi1sKDE1ti75!p*=8)&*k#)j&i7
zV2m&@qaLW*fsMNbtQw>UtiOSs8)6WUu>mH+zzQ~+11iP9!QB9{jDwqj4J^e4li~uJ
z2^CoY(Z$8hzyWp;4>t!pl##$G#9<5cA`euqfR`JpnjdBmKg=M0ZjfrA&-l3uzy>i0
g02$l4|1inzWNQdw<dzcMuD_L;nPvObUCf`A0HC--lmGw#

diff --git a/beryllium/ebbgpanelcfg.asl b/beryllium/ebbgpanelcfg.asl
index e78d001..4aff540 100644
--- a/beryllium/ebbgpanelcfg.asl
+++ b/beryllium/ebbgpanelcfg.asl
@@ -22,6 +22,15 @@ Name (PCFA, Buffer(){"
 	<InvertHsyncPolarity>False</InvertHsyncPolarity>
 	<BorderColor>0x0</BorderColor>
 </Group>
+<Group id='EDID Configuration'>
+	<HorizontalScreenSize>7</HorizontalScreenSize>
+	<VerticalScreenSize>14</VerticalScreenSize>
+</Group>
+<Group id='Detailed Timing'>
+    <HorizontalScreenSizeMM>68</HorizontalScreenSizeMM>
+    <VerticalScreenSizeMM>140</VerticalScreenSizeMM>
+    <HorizontalVerticalScreenSizeMM>0x00</HorizontalVerticalScreenSizeMM>
+</Group>
 <Group id='Display Interface'>
 	<InterfaceType>8</InterfaceType>
 	<InterfaceColorFormat>3</InterfaceColorFormat>
diff --git a/beryllium/graphics.asl b/beryllium/graphics.asl
index fab30f6..8618868 100644
--- a/beryllium/graphics.asl
+++ b/beryllium/graphics.asl
@@ -748,166 +748,51 @@ Device (GPU0)
                 Package()
                 {
                     "PRIMARY_SOURCE_MODES",
-                    32,                           // Number of Primary source modes
+                    9,                           // Number of Primary source modes
                     Package()
                     {
-                        640,                      // Width
-                        480,                      // Height
+                        1080,                      // Width
+                        2246,                      // Height
                     },
                     Package()
                     {
-                        640,                      // Width
-                        360,                      // Height
+                        1080,                      // Width
+                        2074,                      // Height
                     },
                     Package()
                     {
-                        800,                      // Width
-                        600,                      // Height
+                        1080,                      // Width
+                        1920,                      // Height
                     },
                     Package()
                     {
-                        960,                      // Width
-                        540,                      // Height
+                        720,                      // Width
+                        1497,                      // Height
                     },
                     Package()
                     {
-                        1280,                     // Width
-                        720,                      // Height
+                        720,                      // Width
+                        1382,                      // Height
                     },
                     Package()
                     {
-                        1280,                     // Width
-                        1080,                     // Height
+                        720,                      // Width
+                        1280,                      // Height
                     },
                     Package()
                     {
-                        1024,                     // Width
-                        768,                      // Height
+                        480,                      // Width
+                        998,                      // Height
                     },
                     Package()
                     {
-                        1152,                     // Width
-                        768,                      // Height
+                        480,                      // Width
+                        921,                      // Height
                     },
                     Package()
                     {
-                        1280,                     // Width
-                        768,                      // Height
-                    },
-                    Package()
-                    {
-                        1360,                     // Width
-                        768,                      // Height
-                    },
-                    Package()
-                    {
-                        1366,                     // Width
-                        768,                      // Height
-                    },
-                    Package()
-                    {
-                        1600,                     // Width
-                        900,                      // Height
-                    },
-                    Package()
-                    {
-                        1280,                     // Width
-                        1024,                     // Height
-                    },
-                    Package()
-                    {
-                        1920,                     // Width
-                        1080,                     // Height
-                    },
-                    Package()
-                    {
-                        1920,                     // Width
-                        1200,                     // Height
-                    },
-                    Package()
-                    {
-                        1920,                     // Width
-                        1280,                     // Height
-                    },
-                    Package()
-                    {
-                        2048,                     // Width
-                        1080,                     // Height
-                    },
-                    Package()
-                    {
-                        2048,                     // Width
-                        1152,                     // Height
-                    },
-                    Package()
-                    {
-                        2048,                     // Width
-                        1536,                     // Height
-                    },
-                    Package()
-                    {
-                        2560,                     // Width
-                        1080,                     // Height
-                    },
-                    Package()
-                    {
-                        2560,                     // Width
-                        1600,                     // Height
-                    },
-                    Package()
-                    {
-                        2560,                     // Width
-                        1440,                     // Height
-                    },
-                    Package()
-                    {
-                        2560,                     // Width
-                        2048,                     // Height
-                    },
-                    Package()
-                    {
-                        3200,                     // Width
-                        1800,                     // Height
-                    },
-                    Package()
-                    {
-                        3200,                     // Width
-                        2400,                     // Height
-                    },
-                    Package()
-                    {
-                        3200,                     // Width
-                        2048,                     // Height
-                    },
-                    Package()
-                    {
-                        3440,                     // Width
-                        1440,                     // Height
-                    },
-                    Package()
-                    {
-                        3840,                     // Width
-                        1080,                     // Height
-                    },
-                    Package()
-                    {
-                        3840,                     // Width
-                        1600,                     // Height
-                    },
-                    Package()
-                    {
-                        3840,                     // Width
-                        2400,                     // Height
-                    },
-                    Package()
-                    {
-                        3840,                     // Width
-                        2160,                     // Height
-                    },
-                    Package()
-                    {
-                        4096,                     // Width
-                        2160,                     // Height
+                        480,                      // Width
+                        640,                      // Height
                     },
                 },
             },
diff --git a/beryllium/panel.asl b/beryllium/panel.asl
index 9ca5430..86526ea 100644
--- a/beryllium/panel.asl
+++ b/beryllium/panel.asl
@@ -1 +1,2 @@
-This file should be replaced automatically by panel-tianma.asl or panel-ebbg.asl during the build of edk2-sdm845
+Include("novatek.asl")
+Include("tianmapanelcfg.asl")
diff --git a/beryllium/tianmapanelcfg.asl b/beryllium/tianmapanelcfg.asl
index 3520286..541636f 100644
--- a/beryllium/tianmapanelcfg.asl
+++ b/beryllium/tianmapanelcfg.asl
@@ -22,6 +22,15 @@ Name (PCFA, Buffer(){"
 	<InvertHsyncPolarity>False</InvertHsyncPolarity>
 	<BorderColor>0x0</BorderColor>
 </Group>
+<Group id='EDID Configuration'>
+	<HorizontalScreenSize>7</HorizontalScreenSize>
+	<VerticalScreenSize>14</VerticalScreenSize>
+</Group>
+<Group id='Detailed Timing'>
+    <HorizontalScreenSizeMM>68</HorizontalScreenSizeMM>
+    <VerticalScreenSizeMM>140</VerticalScreenSizeMM>
+    <HorizontalVerticalScreenSizeMM>0x00</HorizontalVerticalScreenSizeMM>
+</Group>
 <Group id='Display Interface'>
 	<InterfaceType>8</InterfaceType>
 	<InterfaceColorFormat>3</InterfaceColorFormat>
-- 
2.45.2