zenfone9: Build Display Hal from source

Change-Id: I912e76f4777b565db690c49194afedc30fc9f33e
diff --git a/BoardConfig.mk b/BoardConfig.mk
index 4f54857..9622f2b 100755
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -103,7 +103,8 @@
 endif
 
 # Display
-TARGET_USES_HWC2 := true
+SOONG_CONFIG_qtidisplay_displayconfig_enabled := true
+SOONG_CONFIG_qtidisplaycommonsys_displayconfig_enabled := true
 
 # DRM
 TARGET_ENABLE_MEDIADRM_64 := true
diff --git a/device.mk b/device.mk
index 3703cc5..d6cad51 100755
--- a/device.mk
+++ b/device.mk
@@ -33,10 +33,10 @@
 TARGET_KERNEL_DIR ?= device/asus/zenfone9-kernel
 LOCAL_KERNEL := $(TARGET_KERNEL_DIR)/Image
 PRODUCT_COPY_FILES += \
-    $(LOCAL_KERNEL):kernel \
+    $(LOCAL_KERNEL):kernel
 
 # Prebuilt Kernel Headers
-PRODUCT_VENDOR_KERNEL_HEADERS ?= device/asus/zenfone9-kernel/kernel-headers
+TARGET_BOARD_KERNEL_HEADERS ?= device/asus/zenfone9-kernel/kernel-headers
 
 # Overlays
 DEVICE_PACKAGE_OVERLAYS += \
@@ -142,14 +142,13 @@
     libion \
     libtinyxml2
 
-$(call inherit-product, vendor/qcom/opensource/display/config/display-product-vendor.mk)
+-include hardware/qcom-caf/sm8450/display/config/display-board.mk
+-include hardware/qcom-caf/sm8450/display/config/display-product.mk
+
 $(call inherit-product, vendor/qcom/opensource/commonsys/display/config/display-product-commonsys.mk)
 $(call inherit-product, vendor/qcom/opensource/commonsys-intf/display/config/display-interfaces-product.mk)
 $(call inherit-product, vendor/qcom/opensource/commonsys-intf/display/config/display-product-system.mk)
 
-PRODUCT_PACKAGES += \
-    libtinyalsa
-
 # DRM
 PRODUCT_PACKAGES += \
     android.hardware.drm@1.4-service.clearkey
@@ -272,7 +271,6 @@
 # Soong namespaces
 PRODUCT_SOONG_NAMESPACES += \
     $(LOCAL_PATH) \
-    vendor/qcom/opensource/display \
     vendor/qcom/opensource/commonsys/display \
     vendor/qcom/opensource/commonsys-intf/display
 
