commit 80b6062966f455d3926f5d38fa665c2f7f7fa1de
author Sean Paul <seanpaul@chromium.org> Thu Jun 23 04:36:44 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jun 23 04:36:44 2016 +0000
tree deab7ab595f4b333b463e0db7a46e8d9e3f5718a
parent 95ff952c0f57ec5d9a69a6d11ebfe27e78fceaa4
parent c74c8b9339cb5fd4f00d1be6b857c6e60ba5fc49

DO NOT MERGE: drm_hwcomposer: Count all layers with content in SquashFrame
am: c74c8b9339

Change-Id: Ie7d401ac8d7a91c027a7d93b1e86a8a58f03b96e

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