From 73c963fb24d11c3154bcbd1c200c0077f4fd02a3 Mon Sep 17 00:00:00 2001
From: Vara Prasad A V S G <vavsg@codeaurora.org>
Date: Tue, 28 Mar 2017 10:44:56 +0530
Subject: [PATCH] sdm660_64: Enable HWC2, Enable gralloc1, Add graphics HALs.

Add allocator, mapper and composer HALs.
This relies on TARGET_USES_HWC2 and TARGET_USES_GRALLOC1 being
enabled.

Change-Id: I913f4d8fa719261abf52becf7d24fef433f7f1d5
---
 BoardConfig.mk |  4 ++++
 sdm660_64.mk   | 14 ++++++++++++++
 vintf.xml      | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 66 insertions(+)
 create mode 100644 vintf.xml

diff --git a/BoardConfig.mk b/BoardConfig.mk
index 7583cf37..e44710f0 100755
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -72,6 +72,10 @@ TARGET_USES_ION := true
 TARGET_USES_NEW_ION_API :=true
 #TARGET_USES_QCOM_BSP :=true
 
+#Gralloc h/w specif flags
+TARGET_USES_HWC2 := true
+TARGET_USES_GRALLOC1 := true
+
 ifeq ($(BOARD_KERNEL_CMDLINE),)
 ifeq ($(TARGET_KERNEL_VERSION),4.4)
      BOARD_KERNEL_CMDLINE += console=ttyMSM0,115200,n8 androidboot.console=ttyMSM0 earlycon=msm_serial_dm,0xc170000
diff --git a/sdm660_64.mk b/sdm660_64.mk
index e1006e3b..30134f2b 100755
--- a/sdm660_64.mk
+++ b/sdm660_64.mk
@@ -75,6 +75,10 @@ ifeq ($(strip $(BOARD_HAVE_QCOM_FM)),true)
 PRODUCT_BOOT_JARS += qcom.fmradio
 endif #BOARD_HAVE_QCOM_FM
 
+# add vendor manifest file
+PRODUCT_COPY_FILES += \
+    device/qcom/sdm660_64/vintf.xml:$(TARGET_COPY_OUT_VENDOR)/manifest.xml
+
 # Audio configuration file
 -include $(TOPDIR)hardware/qcom/audio/configs/sdm660/sdm660.mk
 
@@ -103,6 +107,16 @@ PRODUCT_PACKAGES += \
     antradio_app \
     libvolumelistener
 
+# Gralloc
+PRODUCT_PACKAGES += \
+    android.hardware.graphics.allocator@2.0-impl \
+    android.hardware.graphics.allocator@2.0-service \
+    android.hardware.graphics.mapper@2.0-impl
+
+# HW Composer
+PRODUCT_PACKAGES += \
+    android.hardware.graphics.composer@2.1-impl \
+    android.hardware.graphics.composer@2.1-service
 
 # Sensor features
 PRODUCT_COPY_FILES += \
diff --git a/vintf.xml b/vintf.xml
new file mode 100644
index 00000000..1c6f18bf
--- /dev/null
+++ b/vintf.xml
@@ -0,0 +1,48 @@
+<!-- Copyright (c) 2017, 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.
+-->
+<manifest version="1.0">
+    <!-- /graphics hal -->
+    <hal format="hidl">
+        <name>android.hardware.graphics.allocator</name>
+        <transport>toggled</transport>
+        <impl level="generic"></impl>
+        <version>2.0</version>
+    </hal>
+    <hal format="hidl">
+        <name>android.hardware.graphics.mapper</name>
+        <transport>passthrough</transport>
+        <impl level="generic"></impl>
+        <version>2.0</version>
+    </hal>
+    <hal format="hidl">
+        <name>android.hardware.graphics.composer</name>
+        <transport>toggled</transport>
+        <impl level="generic"></impl>
+        <version>2.1</version>
+    </hal>
+</manifest>