commit f93268eef455e95a0981e480d4925434058f259f
author Sean Paul <seanpaul@chromium.org> Tue May 17 15:43:17 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue May 17 15:43:17 2016 +0000
tree ba3ec827afbd5aac79d18088550008610556a1d8
parent d6d8bdfc23e244b31d9c832dcd27bbf0a7a8463e
parent c04f1f9a2f6df48fcd3dd8cbc720b649068120e5

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

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

Change-Id: I5802bc8d7571a9e9fb8adebbbda658462bc1978a

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