Merge tag 'LA.UM.10.6.2.r1-02500-89xx.0' into int/13/fp3

"LA.UM.10.6.2.r1-02500-89xx.0"

* tag 'LA.UM.10.6.2.r1-02500-89xx.0':
  display: Add fsc order format support in display HAL

Change-Id: I4db828806957373382a303ee453d57192ab2a605
diff --git a/display/config/1.17/IDisplayConfig.hal b/display/config/1.17/IDisplayConfig.hal
new file mode 100644
index 0000000..861a57f
--- /dev/null
+++ b/display/config/1.17/IDisplayConfig.hal
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2021 The Linux Foundation. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above
+ *      copyright notice, this list of conditions and the following
+ *      disclaimer in the documentation and/or other materials provided
+ *      with the distribution.
+ *    * Neither the name of The Linux Foundation. nor the names of its
+ *      contributors may be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package vendor.display.config@1.17;
+
+import @1.16::IDisplayConfig;
+import @1.0::IDisplayConfig;
+
+interface IDisplayConfig extends @1.16::IDisplayConfig {
+    enum RGBOrder : int32_t {
+      FSC_UNKNOWN = 0,
+      FSC_RGB = 1,
+      FSC_RBG = 2,
+      FSC_BGR = 3,
+      FSC_BRG = 4,
+      FSC_GBR = 5,
+      FSC_GRB = 6,
+    };
+
+    /*
+     * getFSCRGBOrder on client start
+     *
+     * @return error is NONE upon success.
+     */
+    @callflow(next="*")
+    getFSCRGBOrder(DisplayType dpy) generates (int32_t error,
+                                               RGBOrder fsc_rgb_color_order);
+};
diff --git a/display/current.txt b/display/current.txt
index c7b3085..acad9ff 100644
--- a/display/current.txt
+++ b/display/current.txt
@@ -65,6 +65,7 @@
 5862c0c085c9e0b6d8b8a11e4a9765a6a9250874d7c1a9b0f6b566598da31593 vendor.display.config@2.0::IDisplayConfig
 14fcf170f04a9878bf085b2aa4d75ef5e3d241926bef18e58d6d254e000ff689 vendor.display.config@2.0::IDisplayConfigCallback
 ada1c82f1ba85c9f403c4b91d24ebc6dfc2e796a7727bcca23f4e2ea68800f35 vendor.display.config@1.16::IDisplayConfig
+f0e4b206e3357cff0399f4a696dd57bb385d68d2c13865ea7bb5180eca06cd61 vendor.display.config@1.17::IDisplayConfig
 
 #HAL released in Android R
 7f8c47a47524e1ac21646578c7545fffdc08cec60df37d28ce8796b6461ef0c2 vendor.qti.hardware.display.composer@3.0::IQtiComposer