diff --git a/omni.dependencies b/omni.dependencies
index 6b24f36..f8afeda 100644
--- a/omni.dependencies
+++ b/omni.dependencies
@@ -19,6 +19,12 @@
     "revision": "android-13.0-sm8450"
   },
   {
+    "remote": "github",
+    "repository": "android_hardware_qcom_display",
+    "target_path": "hardware/qcom-caf/sm8450/display",
+    "revision": "android-13.0-sm8450"
+  },
+  {
     "remote": "omnirom",
     "repository": "android_hardware_qcom_wlan",
     "target_path": "hardware/qcom-caf/wlan",
@@ -51,21 +57,15 @@
    },
    {
      "remote": "gitlab",
-     "repository": "android_vendor_qcom_opensource_display",
-     "target_path": "vendor/qcom/opensource/display",
-     "revision": "android-13.0"
-   },
-   {
-     "remote": "gitlab",
      "repository": "android_vendor_qcom_opensource_display-commonsys",
      "target_path": "vendor/qcom/opensource/commonsys/display",
-     "revision": "android-13.0"
+     "revision": "android-12.0"
    },
    {
      "remote": "gitlab",
      "repository": "android_vendor_qcom_opensource_display-commonsys-intf",
      "target_path": "vendor/qcom/opensource/commonsys-intf/display",
-     "revision": "android-13.0"
+     "revision": "android-12.0"
    },
    {
     "remote": "github",
diff --git a/proprietary-files-vendor.txt b/proprietary-files-vendor.txt
index 190265e..1f84297 100644
--- a/proprietary-files-vendor.txt
+++ b/proprietary-files-vendor.txt
@@ -141,9 +141,7 @@
 vendor/bin/hw/vendor.qti.hardware.AGMIPC@1.0-service
 vendor/bin/hw/vendor.qti.hardware.alarm@1.0-service
 vendor/bin/hw/vendor.qti.hardware.capabilityconfigstore@1.0-service
-vendor/bin/hw/vendor.qti.hardware.display.allocator-service
 vendor/bin/hw/vendor.qti.hardware.display.composer-service
-vendor/bin/hw/vendor.qti.hardware.display.demura-service
 vendor/bin/hw/vendor.qti.hardware.eid@1.0-service
 vendor/bin/hw/vendor.qti.hardware.factory@1.0-service
 vendor/bin/hw/vendor.qti.hardware.iop@2.0-service
@@ -179,7 +177,6 @@
 vendor/bin/init.qcom.sdio.sh
 vendor/bin/init.qcom.sensors.sh
 vendor/bin/init.qcom.sh
-vendor/bin/init.qti.display_boot.sh
 vendor/bin/init.qti.ese.strongbox.sh
 vendor/bin/init.qti.kernel.debug-cape.sh
 vendor/bin/init.qti.kernel.debug-diwali.sh
@@ -495,7 +492,6 @@
 vendor/etc/init/init.asus.widevine.rc
 vendor/etc/init/init.goodixfp.rc
 vendor/etc/init/init.qdmastats.rc
-vendor/etc/init/init.qti.display_boot.rc
 vendor/etc/init/init.qti.fm.rc
 vendor/etc/init/init.qti.media.rc
 vendor/etc/init/init.qti.qcv.rc
@@ -546,9 +542,7 @@
 vendor/etc/init/vendor.qti.hardware.AGMIPC@1.0-service.rc
 vendor/etc/init/vendor.qti.hardware.alarm@1.0-service.rc
 vendor/etc/init/vendor.qti.hardware.capabilityconfigstore@1.0-service.rc
-vendor/etc/init/vendor.qti.hardware.display.allocator-service.rc
 vendor/etc/init/vendor.qti.hardware.display.composer-service.rc
-vendor/etc/init/vendor.qti.hardware.display.demura-service.rc
 vendor/etc/init/vendor.qti.hardware.dsp@1.0-service.rc
 vendor/etc/init/vendor.qti.hardware.eid@1.0-service.rc
 vendor/etc/init/vendor.qti.hardware.factory@1.0-service.rc
@@ -1240,7 +1234,6 @@
 vendor/etc/usecaseKvManager.xml
 -vendor/etc/vintf/manifest/android.hardware.gnss-aidl-service-qti.xml
 -vendor/etc/vintf/manifest/android.hardware.gnss@2.1-service-qti.xml
--vendor/etc/vintf/manifest/android.hardware.graphics.mapper-impl-qti-display.xml
 -vendor/etc/vintf/manifest/android.hardware.neuralnetworks-shim-service-qti.xml
 -vendor/etc/vintf/manifest/android.hardware.security.keymint-service-qti.xml
 -vendor/etc/vintf/manifest/android.hardware.sensors@2.1-multihal.xml
@@ -1260,9 +1253,7 @@
 -vendor/etc/vintf/manifest/vendor.pixelworks.hardware.feature.irisfeature-service.xml
 -vendor/etc/vintf/manifest/vendor.qti.diag.hal.service.xml
 -vendor/etc/vintf/manifest/vendor.qti.gnss-service.xml
--vendor/etc/vintf/manifest/vendor.qti.hardware.display.allocator-service.xml
 -vendor/etc/vintf/manifest/vendor.qti.hardware.display.composer-service.xml
--vendor/etc/vintf/manifest/vendor.qti.hardware.display.demura-service.xml
 -vendor/etc/vintf/manifest/vendor.qti.hardware.limits-service.xml
 -vendor/etc/vintf/manifest/vendor.qti.hardware.perf.xml
 -vendor/etc/vintf/manifest/vendor.qti.hardware.power.powermodule.xml
@@ -1922,7 +1913,6 @@
 vendor/lib/hw/android.hardware.gatekeeper@1.0-impl-qti.so
 vendor/lib/hw/android.hardware.gnss-aidl-impl-qti.so
 vendor/lib/hw/android.hardware.gnss@2.1-impl-qti.so
-vendor/lib/hw/android.hardware.graphics.mapper@4.0-impl-qti-display.so
 vendor/lib/hw/android.hardware.renderscript@1.0-impl.so
 vendor/lib/hw/android.hardware.soundtrigger@2.1-impl.so
 vendor/lib/hw/android.hardware.soundtrigger@2.2-impl.so
@@ -1935,7 +1925,6 @@
 vendor/lib/hw/camera.qcom.so
 vendor/lib/hw/com.dsi.ant@1.0-impl.so
 vendor/lib/hw/com.qti.chi.override.so
-vendor/lib/hw/gralloc.default.so
 vendor/lib/hw/local_time.default.so
 vendor/lib/hw/sound_trigger.primary.taro.so
 vendor/lib/hw/vendor.qti.esepowermanager@1.1-impl.so
@@ -2080,15 +2069,12 @@
 vendor/lib/libdiagjni.so
 vendor/lib/libdigital-dimming.so
 vendor/lib/libdisp-aba.so
-vendor/lib/libdisplaydebug.so
 vendor/lib/libdisplayqos.so
 vendor/lib/libdisplayskuutils.so
 vendor/lib/libdpmqmihal.so
 vendor/lib/libdpps.so
-vendor/lib/libdrm.so
 vendor/lib/libdrmfs.so
 vendor/lib/libdrmtime.so
-vendor/lib/libdrmutils.so
 vendor/lib/libdsd2pcm.so
 vendor/lib/libdsi_netctrl.so
 vendor/lib/libdsutils.so
@@ -2101,7 +2087,6 @@
 vendor/lib/libfastcrc.so
 vendor/lib/libfastcvdsp_stub.so
 vendor/lib/libfastcvopt.so
-vendor/lib/libfilefinder.so
 vendor/lib/libfmpal.so
 vendor/lib/libgame_enhance.so
 vendor/lib/libgdtap.so
@@ -2109,10 +2094,7 @@
 vendor/lib/libgnss.so
 vendor/lib/libgnsspps.so
 vendor/lib/libgps.utils.so
-vendor/lib/libgpu_tonemapper.so
 vendor/lib/libgpudataproducer.so
-vendor/lib/libgralloccore.so
-vendor/lib/libgrallocutils.so
 vendor/lib/libgrpc++_unsecure.so
 vendor/lib/libgsl.so
 vendor/lib/libhalide_hexagon_host.so
@@ -2269,7 +2251,6 @@
 vendor/lib/libqdma_file_agent.so
 vendor/lib/libqdp.so
 vendor/lib/libqdpr.so
-vendor/lib/libqdutils.so
 vendor/lib/libqesdk.so
 vendor/lib/libqesdk_manager.so
 vendor/lib/libqisl.so
@@ -2291,7 +2272,6 @@
 vendor/lib/libqrtr.so
 vendor/lib/libqrtrclient.so
 vendor/lib/libqseed3.so
-vendor/lib/libqservice.so
 vendor/lib/libqshcamera.so
 vendor/lib/libqsocket.so
 vendor/lib/libqtbase.so
@@ -2604,26 +2584,6 @@
 vendor/lib/vendor.qti.hardware.data.latency@1.0.so
 vendor/lib/vendor.qti.hardware.data.lce@1.0.so
 vendor/lib/vendor.qti.hardware.data.qmi@1.0.so
-vendor/lib/vendor.qti.hardware.display.allocator@1.0.so
-vendor/lib/vendor.qti.hardware.display.allocator@3.0.so
-vendor/lib/vendor.qti.hardware.display.allocator@4.0.so
-vendor/lib/vendor.qti.hardware.display.composer@1.0.so
-vendor/lib/vendor.qti.hardware.display.composer@2.0.so
-vendor/lib/vendor.qti.hardware.display.config-V1-ndk_platform.so
-vendor/lib/vendor.qti.hardware.display.config-V2-ndk_platform.so
-vendor/lib/vendor.qti.hardware.display.config-V3-ndk_platform.so
-vendor/lib/vendor.qti.hardware.display.config-V4-ndk_platform.so
-vendor/lib/vendor.qti.hardware.display.config-V5-ndk_platform.so
-vendor/lib/vendor.qti.hardware.display.config-V6-ndk_platform.so
-vendor/lib/vendor.qti.hardware.display.demura@2.0.so
-vendor/lib/vendor.qti.hardware.display.mapper@1.0.so
-vendor/lib/vendor.qti.hardware.display.mapper@1.1.so
-vendor/lib/vendor.qti.hardware.display.mapper@2.0.so
-vendor/lib/vendor.qti.hardware.display.mapper@3.0.so
-vendor/lib/vendor.qti.hardware.display.mapper@4.0.so
-vendor/lib/vendor.qti.hardware.display.mapperextensions@1.0.so
-vendor/lib/vendor.qti.hardware.display.mapperextensions@1.1.so
-vendor/lib/vendor.qti.hardware.display.mapperextensions@1.2.so
 vendor/lib/vendor.qti.hardware.dpmservice@1.0.so
 vendor/lib/vendor.qti.hardware.dpmservice@1.1.so
 vendor/lib/vendor.qti.hardware.dsp@1.0.so
@@ -3032,7 +2992,6 @@
 vendor/lib64/hw/android.hardware.gatekeeper@1.0-impl-qti.so
 vendor/lib64/hw/android.hardware.gnss-aidl-impl-qti.so
 vendor/lib64/hw/android.hardware.gnss@2.1-impl-qti.so
-vendor/lib64/hw/android.hardware.graphics.mapper@4.0-impl-qti-display.so
 vendor/lib64/hw/android.hardware.renderscript@1.0-impl.so
 vendor/lib64/hw/android.hardware.soundtrigger@2.2-impl.so
 vendor/lib64/hw/android.hardware.soundtrigger@2.3-impl.so
@@ -3045,7 +3004,6 @@
 vendor/lib64/hw/com.dsi.ant@1.0-impl.so
 vendor/lib64/hw/com.qti.chi.override.so
 vendor/lib64/hw/fingerprint.default.so
-vendor/lib64/hw/gralloc.default.so
 vendor/lib64/hw/local_time.default.so
 vendor/lib64/hw/sound_trigger.primary.taro.so
 vendor/lib64/hw/vendor.qti.esepowermanager@1.1-impl.so
@@ -3213,15 +3171,12 @@
 vendor/lib64/libdigital-dimming.so
 vendor/lib64/libdiracgefwrapper.so
 vendor/lib64/libdisp-aba.so
-vendor/lib64/libdisplaydebug.so
 vendor/lib64/libdisplayqos.so
 vendor/lib64/libdisplayskuutils.so
 vendor/lib64/libdpmqmihal.so
 vendor/lib64/libdpps.so
-vendor/lib64/libdrm.so
 vendor/lib64/libdrmfs.so
 vendor/lib64/libdrmtime.so
-vendor/lib64/libdrmutils.so
 vendor/lib64/libdsd2pcm.so
 vendor/lib64/libdsi_netctrl.so
 vendor/lib64/libdsutils.so
@@ -3238,7 +3193,6 @@
 vendor/lib64/libfastcrc.so
 vendor/lib64/libfastcvdsp_stub.so
 vendor/lib64/libfastcvopt.so
-vendor/lib64/libfilefinder.so
 vendor/lib64/libfmpal.so
 vendor/lib64/libgame_enhance.so
 vendor/lib64/libgarden.so
@@ -3251,10 +3205,7 @@
 vendor/lib64/libgnsspps.so
 vendor/lib64/libgoodixhwfingerprint.so
 vendor/lib64/libgps.utils.so
-vendor/lib64/libgpu_tonemapper.so
 vendor/lib64/libgpudataproducer.so
-vendor/lib64/libgralloccore.so
-vendor/lib64/libgrallocutils.so
 vendor/lib64/libgrpc++_unsecure.so
 vendor/lib64/libgsl.so
 vendor/lib64/libhalide_hexagon_host.so
@@ -3268,7 +3219,6 @@
 vendor/lib64/libhdrdynamic.so
 vendor/lib64/libhdrdynamicootf.so
 vendor/lib64/libhidltransport.so
-vendor/lib64/libhistogram.so
 vendor/lib64/libhme.so
 vendor/lib64/libidl.so
 vendor/lib64/libipanat.so
@@ -3442,7 +3392,6 @@
 vendor/lib64/libqdma_file_agent.so
 vendor/lib64/libqdp.so
 vendor/lib64/libqdpr.so
-vendor/lib64/libqdutils.so
 vendor/lib64/libqesdk.so
 vendor/lib64/libqesdk_manager.so
 vendor/lib64/libqisl.so
@@ -3464,7 +3413,6 @@
 vendor/lib64/libqrtr.so
 vendor/lib64/libqrtrclient.so
 vendor/lib64/libqseed3.so
-vendor/lib64/libqservice.so
 vendor/lib64/libqshcamera.so
 vendor/lib64/libqsocket.so
 vendor/lib64/libqtbase.so
@@ -3736,28 +3684,6 @@
 vendor/lib64/vendor.qti.hardware.data.latency@1.0.so
 vendor/lib64/vendor.qti.hardware.data.lce@1.0.so
 vendor/lib64/vendor.qti.hardware.data.qmi@1.0.so
-vendor/lib64/vendor.qti.hardware.display.allocator@1.0.so
-vendor/lib64/vendor.qti.hardware.display.allocator@3.0.so
-vendor/lib64/vendor.qti.hardware.display.allocator@4.0.so
-vendor/lib64/vendor.qti.hardware.display.composer@1.0.so
-vendor/lib64/vendor.qti.hardware.display.composer@2.0.so
-vendor/lib64/vendor.qti.hardware.display.composer@3.0.so
-vendor/lib64/vendor.qti.hardware.display.composer@3.1.so
-vendor/lib64/vendor.qti.hardware.display.config-V1-ndk_platform.so
-vendor/lib64/vendor.qti.hardware.display.config-V2-ndk_platform.so
-vendor/lib64/vendor.qti.hardware.display.config-V3-ndk_platform.so
-vendor/lib64/vendor.qti.hardware.display.config-V4-ndk_platform.so
-vendor/lib64/vendor.qti.hardware.display.config-V5-ndk_platform.so
-vendor/lib64/vendor.qti.hardware.display.config-V6-ndk_platform.so
-vendor/lib64/vendor.qti.hardware.display.demura@2.0.so
-vendor/lib64/vendor.qti.hardware.display.mapper@1.0.so
-vendor/lib64/vendor.qti.hardware.display.mapper@1.1.so
-vendor/lib64/vendor.qti.hardware.display.mapper@2.0.so
-vendor/lib64/vendor.qti.hardware.display.mapper@3.0.so
-vendor/lib64/vendor.qti.hardware.display.mapper@4.0.so
-vendor/lib64/vendor.qti.hardware.display.mapperextensions@1.0.so
-vendor/lib64/vendor.qti.hardware.display.mapperextensions@1.1.so
-vendor/lib64/vendor.qti.hardware.display.mapperextensions@1.2.so
 vendor/lib64/vendor.qti.hardware.dpmservice@1.0.so
 vendor/lib64/vendor.qti.hardware.dpmservice@1.1.so
 vendor/lib64/vendor.qti.hardware.dsp@1.0.so
diff --git a/regen-vendor.sh b/regen-vendor.sh
index 455bbe6..67c9ae2 100755
--- a/regen-vendor.sh
+++ b/regen-vendor.sh
@@ -510,6 +510,76 @@
     "lib64/vendor.display.config@1.9.so"
     "lib64/vendor.display.config@2.0.so"
     "lib64/libQnnGpu.so"
+    "lib/hw/android.hardware.graphics.mapper@4.0-impl-qti-display.so"
+    "lib64/hw/android.hardware.graphics.mapper@4.0-impl-qti-display.so"
+    "lib/vendor.qti.hardware.display.allocator@1.0.so"
+    "lib/vendor.qti.hardware.display.allocator@3.0.so"
+    "lib/vendor.qti.hardware.display.allocator@4.0.so"
+    "lib/vendor.qti.hardware.display.composer@1.0.so"
+    "lib/vendor.qti.hardware.display.composer@2.0.so"
+    "lib/vendor.qti.hardware.display.config-V1-ndk_platform.so"
+    "lib/vendor.qti.hardware.display.config-V2-ndk_platform.so"
+    "lib/vendor.qti.hardware.display.config-V3-ndk_platform.so"
+    "lib/vendor.qti.hardware.display.config-V4-ndk_platform.so"
+    "lib/vendor.qti.hardware.display.config-V5-ndk_platform.so"
+    "lib/vendor.qti.hardware.display.config-V6-ndk_platform.so"
+    "lib/vendor.qti.hardware.display.demura@2.0.so"
+    "lib/vendor.qti.hardware.display.mapper@1.0.so"
+    "lib/vendor.qti.hardware.display.mapper@1.1.so"
+    "lib/vendor.qti.hardware.display.mapper@2.0.so"
+    "lib/vendor.qti.hardware.display.mapper@3.0.so"
+    "lib/vendor.qti.hardware.display.mapper@4.0.so"
+    "lib/vendor.qti.hardware.display.mapperextensions@1.0.so"
+    "lib/vendor.qti.hardware.display.mapperextensions@1.1.so"
+    "lib/vendor.qti.hardware.display.mapperextensions@1.2.so"
+    "lib64/vendor.qti.hardware.display.allocator@1.0.so"
+    "lib64/vendor.qti.hardware.display.allocator@3.0.so"
+    "lib64/vendor.qti.hardware.display.allocator@4.0.so"
+    "lib64/vendor.qti.hardware.display.composer@1.0.so"
+    "lib64/vendor.qti.hardware.display.composer@2.0.so"
+    "lib64/vendor.qti.hardware.display.config-V1-ndk_platform.so"
+    "lib64/vendor.qti.hardware.display.config-V2-ndk_platform.so"
+    "lib64/vendor.qti.hardware.display.config-V3-ndk_platform.so"
+    "lib64/vendor.qti.hardware.display.config-V4-ndk_platform.so"
+    "lib64/vendor.qti.hardware.display.config-V5-ndk_platform.so"
+    "lib64/vendor.qti.hardware.display.config-V6-ndk_platform.so"
+    "lib64/vendor.qti.hardware.display.demura@2.0.so"
+    "lib64/vendor.qti.hardware.display.mapper@1.0.so"
+    "lib64/vendor.qti.hardware.display.mapper@1.1.so"
+    "lib64/vendor.qti.hardware.display.mapper@2.0.so"
+    "lib64/vendor.qti.hardware.display.mapper@3.0.so"
+    "lib64/vendor.qti.hardware.display.mapper@4.0.so"
+    "lib64/vendor.qti.hardware.display.mapperextensions@1.0.so"
+    "lib64/vendor.qti.hardware.display.mapperextensions@1.1.so"
+    "lib64/vendor.qti.hardware.display.mapperextensions@1.2.so"
+    "bin/hw/vendor.qti.hardware.display.allocator-service"
+    "bin/hw/vendor.qti.hardware.display.demura-service"
+    "etc/init/vendor.qti.hardware.display.allocator-service.rc"
+    "etc/init/vendor.qti.hardware.display.demura-service.rc"
+    "etc/vintf/manifest/android.hardware.graphics.mapper-impl-qti-display.xml"
+    "etc/vintf/manifest/vendor.qti.hardware.display.allocator-service.xml"
+    "etc/vintf/manifest/vendor.qti.hardware.display.demura-service.xml"
+    "bin/init.qti.display_boot.sh"
+    "etc/init/init.qti.display_boot.rc"
+    "lib/hw/gralloc.default.so"
+    "lib64/hw/gralloc.default.so"
+    "lib/libgralloccore.so"
+    "lib/libgrallocutils.so"
+    "lib64/libgralloccore.so"
+    "lib64/libgrallocutils.so"
+    "lib/libqdutils.so"
+    "lib64/libqdutils.so"
+    "lib/libdrm.so"
+    "lib/libdrmutils.so"
+    "lib64/libdrm.so"
+    "lib64/libdrmutils.so"
+    "lib/libgpu_tonemapper.so"
+    "lib64/libgpu_tonemapper.so"
+    "lib64/libhistogram.so"
+    "lib/libqservice.so"
+    "lib64/libqservice.so"
+    "lib/libfilefinder.so"
+    "lib64/libfilefinder.so"
 
     # fstab
     "etc/fstab.qcom"
@@ -951,7 +1021,6 @@
 as_module "etc/vintf/manifest/vendor.qti.diag.hal.service.xml"
 as_module "etc/vintf/manifest/vendor.qti.hardware.servicetracker@1.2-service.xml"
 as_module "etc/vintf/manifest/android.hardware.gnss-aidl-service-qti.xml"
-as_module "etc/vintf/manifest/android.hardware.graphics.mapper-impl-qti-display.xml"
 as_module "etc/vintf/manifest/android.hardware.neuralnetworks-shim-service-qti.xml"
 as_module "etc/vintf/manifest/android.hardware.security.keymint-service-qti.xml"
 as_module "etc/vintf/manifest/android.hardware.sensors@2.1-multihal.xml"
@@ -968,9 +1037,7 @@
 as_module "etc/vintf/manifest/ozonotify-1.0.xml"
 as_module "etc/vintf/manifest/qtiradio-saidl.xml"
 as_module "etc/vintf/manifest/vendor.qti.gnss-service.xml"
-as_module "etc/vintf/manifest/vendor.qti.hardware.display.allocator-service.xml"
 as_module "etc/vintf/manifest/vendor.qti.hardware.display.composer-service.xml"
-as_module "etc/vintf/manifest/vendor.qti.hardware.display.demura-service.xml"
 as_module "etc/vintf/manifest/vendor.qti.hardware.limits-service.xml"
 as_module "etc/vintf/manifest/vendor.qti.hardware.perf.xml"
 as_module "etc/vintf/manifest/vendor.qti.hardware.power.powermodule.xml"
diff --git a/vendor.prop b/vendor.prop
index f78cdc1..6934bdb 100644
--- a/vendor.prop
+++ b/vendor.prop
@@ -1,14 +1,3 @@
-ro.surface_flinger.has_wide_color_display=true
-ro.surface_flinger.has_HDR_display=true
-ro.surface_flinger.use_color_management=true
-ro.surface_flinger.wcg_composition_dataspace=143261696
-ro.surface_flinger.protected_contents=true
-ro.surface_flinger.use_content_detection_for_refresh_rate=true
-ro.surface_flinger.set_touch_timer_ms=1500
-ro.surface_flinger.force_hwc_copy_for_virtual_displays=true
-ro.surface_flinger.max_frame_buffer_acquired_buffers=3
-ro.surface_flinger.max_virtual_display_dimension=4096
-ro.surface_flinger.supports_background_blur=0
 ####################################
 # from variable PRODUCT_PROPERTY_OVERRIDES
 ####################################
@@ -186,42 +175,6 @@
 ro.vendor.bluetooth.csip_qti=true
 ro.camera.enableCamera1MaxZsl=1
 drm.service.enabled=true
-persist.sys.sf.color_mode=0
-persist.demo.hdmirotationlock=false
-persist.sys.sf.color_saturation=1.0
-debug.sf.hw=0
-debug.egl.hw=0
-debug.sf.latch_unsignaled=1
-debug.sf.high_fps_late_app_phase_offset_ns=1000000
-debug.mdpcomp.logs=0
-vendor.gralloc.disable_ubwc=0
-vendor.display.disable_scaler=0
-vendor.display.disable_excl_rect=0
-vendor.display.disable_excl_rect_partial_fb=1
-vendor.display.comp_mask=0
-vendor.display.enable_optimize_refresh=0
-vendor.display.use_smooth_motion=1
-vendor.display.disable_stc_dimming=1
-vendor.display.enable_dpps_dynamic_fps=1
-debug.sf.high_fps_late_sf_phase_offset_ns=-2000000
-debug.sf.high_fps_early_phase_offset_ns=-4000000
-debug.sf.high_fps_early_gl_phase_offset_ns=-2000000
-debug.sf.disable_client_composition_cache=1
-debug.sf.enable_gl_backpressure=1
-debug.sf.enable_hwc_vds=1
-debug.sf.enable_advanced_sf_phase_offset=1
-vendor.display.vds_allow_hwc=0
-vendor.display.enable_async_vds_creation=1
-vendor.display.enable_rounded_corner=1
-vendor.display.disable_3d_adaptive_tm=1
-vendor.display.disable_sdr_dimming=1
-vendor.display.enable_rc_support=1
-vendor.display.disable_sdr_histogram=1
-vendor.display.enable_hdr10_gpu_target=1
-vendor.display.disable_offline_rotator=1
-vendor.display.enable_async_powermode=0
-vendor.display.disable_hw_recovery_dump=1
-vendor.display.enable_early_wakeup=1
 persist.vendor.dpm.vndr.idletimer.mode=default
 persist.vendor.dpm.vndr.halservice.enable=1
 persist.vendor.dpm.vndr.feature=11