On Wed, May 2, 2018 at 5:01 PM, Alistair Strachan astrachan@google.com wrote:
This adds support for the chromiumos (not AOSP) version of minigbm. Like hisi, the gralloc handle is not the same as the common libdrm handle (just yet), so we do need a separate backend for now.
Tested with a pending change to the 'cuttlefish' android virtual device in AOSP with its custom gralloc switched to minigbm.
Cc: John Stultz john.stultz@linaro.org Cc: Rob Herring rob.herring@linaro.org Cc: Sean Paul seanpaul@google.com Cc: Greg Hartman ghartman@google.com Signed-off-by: Alistair Strachan astrachan@google.com
v2: Removed re-introduction of <external/drm_gralloc>
Android.mk | 7 +-- platformminigbm.cpp | 122 ++++++++++++++++++++++++++++++++++++++++++++ platformminigbm.h | 46 +++++++++++++++++ 3 files changed, 172 insertions(+), 3 deletions(-) create mode 100644 platformminigbm.cpp create mode 100644 platformminigbm.h
diff --git a/Android.mk b/Android.mk index 747bf27..0818a40 100644 --- a/Android.mk +++ b/Android.mk @@ -101,15 +101,16 @@ ifeq ($(TARGET_PRODUCT),hikey960) LOCAL_CPPFLAGS += -DUSE_HISI_IMPORTER LOCAL_SRC_FILES += platformhisi.cpp LOCAL_C_INCLUDES += device/linaro/hikey/gralloc960/ -else -ifeq ($(TARGET_PRODUCT),hikey) +else ifeq ($(TARGET_PRODUCT),hikey) LOCAL_CPPFLAGS += -DUSE_HISI_IMPORTER LOCAL_SRC_FILES += platformhisi.cpp LOCAL_C_INCLUDES += device/linaro/hikey/gralloc/ +else ifeq ($(strip $(BOARD_DRM_HWCOMPOSER_BUFFER_IMPORTER)),minigbm) +LOCAL_SRC_FILES += platformminigbm.cpp +LOCAL_C_INCLUDES += external/minigbm/cros_gralloc/
So, I'm not seeing external/minigbm in the manifest file yet, so I'm not sure much testing of this bit in-particular can be done, but otherwise I don't see anything to object to.
I did apply your entire series here (including the separate cleanups) and did validate it all works ok with HiKey960 (sans Treble - I'm currently rebuilding w/ Treble now so that's ~an hour out).
thanks -john