DSS Bring Up 3

Signed-off-by: Rishabh Garg <rishabh@ti.com>

diff --git a/examples/dss_display_test/dss_display_test.c b/examples/dss_display_test/dss_display_test.c
index 023cb31ca4c284ff60bf610af49b65fe7903f6eb..6cc4b12657326f77a17c9fc65ac8d88a6ab85bfe 100755 (executable)
--- a/examples/dss_display_test/dss_display_test.c
+++ b/examples/dss_display_test/dss_display_test.c
@@ -65,7 +65,7 @@
 #define TEST_OVERLAY_ID                 (CSL_DSS_OVERLAY_ID_4)
 #define TEST_DCTRL_OVERLAY_NODE_ID      (DSS_DCTRL_NODE_OVERLAY4)
 #define TEST_DCTRL_VP_NODE_ID           (DSS_DCTRL_NODE_VP4)
-#define TEST_DCTRL_OUT_NODE_ID          (DSS_DCTRL_NODE_DPI1)
+#define TEST_DCTRL_OUT_NODE_ID          (DSS_DCTRL_NODE_DPI0)
 #else
 #define TEST_VP_ID                      (CSL_DSS_VP_ID_2)
 #define TEST_OVERLAY_ID                 (CSL_DSS_OVERLAY_ID_2)

diff --git a/examples/dss_display_test/dss_display_test.h b/examples/dss_display_test/dss_display_test.h
index 360683ceacf03c2c8d0b9d24a0faf349a95a9d15..f00c7445276423362ab765a9162fb292a9290e74 100755 (executable)
--- a/examples/dss_display_test/dss_display_test.h
+++ b/examples/dss_display_test/dss_display_test.h
@@ -59,9 +59,13 @@ extern "C" {
 #define DISP_APP_RUN_COUNT              (1000U)
 #endif
 
+#if defined (SOC_AM65XX)
 #define DISP_APP_LCD_WIDTH              (1280U)
 #define DISP_APP_LCD_HEIGHT             (800U)
-
+#else
+#define DISP_APP_LCD_WIDTH              (1920U)
+#define DISP_APP_LCD_HEIGHT             (1080U)
+#endif
 /* Worst case frames per handle */
 #define DISP_APP_MAX_FRAMES_PER_HANDLE    (2U)
 
@@ -275,11 +279,11 @@ static const DispApp_TestParams gDispAppTestParams=
     },
     /* Output buffer width */
     {
-        1280U
+        DISP_APP_LCD_WIDTH
     },
     /* Output buffer height */
     {
-        800U
+        DISP_APP_LCD_HEIGHT
     },
     /* Scaler enable */
     {
@@ -357,11 +361,11 @@ static const DispApp_TestParams gDispAppTestParams=
     },
     /* Output buffer width */
     {
-        1280U
+        DISP_APP_LCD_WIDTH
     },
     /* Output buffer height */
     {
-        800U
+        DISP_APP_LCD_HEIGHT
     },
     /* Scaler enable */
     {
@@ -439,11 +443,11 @@ static const DispApp_TestParams gDispAppTestParams=
     },
     /* Output buffer width */
     {
-        1280U
+        DISP_APP_LCD_WIDTH
     },
     /* Output buffer height */
     {
-        800U
+        DISP_APP_LCD_HEIGHT
     },
     /* Scaler enable */
     {
@@ -521,11 +525,11 @@ static const DispApp_TestParams gDispAppTestParams=
     },
     /* Output buffer width */
     {
-        1280U
+        DISP_APP_LCD_WIDTH
     },
     /* Output buffer height */
     {
-        800U
+        DISP_APP_LCD_HEIGHT
     },
     /* Scaler enable */
     {
@@ -603,11 +607,11 @@ static const DispApp_TestParams gDispAppTestParams=
     },
     /* Output buffer width */
     {
-        1280U
+        DISP_APP_LCD_WIDTH
     },
     /* Output buffer height */
     {
-        800U
+        DISP_APP_LCD_HEIGHT
     },
     /* Scaler enable */
     {
@@ -685,11 +689,11 @@ static const DispApp_TestParams gDispAppTestParams=
     },
     /* Output buffer width */
     {
-        1280U
+        DISP_APP_LCD_WIDTH
     },
     /* Output buffer height */
     {
-        800U
+        DISP_APP_LCD_HEIGHT
     },
     /* Scaler enable */
     {
@@ -745,7 +749,7 @@ static const DispApp_TestParams gDispAppTestParams=
     },
     /* Data format */
     {
-        FVID2_DF_RGB24_888
+        FVID2_DF_BGR24_888
     },
     /* Input buffer width */
     {
@@ -767,11 +771,11 @@ static const DispApp_TestParams gDispAppTestParams=
     },
     /* Output buffer width */
     {
-        1280U
+        DISP_APP_LCD_WIDTH
     },
     /* Output buffer height */
     {
-        800U
+        DISP_APP_LCD_HEIGHT
     },
     /* Scaler enable */
     {
@@ -849,11 +853,11 @@ static const DispApp_TestParams gDispAppTestParams=
     },
     /* Output buffer width */
     {
-        1280U
+        DISP_APP_LCD_WIDTH
     },
     /* Output buffer height */
     {
-        800U
+        DISP_APP_LCD_HEIGHT
     },
     /* Scaler enable */
     {
@@ -913,16 +917,16 @@ static const DispApp_TestParams gDispAppTestParams=
     },
     /* Input buffer width */
     {
-        480U
+        1920U
     },
     /* Input buffer height */
     {
-        360U
+        1080U
     },
     /* Pitch */
     {
         {
-            480U*4U, 0U, 0U, 0U, 0U, 0U
+            1920U*4U, 0U, 0U, 0U, 0U, 0U
         }
     },
     /* Scan format */
@@ -931,11 +935,11 @@ static const DispApp_TestParams gDispAppTestParams=
     },
     /* Output buffer width */
     {
-        1280U
+        DISP_APP_LCD_WIDTH
     },
     /* Output buffer height */
     {
-        800U
+        DISP_APP_LCD_HEIGHT
     },
     /* Scaler enable */
     {
@@ -1047,6 +1051,7 @@ static const DispApp_TestParams gDispAppTestParams=
         FALSE,
         FALSE
     },
+#if defined (SOC_AM65XX)
     /* X Position */
     {
         0U,
@@ -1057,6 +1062,18 @@ static const DispApp_TestParams gDispAppTestParams=
         0U,
         440U
     },
+#else
+    /* X Position */
+    {
+        0U,
+        1440U
+    },
+    /* Y position */
+    {
+        0U,
+        720U
+    },
+#endif
     /* Invalid Pipe Id */
     {
         CSL_DSS_VID_PIPE_ID_VID1,