commit 325164feb17e00857f21220cb045260f00dc6b29
author Sean Paul <seanpaul@chromium.org> Tue May 17 15:43:31 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue May 17 15:43:31 2016 +0000
tree ba3ec827afbd5aac79d18088550008610556a1d8
parent 4258a8a169938f1dca4bb61f2ea939dac38a0ff4
parent 8cc4e2a2de3c0cf932226a5a6042de5d830fa24a

DO NOT MERGE: drm_hwcomposer: Use Planner interface to provision planes
am: 8cc4e2a2de

* commit '8cc4e2a2de3c0cf932226a5a6042de5d830fa24a':
  DO NOT MERGE: drm_hwcomposer: Use Planner interface to provision planes

Change-Id: Ic9d0109dedbaed4378fedb1c3a14948a5d5a3e32

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) {