From 3fba3e61e5b66c7084ae08e90a53b08e2d6b0342 Mon Sep 17 00:00:00 2001
From: Konsta <konsta09@gmail.com>
Date: Tue, 3 Sep 2024 20:15:34 +0300
Subject: [PATCH] graphics: switch to hwc3

* Support for HWC3 was implemented in upstream drm_hwcomposer.
---
 device.mk    | 3 +--
 manifest.xml | 9 ---------
 vendor.prop  | 1 -
 3 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/device.mk b/device.mk
index c3badcf..3ea9b58 100644
--- a/device.mk
+++ b/device.mk
@@ -173,8 +173,7 @@ PRODUCT_PACKAGES += \
     libgbm_mesa_wrapper
 
 PRODUCT_PACKAGES += \
-    android.hardware.graphics.composer@2.4-service \
-    hwcomposer.drm
+    android.hardware.composer.hwc3-service.drm
 
 PRODUCT_PACKAGES += \
     libEGL_mesa \
diff --git a/manifest.xml b/manifest.xml
index def221e..39e0b86 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -34,15 +34,6 @@
             <instance>legacy/0</instance>
         </interface>
     </hal>
-    <hal format="hidl">
-        <name>android.hardware.graphics.composer</name>
-        <transport>hwbinder</transport>
-        <version>2.4</version>
-        <interface>
-            <name>IComposer</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <hal format="hidl">
         <name>android.hardware.tv.cec</name>
         <transport>hwbinder</transport>
diff --git a/vendor.prop b/vendor.prop
index 93b2d94..862d349 100644
--- a/vendor.prop
+++ b/vendor.prop
@@ -51,7 +51,6 @@ persist.ffmpeg_codec2.v4l2.h265=true
 
 # Graphics
 ro.hardware.egl=mesa
-ro.hardware.hwcomposer=drm
 ro.hardware.vulkan=broadcom
 ro.opengles.version=196609
 vendor.hwc.drm.ctm=DRM_OR_IGNORE