commit 665da3f812d7849e32e7e69850790ddc68e8ba41
author Kevin Brodsky <kevin.brodsky@arm.com> Tue Feb 15 13:47:20 2022 +0000
committer Kevin Brodsky <kevin.brodsky@arm.com> Wed Feb 23 18:01:13 2022 +0000
tree 2485e95278fb68b2ef793cc2b951403b90fb78e5
parent 8fccaaa326b7c07ec159ebad147cf935f1f7ddc3

fvp: Downgrade hwcomposer to 2.1

With hwcomposer 2.4, booting the fvp target on FVP results in a
crash caused by:

  E HWC2OnFbAdapter: unknown function descriptor 44
  E HWC2OnFbAdapter: unknown function descriptor 45
  E HWC2OnFbAdapter: unknown function descriptor 46
  E HWC2OnFbAdapter: unknown function descriptor 47
  E HWC2OnFbAdapter: unknown function descriptor 48
  E HWC2OnFbAdapter: unknown function descriptor 49
  E HWC2OnFbAdapter: unknown function descriptor 50
  E HWC2OnFbAdapter: unknown function descriptor 51
  E HWC2OnFbAdapter: unknown function descriptor 52
  E HWC2OnFbAdapter: unknown function descriptor 54
  E android.hardware.graphics.composer@2.4-service: failed to get hwcomposer2 function 54

Reverting to 2.1 allows the boot to progress further and complete.

Test: boot fvp-eng
Change-Id: Ie2584af9ae8c043c9df3b88b48cdccdc023f5063

fvp.mk

diff --git a/fvp.mk b/fvp.mk
index 139f326..ebbee40 100644
--- a/fvp.mk
+++ b/fvp.mk
@@ -56,7 +56,7 @@
     android.hardware.gatekeeper@1.0-service.software \
     android.hardware.graphics.allocator@2.0-service \
     android.hardware.graphics.allocator@2.0-impl \
-    android.hardware.graphics.composer@2.4-service \
+    android.hardware.graphics.composer@2.1-service \
     android.hardware.graphics.mapper@2.0-impl \
     android.hardware.health@2.0-service \
     android.hardware.neuralnetworks@1.3-service-sample-all \