commit 6d59b2091a2ee207df2109ee89dd900e6e8c2432
author Adrian Salido <salidoa@google.com> Mon Oct 03 19:31:54 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon Oct 03 19:31:54 2016 +0000
tree dc02c7afaf5093b70353244b2c9f74623f3d1a65
parent e01006bf0b9deb64646051cad19b22600fd24db0
parent 3af111cf5975e51318b8aa59f39e5d96c6bc3fbd

drm_hwcomposer: limit maximum depth of frame worker queue am: ff717ff5b0
am: 3af111cf59

Change-Id: I47f54e2a0cc0c2235ffb757a5579268277dafe06

drmconnector.cpp

diff --git a/drmconnector.cpp b/drmconnector.cpp
index 8f9ad49..ccb38e2 100644
--- a/drmconnector.cpp
+++ b/drmconnector.cpp
@@ -69,7 +69,7 @@
 
 bool DrmConnector::built_in() const {
   return type_ == DRM_MODE_CONNECTOR_LVDS || type_ == DRM_MODE_CONNECTOR_eDP ||
-         type_ == DRM_MODE_CONNECTOR_DSI;
+         type_ == DRM_MODE_CONNECTOR_DSI || type_ == DRM_MODE_CONNECTOR_VIRTUAL;
 }
 
 int DrmConnector::UpdateModes() {

platformdrmgeneric.cpp

diff --git a/platformdrmgeneric.cpp b/platformdrmgeneric.cpp
index e94bf26..90ba0e2 100644
--- a/platformdrmgeneric.cpp
+++ b/platformdrmgeneric.cpp
@@ -25,8 +25,6 @@
 #include <xf86drmMode.h>
 
 #include <cutils/log.h>
-#include <gralloc_drm.h>
-#include <gralloc_drm_priv.h>
 #include <gralloc_drm_handle.h>
 #include <hardware/gralloc.h>
 
@@ -90,12 +88,6 @@
   if (!gr_handle)
     return -EINVAL;
 
-  struct gralloc_drm_bo_t *gralloc_bo = gr_handle->data;
-  if (!gralloc_bo) {
-    ALOGE("Could not get drm bo from handle");
-    return -EINVAL;
-  }
-
   uint32_t gem_handle;
   int ret = drmPrimeFDToHandle(drm_->fd(), gr_handle->prime_fd, &gem_handle);
   if (ret) {