commit af0d975665ca68a3396854cd20b18e59002c2ec5
author Rob Herring <robh@kernel.org> Fri May 04 16:34:19 2018 -0500
committer Sean Paul <seanpaul@chromium.org> Wed May 30 13:31:41 2018 -0400
tree 00ae40a700f5428d02186c4ec9b0fe9a648c8b17
parent 33fb7b9182005be06d33d40222c445d7781446cf

drm_hwcomposer: Remove GL compositing support

The GL based compositing adds alot of complexity and was only ever well
tested on closed stacks. It also only supports GLES3.x and still relies
on sw_sync timeline which is now a debugfs feature. Those are just the
known issues.

Removing the GL compositor means everything related to squashing layers
and pre-compositing can be removed. The planner is left as it may be
useful when adding back support for overlay planes. With this change,
only a single plane is supported until ValidateDisplay learns to do
atomic modesetting test for overlay planes.

Tested-by: John Stultz <john.stultz@linaro.org>
Signed-off-by: Rob Herring <robh@kernel.org>

platformhisi.cpp

diff --git a/platformhisi.cpp b/platformhisi.cpp
index 3f5c319..f8b4412 100644
--- a/platformhisi.cpp
+++ b/platformhisi.cpp
@@ -69,29 +69,9 @@
   return 0;
 }
 
-EGLImageKHR HisiImporter::ImportImage(EGLDisplay egl_display, buffer_handle_t handle) {
-  private_handle_t const *hnd = reinterpret_cast < private_handle_t const *>(handle);
-  if (!hnd)
-    return NULL;
-
-  EGLint fmt = ConvertHalFormatToDrm(hnd->req_format);
-  if (fmt < 0)
-	return NULL;
-
-  EGLint attr[] = {
-    EGL_WIDTH, hnd->width,
-    EGL_HEIGHT, hnd->height,
-    EGL_LINUX_DRM_FOURCC_EXT, fmt,
-    EGL_DMA_BUF_PLANE0_FD_EXT, hnd->share_fd,
-    EGL_DMA_BUF_PLANE0_OFFSET_EXT, 0,
-    EGL_DMA_BUF_PLANE0_PITCH_EXT, hnd->byte_stride,
-    EGL_NONE,
-  };
-  return eglCreateImageKHR(egl_display, EGL_NO_CONTEXT, EGL_LINUX_DMA_BUF_EXT, NULL, attr);
-}
-
 int HisiImporter::ImportBuffer(buffer_handle_t handle, hwc_drm_bo_t *bo) {
-  private_handle_t const *hnd = reinterpret_cast < private_handle_t const *>(handle);
+  private_handle_t const *hnd =
+      reinterpret_cast<private_handle_t const *>(handle);
   if (!hnd)
     return -EINVAL;
 
@@ -102,7 +82,7 @@
     return ret;
   }
 
-  EGLint fmt = ConvertHalFormatToDrm(hnd->req_format);
+  int32_t fmt = ConvertHalFormatToDrm(hnd->req_format);
   if (fmt < 0)
 	return fmt;
 
@@ -131,5 +111,3 @@
   return planner;
 }
 }
-
-