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.

diff --git a/beryllium/DSDT.AML b/beryllium/DSDT.AML
index 8a6283ad49ceb9922826224e9240a7f21d0dee40..320e454ff119415715d6205e23e4fd55e087435e 100644 (file)
Binary files a/beryllium/DSDT.AML and b/beryllium/DSDT.AML differ

diff --git a/beryllium/ebbgpanelcfg.asl b/beryllium/ebbgpanelcfg.asl
index e78d0019ce18669663ba06cfd730e186354a4991..4aff540e338f30da9a203b254c0335f6d08ec9d8 100644 (file)
--- 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 fab30f6410215b7f99a6500c1f17ec9261aeb5b2..861886841b3e2e66a2ec006e8c72f3b58c8a2aa0 100644 (file)
--- 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 9ca54306ca30411784391feac94ec9683140b152..86526eaba9f5217030d97342cb4d4029ecbd71e4 100644 (file)
--- 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 3520286b1677a64b8040bfa9a95e23d6fd5e71b2..541636f809ffcbe2f08566204f033d0fedc63471 100644 (file)
--- 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>