OSDN Git Service

drm_hwcomposer: Move importer.h to platform.h
[android-x86/external-drm_hwcomposer.git] / hwcomposer.cpp
index c06bd00..b2e9643 100644 (file)
  * limitations under the License.
  */
 
+#define ATRACE_TAG ATRACE_TAG_GRAPHICS
 #define LOG_TAG "hwcomposer-drm"
 
-#include <fcntl.h>
+#include "drmhwcomposer.h"
+#include "drmeventlistener.h"
+#include "drmresources.h"
+#include "platform.h"
+#include "virtualcompositorworker.h"
+#include "vsyncworker.h"
+
+#include <stdlib.h>
+
+#include <cinttypes>
+#include <map>
+#include <vector>
+#include <sstream>
+
 #include <errno.h>
+#include <fcntl.h>
+#include <pthread.h>
 #include <sys/param.h>
 #include <sys/resource.h>
-#include <pthread.h>
-#include <queue>
-
-#include <cutils/log.h>
-
 #include <xf86drm.h>
 #include <xf86drmMode.h>
 
+#include <cutils/log.h>
+#include <cutils/properties.h>
 #include <hardware/hardware.h>
 #include <hardware/hwcomposer.h>
-
-#include <sync/sync.h>
 #include <sw_sync.h>
+#include <sync/sync.h>
+#include <utils/Trace.h>
 
-#include "drm_hwcomposer.h"
-
-#define ARRAY_SIZE(arr) (int)(sizeof(arr) / sizeof((arr)[0]))
-
-#define HWCOMPOSER_DRM_DEVICE "/dev/dri/card0"
-#define MAX_NUM_DISPLAYS 3
 #define UM_PER_INCH 25400
 
-static const uint32_t panel_types[] = {
-       DRM_MODE_CONNECTOR_LVDS,
-       DRM_MODE_CONNECTOR_eDP,
-       DRM_MODE_CONNECTOR_DSI,
+namespace android {
+
+class DummySwSyncTimeline {
+ public:
+  int Init() {
+    int ret = timeline_fd_.Set(sw_sync_timeline_create());
+    if (ret < 0)
+      return ret;
+    return 0;
+  }
+
+  UniqueFd CreateDummyFence() {
+    int ret = sw_sync_fence_create(timeline_fd_.get(), "dummy fence",
+                                   timeline_pt_ + 1);
+    if (ret < 0) {
+      ALOGE("Failed to create dummy fence %d", ret);
+      return ret;
+    }
+
+    UniqueFd ret_fd(ret);
+
+    ret = sw_sync_timeline_inc(timeline_fd_.get(), 1);
+    if (ret) {
+      ALOGE("Failed to increment dummy sync timeline %d", ret);
+      return ret;
+    }
+
+    ++timeline_pt_;
+    return ret_fd;
+  }
+
+ private:
+  UniqueFd timeline_fd_;
+  int timeline_pt_ = 0;
 };
 
-struct hwc_worker {
-       pthread_t thread;
-       pthread_mutex_t lock;
-       pthread_cond_t cond;
-       bool exit;
-};
-
-struct hwc_drm_display {
-       struct hwc_context_t *ctx;
-       int display;
+struct CheckedOutputFd {
+  CheckedOutputFd(int *fd, const char *description,
+                  DummySwSyncTimeline &timeline)
+      : fd_(fd), description_(description), timeline_(timeline) {
+  }
+  CheckedOutputFd(CheckedOutputFd &&rhs)
+      : description_(rhs.description_), timeline_(rhs.timeline_) {
+    std::swap(fd_, rhs.fd_);
+  }
 
-       uint32_t connector_id;
+  CheckedOutputFd &operator=(const CheckedOutputFd &rhs) = delete;
 
-       drmModeModeInfoPtr configs;
-       uint32_t num_configs;
+  ~CheckedOutputFd() {
+    if (fd_ == NULL)
+      return;
 
-       int active_config;
-       uint32_t active_crtc;
-       int active_pipe;
-       bool initial_modeset_required;
+    if (*fd_ >= 0)
+      return;
 
-       struct hwc_worker set_worker;
+    *fd_ = timeline_.CreateDummyFence().Release();
 
-       std::queue<struct hwc_drm_bo> buf_queue;
-       struct hwc_drm_bo front;
+    if (*fd_ < 0)
+      ALOGE("Failed to fill %s (%p == %d) before destruction",
+            description_.c_str(), fd_, *fd_);
+  }
 
-       int timeline_fd;
-       unsigned timeline_next;
+ private:
+  int *fd_ = NULL;
+  std::string description_;
+  DummySwSyncTimeline &timeline_;
+};
 
-       struct hwc_worker vsync_worker;
-       bool enable_vsync_events;
+typedef struct hwc_drm_display {
+  struct hwc_context_t *ctx;
+  int display;
+
+  std::vector<uint32_t> config_ids;
+
+  VSyncWorker vsync_worker;
+} hwc_drm_display_t;
+
+class DrmHotplugHandler : public DrmEventHandler {
+ public:
+  void Init(DrmResources *drm, const struct hwc_procs *procs) {
+    drm_ = drm;
+    procs_ = procs;
+  }
+
+  void HandleEvent(uint64_t timestamp_us) {
+    for (auto &conn : drm_->connectors()) {
+      drmModeConnection old_state = conn->state();
+
+      conn->UpdateModes();
+
+      drmModeConnection cur_state = conn->state();
+
+      if (cur_state == old_state)
+        continue;
+
+      ALOGI("%s event @%" PRIu64 " for connector %u\n",
+            cur_state == DRM_MODE_CONNECTED ? "Plug" : "Unplug", timestamp_us,
+            conn->id());
+
+      if (cur_state == DRM_MODE_CONNECTED) {
+        // Take the first one, then look for the preferred
+        DrmMode mode = *(conn->modes().begin());
+        for (auto &m : conn->modes()) {
+          if (m.type() & DRM_MODE_TYPE_PREFERRED) {
+            mode = m;
+            break;
+          }
+        }
+        ALOGI("Setting mode %dx%d for connector %d\n", mode.h_display(),
+              mode.v_display(), conn->id());
+        int ret = drm_->SetDisplayActiveMode(conn->display(), mode);
+        if (ret) {
+          ALOGE("Failed to set active config %d", ret);
+          return;
+        }
+      } else {
+        int ret = drm_->SetDpmsMode(conn->display(), DRM_MODE_DPMS_OFF);
+        if (ret) {
+          ALOGE("Failed to set dpms mode off %d", ret);
+          return;
+        }
+      }
+
+      procs_->hotplug(procs_, conn->display(),
+                      cur_state == DRM_MODE_CONNECTED ? 1 : 0);
+    }
+  }
+
+ private:
+  DrmResources *drm_ = NULL;
+  const struct hwc_procs *procs_ = NULL;
 };
 
 struct hwc_context_t {
-       hwc_composer_device_1_t device;
-
-       int fd;
-
-       hwc_procs_t const *procs;
-       struct hwc_import_context *import_ctx;
-
-       struct hwc_drm_display displays[MAX_NUM_DISPLAYS];
-       int num_displays;
+  // map of display:hwc_drm_display_t
+  typedef std::map<int, hwc_drm_display_t> DisplayMap;
+
+  ~hwc_context_t() {
+    virtual_compositor_worker.Exit();
+  }
+
+  hwc_composer_device_1_t device;
+  hwc_procs_t const *procs = NULL;
+
+  DisplayMap displays;
+  DrmResources drm;
+  std::unique_ptr<Importer> importer;
+  const gralloc_module_t *gralloc;
+  DummySwSyncTimeline dummy_timeline;
+  VirtualCompositorWorker virtual_compositor_worker;
+  DrmHotplugHandler hotplug_handler;
 };
 
-static int hwc_get_drm_display(struct hwc_context_t *ctx, int display,
-                       struct hwc_drm_display **hd)
-{
-       if (display >= MAX_NUM_DISPLAYS) {
-               ALOGE("Requested display is out-of-bounds %d %d", display,
-                       MAX_NUM_DISPLAYS);
-               return -EINVAL;
-       }
-       *hd = &ctx->displays[display];
-       return 0;
-}
-
-static int hwc_prepare_layer(hwc_layer_1_t *layer)
-{
-       /* TODO: We can't handle background right now, defer to sufaceFlinger */
-       if (layer->compositionType == HWC_BACKGROUND) {
-               layer->compositionType = HWC_FRAMEBUFFER;
-               ALOGV("Can't handle background layers yet");
+static native_handle_t *dup_buffer_handle(buffer_handle_t handle) {
+  native_handle_t *new_handle =
+      native_handle_create(handle->numFds, handle->numInts);
+  if (new_handle == NULL)
+    return NULL;
 
-       /* TODO: Support sideband compositions */
-       } else if (layer->compositionType == HWC_SIDEBAND) {
-               layer->compositionType = HWC_FRAMEBUFFER;
-               ALOGV("Can't handle sideband content yet");
-       }
+  const int *old_data = handle->data;
+  int *new_data = new_handle->data;
+  for (int i = 0; i < handle->numFds; i++) {
+    *new_data = dup(*old_data);
+    old_data++;
+    new_data++;
+  }
+  memcpy(new_data, old_data, sizeof(int) * handle->numInts);
 
-       layer->hints = 0;
-
-       /* TODO: Handle cursor by setting compositionType=HWC_CURSOR_OVERLAY */
-       if (layer->flags & HWC_IS_CURSOR_LAYER) {
-               ALOGV("Can't handle async cursors yet");
-       }
-
-       /* TODO: Handle transformations */
-       if (layer->transform) {
-               ALOGV("Can't handle transformations yet");
-       }
-
-       /* TODO: Handle blending & plane alpha*/
-       if (layer->blending == HWC_BLENDING_PREMULT ||
-           layer->blending == HWC_BLENDING_COVERAGE) {
-               ALOGV("Can't handle blending yet");
-       }
-
-       /* TODO: Handle cropping & scaling */
-
-       return 0;
+  return new_handle;
 }
 
-static int hwc_prepare(hwc_composer_device_1_t */* dev */, size_t num_displays,
-                       hwc_display_contents_1_t** display_contents)
-{
-       int ret = 0, i, j;
-
-       /* TODO: Check flags for HWC_GEOMETRY_CHANGED */
-
-       for (i = 0; i < (int)num_displays && i < MAX_NUM_DISPLAYS; i++) {
-               for (j = 0; j < (int)display_contents[i]->numHwLayers; j++) {
-                       ret = hwc_prepare_layer(
-                                       &display_contents[i]->hwLayers[j]);
-                       if (ret) {
-                               ALOGE("Failed to prepare layer %d:%d", j, i);
-                               return ret;
-                       }
-               }
-       }
-
-       return ret;
-}
-
-/*
- * TODO: This hack allows us to use the importer's fd to drm to add and remove
- * framebuffers. The reason it exists is because gralloc doesn't export its
- * bo's, so we have to use its file descriptor to drm for some operations. Once
- * gralloc behaves, we can remove this.
- */
-static int hwc_get_fd_for_bo(struct hwc_context_t *ctx, struct hwc_drm_bo *bo)
-{
-       if (bo->importer_fd >= 0)
-               return bo->importer_fd;
-
-       return ctx->fd;
-}
-
-static bool hwc_mode_is_equal(drmModeModeInfoPtr a, drmModeModeInfoPtr b)
-{
-       return a->clock == b->clock &&
-               a->hdisplay == b->hdisplay &&
-               a->hsync_start == b->hsync_start &&
-               a->hsync_end == b->hsync_end &&
-               a->htotal == b->htotal &&
-               a->hskew == b->hskew &&
-               a->vdisplay == b->vdisplay &&
-               a->vsync_start == b->vsync_start &&
-               a->vsync_end == b->vsync_end &&
-               a->vtotal == b->vtotal &&
-               a->vscan == b->vscan &&
-               a->vrefresh == b->vrefresh &&
-               a->flags == b->flags &&
-               a->type == b->type &&
-               !strcmp(a->name, b->name);
-}
-
-static int hwc_modeset_required(struct hwc_drm_display *hd,
-                       bool *modeset_required)
-{
-       drmModeCrtcPtr crtc;
-       drmModeModeInfoPtr m;
-
-       if (hd->initial_modeset_required) {
-               *modeset_required = true;
-               hd->initial_modeset_required = false;
-               return 0;
-       }
-
-       crtc = drmModeGetCrtc(hd->ctx->fd, hd->active_crtc);
-       if (!crtc) {
-               ALOGE("Failed to get crtc for display %d", hd->display);
-               return -ENODEV;
-       }
-
-       m = &hd->configs[hd->active_config];
-
-       /* Do a modeset if we haven't done one, or the mode has changed */
-       if (!crtc->mode_valid || !hwc_mode_is_equal(m, &crtc->mode))
-               *modeset_required = true;
-       else
-               *modeset_required = false;
-
-       drmModeFreeCrtc(crtc);
-
-       return 0;
-}
-
-static void hwc_flip_handler(int /* fd */, unsigned int /* sequence */,
-               unsigned int /* tv_sec */, unsigned int /* tv_usec */,
-               void */* user_data */)
-{
-}
-
-static int hwc_flip(struct hwc_drm_display *hd, struct hwc_drm_bo *buf)
-{
-       fd_set fds;
-       drmEventContext event_context;
-       int ret;
-       bool modeset_required;
-
-       ret = hwc_modeset_required(hd, &modeset_required);
-       if (ret) {
-               ALOGE("Failed to determine if modeset is required %d", ret);
-               return ret;
-       }
-       if (modeset_required) {
-               ret = drmModeSetCrtc(hd->ctx->fd, hd->active_crtc, buf->fb_id,
-                       0, 0, &hd->connector_id, 1,
-                       &hd->configs[hd->active_config]);
-               if (ret) {
-                       ALOGE("Modeset failed for crtc %d",
-                               hd->active_crtc);
-                       return ret;
-               }
-               return 0;
-       }
-
-       FD_ZERO(&fds);
-       FD_SET(hd->ctx->fd, &fds);
-
-       event_context.version = DRM_EVENT_CONTEXT_VERSION;
-       event_context.page_flip_handler = hwc_flip_handler;
-
-       ret = drmModePageFlip(hd->ctx->fd, hd->active_crtc, buf->fb_id,
-                       DRM_MODE_PAGE_FLIP_EVENT, hd);
-       if (ret) {
-               ALOGE("Failed to flip buffer for crtc %d",
-                       hd->active_crtc);
-               return ret;
-       }
-
-       do {
-               ret = select(hd->ctx->fd + 1, &fds, NULL, NULL, NULL);
-       } while (ret == -1 && errno == EINTR);
-
-       if (ret != 1) {
-               ALOGE("Failed waiting for flip to complete\n");
-               return -EINVAL;
-       }
-       drmHandleEvent(hd->ctx->fd, &event_context);
-
-       return 0;
-}
-
-static int hwc_wait_and_set(struct hwc_drm_display *hd,
-                       struct hwc_drm_bo *buf)
-{
-       int ret;
-
-       ret = drmModeAddFB2(hwc_get_fd_for_bo(hd->ctx, buf), buf->width,
-               buf->height, buf->format, buf->gem_handles, buf->pitches,
-               buf->offsets, &buf->fb_id, 0);
-       if (ret) {
-               ALOGE("could not create drm fb %d", ret);
-               return ret;
-       }
-
-       if (buf->acquire_fence_fd >= 0) {
-               ret = sync_wait(buf->acquire_fence_fd, -1);
-               if (ret) {
-                       ALOGE("Failed to wait for acquire %d", ret);
-                       return ret;
-               }
-       }
-
-       ret = hwc_flip(hd, buf);
-       if (ret) {
-               ALOGE("Failed to perform flip\n");
-               return ret;
-       }
-
-       if (hd->front.fb_id) {
-               ret = drmModeRmFB(hwc_get_fd_for_bo(hd->ctx, &hd->front),
-                               hd->front.fb_id);
-               if (ret) {
-                       ALOGE("Failed to rm fb from front %d", ret);
-                       return ret;
-               }
-       }
-       hd->front = *buf;
-
-       return ret;
-}
-
-static void *hwc_set_worker(void *arg)
-{
-       struct hwc_drm_display *hd = (struct hwc_drm_display *)arg;
-       int ret;
-
-       setpriority(PRIO_PROCESS, 0, HAL_PRIORITY_URGENT_DISPLAY);
-
-       do {
-               struct hwc_drm_bo buf;
-
-               ret = pthread_mutex_lock(&hd->set_worker.lock);
-               if (ret) {
-                       ALOGE("Failed to lock set lock %d", ret);
-                       return NULL;
-               }
-
-               if (hd->set_worker.exit)
-                       goto out;
-
-               if (hd->buf_queue.empty()) {
-                       ret = pthread_cond_wait(&hd->set_worker.cond,
-                                       &hd->set_worker.lock);
-                       if (ret) {
-                               ALOGE("Failed to wait on condition %d", ret);
-                               goto out;
-                       }
-               }
-
-               buf = hd->buf_queue.front();
-               hd->buf_queue.pop();
-
-               ret = pthread_mutex_unlock(&hd->set_worker.lock);
-               if (ret) {
-                       ALOGE("Failed to unlock set lock %d", ret);
-                       return NULL;
-               }
-
-               ret = hwc_wait_and_set(hd, &buf);
-               if (ret)
-                       ALOGE("Failed to wait and set %d", ret);
-
-               ret = sw_sync_timeline_inc(hd->timeline_fd, 1);
-               if (ret)
-                       ALOGE("Failed to increment sync timeline %d", ret);
-       } while (true);
-
-out:
-       ret = pthread_mutex_unlock(&hd->set_worker.lock);
-       if (ret)
-               ALOGE("Failed to unlock set lock while exiting %d", ret);
-
-       return NULL;
-}
-
-static int hwc_set_display(hwc_context_t *ctx, int display,
-                       hwc_display_contents_1_t* display_contents)
-{
-       struct hwc_drm_display *hd = NULL;
-       hwc_layer_1_t *layer = NULL;
-       struct hwc_drm_bo buf;
-       int ret, i;
-       uint32_t fb_id;
-
-       memset(&buf, 0, sizeof(buf));
-
-       ret = hwc_get_drm_display(ctx, display, &hd);
-       if (ret)
-               return ret;
-
-       if (!hd->active_crtc) {
-               ALOGE("There is no active crtc for display %d", display);
-               return -ENOENT;
-       }
-
-       /*
-        * TODO: We can only support one hw layer atm, so choose either the
-        * first one or the framebuffer target.
-        */
-       if (!display_contents->numHwLayers) {
-               return 0;
-       } else if (display_contents->numHwLayers == 1) {
-               layer = &display_contents->hwLayers[0];
-       } else {
-               for (i = 0; i < (int)display_contents->numHwLayers; i++) {
-                       layer = &display_contents->hwLayers[i];
-                       if (layer->compositionType == HWC_FRAMEBUFFER_TARGET)
-                               break;
-               }
-               if (i == (int)display_contents->numHwLayers) {
-                       ALOGE("Could not find a suitable layer for display %d",
-                               display);
-               }
-       }
-
-       ret = hwc_create_bo_from_import(ctx->fd, ctx->import_ctx, layer->handle,
-                               &buf);
-       if (ret) {
-               ALOGE("Failed to import handle to drm bo %d", ret);
-               return ret;
-       }
-       buf.acquire_fence_fd = layer->acquireFenceFd;
-
-       ret = pthread_mutex_lock(&hd->set_worker.lock);
-       if (ret) {
-               ALOGE("Failed to lock set lock in set() %d", ret);
-               return ret;
-       }
-
-       /*
-        * TODO: Retire and release can use the same sync point here b/c hwc is
-        * restricted to one layer. Once that is no longer true, this will need
-        * to change
-        */
-       hd->timeline_next++;
-       display_contents->retireFenceFd = sw_sync_fence_create(hd->timeline_fd,
-                                       "drm_hwc_retire", hd->timeline_next);
-       layer->releaseFenceFd = sw_sync_fence_create(hd->timeline_fd,
-                                       "drm_hwc_release", hd->timeline_next);
-       hd->buf_queue.push(buf);
-
-       ret = pthread_cond_signal(&hd->set_worker.cond);
-       if (ret) {
-               ALOGE("Failed to signal set worker %d", ret);
-               goto out;
-       }
-
-       ret = pthread_mutex_unlock(&hd->set_worker.lock);
-       if (ret) {
-               ALOGE("Failed to unlock set lock in set() %d", ret);
-               return ret;
-       }
-
-       return ret;
-
-out:
-       if (pthread_mutex_unlock(&hd->set_worker.lock))
-               ALOGE("Failed to unlock set lock in set error handler");
-
-       return ret;
+static void free_buffer_handle(native_handle_t *handle) {
+  int ret = native_handle_close(handle);
+  if (ret)
+    ALOGE("Failed to close native handle %d", ret);
+  ret = native_handle_delete(handle);
+  if (ret)
+    ALOGE("Failed to delete native handle %d", ret);
+}
+
+const hwc_drm_bo *DrmHwcBuffer::operator->() const {
+  if (importer_ == NULL) {
+    ALOGE("Access of non-existent BO");
+    exit(1);
+    return NULL;
+  }
+  return &bo_;
+}
+
+void DrmHwcBuffer::Clear() {
+  if (importer_ != NULL) {
+    importer_->ReleaseBuffer(&bo_);
+    importer_ = NULL;
+  }
+}
+
+int DrmHwcBuffer::ImportBuffer(buffer_handle_t handle, Importer *importer) {
+  hwc_drm_bo tmp_bo;
+
+  int ret = importer->ImportBuffer(handle, &tmp_bo);
+  if (ret)
+    return ret;
+
+  if (importer_ != NULL) {
+    importer_->ReleaseBuffer(&bo_);
+  }
+
+  importer_ = importer;
+
+  bo_ = tmp_bo;
+
+  return 0;
+}
+
+int DrmHwcNativeHandle::CopyBufferHandle(buffer_handle_t handle,
+                                         const gralloc_module_t *gralloc) {
+  native_handle_t *handle_copy = dup_buffer_handle(handle);
+  if (handle_copy == NULL) {
+    ALOGE("Failed to duplicate handle");
+    return -ENOMEM;
+  }
+
+  int ret = gralloc->registerBuffer(gralloc, handle_copy);
+  if (ret) {
+    ALOGE("Failed to register buffer handle %d", ret);
+    free_buffer_handle(handle_copy);
+    return ret;
+  }
+
+  Clear();
+
+  gralloc_ = gralloc;
+  handle_ = handle_copy;
+
+  return 0;
+}
+
+DrmHwcNativeHandle::~DrmHwcNativeHandle() {
+  Clear();
+}
+
+void DrmHwcNativeHandle::Clear() {
+  if (gralloc_ != NULL && handle_ != NULL) {
+    gralloc_->unregisterBuffer(gralloc_, handle_);
+    free_buffer_handle(handle_);
+    gralloc_ = NULL;
+    handle_ = NULL;
+  }
+}
+
+int DrmHwcLayer::InitFromHwcLayer(hwc_layer_1_t *sf_layer, Importer *importer,
+                                  const gralloc_module_t *gralloc) {
+  sf_handle = sf_layer->handle;
+  alpha = sf_layer->planeAlpha;
+
+  source_crop = DrmHwcRect<float>(
+      sf_layer->sourceCropf.left, sf_layer->sourceCropf.top,
+      sf_layer->sourceCropf.right, sf_layer->sourceCropf.bottom);
+  display_frame = DrmHwcRect<int>(
+      sf_layer->displayFrame.left, sf_layer->displayFrame.top,
+      sf_layer->displayFrame.right, sf_layer->displayFrame.bottom);
+
+  transform = 0;
+  // 270* and 180* cannot be combined with flips. More specifically, they
+  // already contain both horizontal and vertical flips, so those fields are
+  // redundant in this case. 90* rotation can be combined with either horizontal
+  // flip or vertical flip, so treat it differently
+  if (sf_layer->transform == HWC_TRANSFORM_ROT_270) {
+    transform = DrmHwcTransform::kRotate270;
+  } else if (sf_layer->transform == HWC_TRANSFORM_ROT_180) {
+    transform = DrmHwcTransform::kRotate180;
+  } else {
+    if (sf_layer->transform & HWC_TRANSFORM_FLIP_H)
+      transform |= DrmHwcTransform::kFlipH;
+    if (sf_layer->transform & HWC_TRANSFORM_FLIP_V)
+      transform |= DrmHwcTransform::kFlipV;
+    if (sf_layer->transform & HWC_TRANSFORM_ROT_90)
+      transform |= DrmHwcTransform::kRotate90;
+  }
+
+  switch (sf_layer->blending) {
+    case HWC_BLENDING_NONE:
+      blending = DrmHwcBlending::kNone;
+      break;
+    case HWC_BLENDING_PREMULT:
+      blending = DrmHwcBlending::kPreMult;
+      break;
+    case HWC_BLENDING_COVERAGE:
+      blending = DrmHwcBlending::kCoverage;
+      break;
+    default:
+      ALOGE("Invalid blending in hwc_layer_1_t %d", sf_layer->blending);
+      return -EINVAL;
+  }
+
+  int ret = buffer.ImportBuffer(sf_layer->handle, importer);
+  if (ret)
+    return ret;
+
+  ret = handle.CopyBufferHandle(sf_layer->handle, gralloc);
+  if (ret)
+    return ret;
+
+  ret = gralloc->perform(gralloc, GRALLOC_MODULE_PERFORM_GET_USAGE,
+                         handle.get(), &gralloc_buffer_usage);
+  if (ret) {
+    ALOGE("Failed to get usage for buffer %p (%d)", handle.get(), ret);
+    return ret;
+  }
+
+  return 0;
+}
+
+static void hwc_dump(struct hwc_composer_device_1 *dev, char *buff,
+                     int buff_len) {
+  struct hwc_context_t *ctx = (struct hwc_context_t *)&dev->common;
+  std::ostringstream out;
+
+  ctx->drm.compositor()->Dump(&out);
+  std::string out_str = out.str();
+  strncpy(buff, out_str.c_str(),
+          std::min((size_t)buff_len, out_str.length() + 1));
+  buff[buff_len - 1] = '\0';
+}
+
+static bool hwc_skip_layer(const std::pair<int, int> &indices, int i) {
+  return indices.first >= 0 && i >= indices.first && i <= indices.second;
+}
+
+static int hwc_prepare(hwc_composer_device_1_t *dev, size_t num_displays,
+                       hwc_display_contents_1_t **display_contents) {
+  struct hwc_context_t *ctx = (struct hwc_context_t *)&dev->common;
+
+  for (int i = 0; i < (int)num_displays; ++i) {
+    if (!display_contents[i])
+      continue;
+
+    bool use_framebuffer_target = false;
+    DrmMode mode;
+    if (i == HWC_DISPLAY_VIRTUAL) {
+      use_framebuffer_target = true;
+    } else {
+      DrmConnector *c = ctx->drm.GetConnectorForDisplay(i);
+      if (!c) {
+        ALOGE("Failed to get DrmConnector for display %d", i);
+        return -ENODEV;
+      }
+      mode = c->active_mode();
+    }
+
+    // Since we can't composite HWC_SKIP_LAYERs by ourselves, we'll let SF
+    // handle all layers in between the first and last skip layers. So find the
+    // outer indices and mark everything in between as HWC_FRAMEBUFFER
+    std::pair<int, int> skip_layer_indices(-1, -1);
+    int num_layers = display_contents[i]->numHwLayers;
+    for (int j = 0; !use_framebuffer_target && j < num_layers; ++j) {
+      hwc_layer_1_t *layer = &display_contents[i]->hwLayers[j];
+
+      if (!(layer->flags & HWC_SKIP_LAYER))
+        continue;
+
+      if (skip_layer_indices.first == -1)
+        skip_layer_indices.first = j;
+      skip_layer_indices.second = j;
+    }
+
+    for (int j = 0; j < num_layers; ++j) {
+      hwc_layer_1_t *layer = &display_contents[i]->hwLayers[j];
+
+      if (!use_framebuffer_target && !hwc_skip_layer(skip_layer_indices, j)) {
+        // If the layer is off the screen, don't earmark it for an overlay.
+        // We'll leave it as-is, which effectively just drops it from the frame
+        const hwc_rect_t *frame = &layer->displayFrame;
+        if ((frame->right - frame->left) <= 0 ||
+            (frame->bottom - frame->top) <= 0 ||
+            frame->right <= 0 || frame->bottom <= 0 ||
+            frame->left >= (int)mode.h_display() ||
+            frame->top >= (int)mode.v_display())
+            continue;
+
+        if (layer->compositionType == HWC_FRAMEBUFFER)
+          layer->compositionType = HWC_OVERLAY;
+      } else {
+        switch (layer->compositionType) {
+          case HWC_OVERLAY:
+          case HWC_BACKGROUND:
+          case HWC_SIDEBAND:
+          case HWC_CURSOR_OVERLAY:
+            layer->compositionType = HWC_FRAMEBUFFER;
+            break;
+        }
+      }
+    }
+  }
+
+  return 0;
+}
+
+static void hwc_add_layer_to_retire_fence(
+    hwc_layer_1_t *layer, hwc_display_contents_1_t *display_contents) {
+  if (layer->releaseFenceFd < 0)
+    return;
+
+  if (display_contents->retireFenceFd >= 0) {
+    int old_retire_fence = display_contents->retireFenceFd;
+    display_contents->retireFenceFd =
+        sync_merge("dc_retire", old_retire_fence, layer->releaseFenceFd);
+    close(old_retire_fence);
+  } else {
+    display_contents->retireFenceFd = dup(layer->releaseFenceFd);
+  }
 }
 
 static int hwc_set(hwc_composer_device_1_t *dev, size_t num_displays,
-                       hwc_display_contents_1_t** display_contents)
-{
-       struct hwc_context_t *ctx = (struct hwc_context_t *)&dev->common;
-       int ret = 0, i;
-
-       for (i = 0; i < (int)num_displays && i < MAX_NUM_DISPLAYS; i++) {
-               ret = hwc_set_display(ctx, i, display_contents[i]);
-       }
-
-       return ret;
-}
-
-static int hwc_wait_for_vsync(struct hwc_drm_display *hd)
-{
-       drmVBlank vblank;
-       int ret;
-       uint32_t high_crtc;
-       int64_t timestamp;
-
-       if (hd->active_pipe == -1)
-               return -EINVAL;
-
-       memset(&vblank, 0, sizeof(vblank));
-
-       high_crtc = (hd->active_pipe << DRM_VBLANK_HIGH_CRTC_SHIFT);
-       vblank.request.type = (drmVBlankSeqType)(DRM_VBLANK_RELATIVE |
-               (high_crtc & DRM_VBLANK_HIGH_CRTC_MASK));
-       vblank.request.sequence = 1;
-
-       ret = drmWaitVBlank(hd->ctx->fd, &vblank);
-       if (ret) {
-               ALOGE("Failed to wait for vblank %d", ret);
-               return ret;
-       }
-
-       if (hd->ctx->procs->vsync) {
-               timestamp = vblank.reply.tval_sec * 1000 * 1000 * 1000 +
-                       vblank.reply.tval_usec * 1000;
-               hd->ctx->procs->vsync(hd->ctx->procs, hd->display, timestamp);
-       }
-
-       return 0;
-}
-
-static void *hwc_vsync_worker(void *arg)
-{
-       struct hwc_drm_display *hd = (struct hwc_drm_display *)arg;
-       struct hwc_worker *w = &hd->vsync_worker;
-       int ret;
-
-       setpriority(PRIO_PROCESS, 0, HAL_PRIORITY_URGENT_DISPLAY);
-
-       do {
-               ret = pthread_mutex_lock(&w->lock);
-               if (ret) {
-                       ALOGE("Failed to lock vsync lock %d", ret);
-                       return NULL;
-               }
-
-               if (hd->active_pipe == -1) {
-                       ALOGE("Pipe is no longer active, disable events");
-                       hd->enable_vsync_events = false;
-               }
-
-               if (!hd->enable_vsync_events) {
-                       ret = pthread_cond_wait(&w->cond, &w->lock);
-                       if (ret) {
-                               ALOGE("Failed to wait on vsync cond %d", ret);
-                               break;
-                       }
-               }
-
-               if (w->exit)
-                       break;
-
-               ret = pthread_mutex_unlock(&w->lock);
-               if (ret) {
-                       ALOGE("Failed to unlock vsync lock %d", ret);
-                       return NULL;
-               }
-
-               if (!hd->enable_vsync_events)
-                       continue;
-
-               ret = hwc_wait_for_vsync(hd);
-               if (ret)
-                       ALOGE("Failed to wait for vsync %d", ret);
-
-       } while (true);
-
-out:
-       ret = pthread_mutex_unlock(&hd->set_worker.lock);
-       if (ret)
-               ALOGE("Failed to unlock set lock while exiting %d", ret);
-
-       return NULL;
-}
-
-static int hwc_event_control(struct hwc_composer_device_1* dev, int display,
-                       int event, int enabled)
-{
-       struct hwc_context_t *ctx = (struct hwc_context_t *)&dev->common;
-       struct hwc_drm_display *hd = NULL;
-       int ret;
-
-       ret = hwc_get_drm_display(ctx, display, &hd);
-       if (ret)
-               return ret;
-
-       if (event != HWC_EVENT_VSYNC || (enabled != 0 && enabled != 1))
-               return -EINVAL;
-
-       if (hd->active_pipe == -1) {
-               ALOGD("Can't service events for display %d, no pipe", display);
-               return -EINVAL;
-       }
-
-       ret = pthread_mutex_lock(&hd->vsync_worker.lock);
-       if (ret) {
-               ALOGE("Failed to lock vsync lock %d", ret);
-               return ret;
-       }
-
-       hd->enable_vsync_events = !!enabled;
-
-       ret = pthread_cond_signal(&hd->vsync_worker.cond);
-       if (ret) {
-               ALOGE("Failed to signal vsync thread %d", ret);
-               goto out;
-       }
-
-       ret = pthread_mutex_unlock(&hd->vsync_worker.lock);
-       if (ret) {
-               ALOGE("Failed to unlock vsync lock %d", ret);
-               return ret;
-       }
-
-       return 0;
-
-out:
-       if (pthread_mutex_unlock(&hd->vsync_worker.lock))
-               ALOGE("Failed to unlock vsync worker in error path");
-
-       return ret;
-}
-
-static int hwc_set_power_mode(struct hwc_composer_device_1* dev, int display,
-                       int mode)
-{
-       struct hwc_context_t *ctx = (struct hwc_context_t *)&dev->common;
-       struct hwc_drm_display *hd = NULL;
-       drmModeConnectorPtr c;
-       int ret, i;
-       uint32_t dpms_prop = 0;
-       uint64_t dpms_value = 0;
-
-       ret = hwc_get_drm_display(ctx, display, &hd);
-       if (ret)
-               return ret;
-
-       c = drmModeGetConnector(ctx->fd, hd->connector_id);
-       if (!c) {
-               ALOGE("Failed to get connector %d", display);
-               return -ENODEV;
-       }
-
-       for (i = 0; !dpms_prop && i < c->count_props; i++) {
-               drmModePropertyPtr p;
-
-               p = drmModeGetProperty(ctx->fd, c->props[i]);
-               if (!p)
-                       continue;
-
-               if (!strcmp(p->name, "DPMS"))
-                       dpms_prop = c->props[i];
-
-               drmModeFreeProperty(p);
-       }
-       if (!dpms_prop) {
-               ALOGE("Failed to get DPMS property from display %d", display);
-               ret = -ENOENT;
-               goto out;
-       }
-
-       switch(mode) {
-       case HWC_POWER_MODE_OFF:
-               dpms_value = DRM_MODE_DPMS_OFF;
-               break;
-
-       /* We can't support dozing right now, so go full on */
-       case HWC_POWER_MODE_DOZE:
-       case HWC_POWER_MODE_DOZE_SUSPEND:
-       case HWC_POWER_MODE_NORMAL:
-               dpms_value = DRM_MODE_DPMS_ON;
-               break;
-       };
-
-       ret = drmModeConnectorSetProperty(ctx->fd, c->connector_id,
-                       dpms_prop, dpms_value);
-       if (ret) {
-               ALOGE("Failed to set DPMS property for display %d", display);
-               goto out;
-       }
-
-out:
-       drmModeFreeConnector(c);
-       return ret;
-}
-
-static int hwc_query(struct hwc_composer_device_1 */* dev */, int what,
-                       int *value)
-{
-       switch(what) {
-       case HWC_BACKGROUND_LAYER_SUPPORTED:
-               *value = 0; /* TODO: We should do this */
-               break;
-       case HWC_VSYNC_PERIOD:
-               ALOGW("Query for deprecated vsync value, returning 60Hz");
-               *value = 1000 * 1000 * 1000 / 60;
-               break;
-       case HWC_DISPLAY_TYPES_SUPPORTED:
-               *value = HWC_DISPLAY_PRIMARY | HWC_DISPLAY_EXTERNAL;
-               break;
-       }
-       return 0;
-}
-
-static void hwc_register_procs(struct hwc_composer_device_1* dev,
-                       hwc_procs_t const* procs)
-{
-       struct hwc_context_t *ctx = (struct hwc_context_t *)&dev->common;
-
-       ctx->procs = procs;
-}
-
-static int hwc_get_display_configs(struct hwc_composer_device_1* dev,
-                       int display, uint32_t* configs, size_t* numConfigs)
-{
-       struct hwc_context_t *ctx = (struct hwc_context_t *)&dev->common;
-       struct hwc_drm_display *hd = NULL;
-       drmModeConnectorPtr c;
-       int ret = 0, i;
-
-       if (!*numConfigs)
-               return 0;
-
-       ret = hwc_get_drm_display(ctx, display, &hd);
-       if (ret)
-               return ret;
-
-       c = drmModeGetConnector(ctx->fd, hd->connector_id);
-       if (!c) {
-               ALOGE("Failed to get connector %d", display);
-               return -ENODEV;
-       }
-
-       if (hd->configs)
-               free(hd->configs);
-
-       hd->active_config = -1;
-       hd->configs = (drmModeModeInfoPtr)calloc(c->count_modes,
-                                       sizeof(*hd->configs));
-       if (!hd->configs) {
-               ALOGE("Failed to allocate config list for display %d", display);
-               ret = -ENOMEM;
-               hd->num_configs = 0;
-               goto out;
-       }
-
-       for (i = 0; i < c->count_modes; i++) {
-               drmModeModeInfoPtr m = &hd->configs[i];
-
-               memcpy(m, &c->modes[i], sizeof(*m));
-
-               if (i < (int)*numConfigs)
-                       configs[i] = i;
-       }
-
-       hd->num_configs = c->count_modes;
-       *numConfigs = MIN(c->count_modes, *numConfigs);
-
-out:
-       drmModeFreeConnector(c);
-       return ret;
+                   hwc_display_contents_1_t **sf_display_contents) {
+  ATRACE_CALL();
+  struct hwc_context_t *ctx = (struct hwc_context_t *)&dev->common;
+  int ret = 0;
+
+  std::vector<CheckedOutputFd> checked_output_fences;
+  std::vector<DrmHwcDisplayContents> displays_contents;
+  std::vector<DrmCompositionDisplayLayersMap> layers_map;
+  std::vector<std::vector<size_t>> layers_indices;
+  displays_contents.reserve(num_displays);
+  // layers_map.reserve(num_displays);
+  layers_indices.reserve(num_displays);
+
+  // Phase one does nothing that would cause errors. Only take ownership of FDs.
+  for (size_t i = 0; i < num_displays; ++i) {
+    hwc_display_contents_1_t *dc = sf_display_contents[i];
+    displays_contents.emplace_back();
+    DrmHwcDisplayContents &display_contents = displays_contents.back();
+    layers_indices.emplace_back();
+    std::vector<size_t> &indices_to_composite = layers_indices.back();
+
+    if (!sf_display_contents[i])
+      continue;
+
+    if (i == HWC_DISPLAY_VIRTUAL) {
+      ctx->virtual_compositor_worker.QueueComposite(dc);
+      continue;
+    }
+
+    std::ostringstream display_index_formatter;
+    display_index_formatter << "retire fence for display " << i;
+    std::string display_fence_description(display_index_formatter.str());
+    checked_output_fences.emplace_back(&dc->retireFenceFd,
+                                       display_fence_description.c_str(),
+                                       ctx->dummy_timeline);
+    display_contents.retire_fence = OutputFd(&dc->retireFenceFd);
+
+    size_t num_dc_layers = dc->numHwLayers;
+    int framebuffer_target_index = -1;
+    for (size_t j = 0; j < num_dc_layers; ++j) {
+      hwc_layer_1_t *sf_layer = &dc->hwLayers[j];
+      if (sf_layer->compositionType == HWC_FRAMEBUFFER_TARGET) {
+        framebuffer_target_index = j;
+        break;
+      }
+    }
+
+    for (size_t j = 0; j < num_dc_layers; ++j) {
+      hwc_layer_1_t *sf_layer = &dc->hwLayers[j];
+
+      display_contents.layers.emplace_back();
+      DrmHwcLayer &layer = display_contents.layers.back();
+
+      // In prepare() we marked all layers FRAMEBUFFER between SKIP_LAYER's.
+      // This means we should insert the FB_TARGET layer in the composition
+      // stack at the location of the first skip layer, and ignore the rest.
+      if (sf_layer->flags & HWC_SKIP_LAYER) {
+        if (framebuffer_target_index < 0)
+          continue;
+        int idx = framebuffer_target_index;
+        framebuffer_target_index = -1;
+        hwc_layer_1_t *fbt_layer = &dc->hwLayers[idx];
+        if (!fbt_layer->handle || (fbt_layer->flags & HWC_SKIP_LAYER)) {
+          ALOGE("Invalid HWC_FRAMEBUFFER_TARGET with HWC_SKIP_LAYER present");
+          continue;
+        }
+        indices_to_composite.push_back(idx);
+        continue;
+      }
+
+      if (sf_layer->compositionType == HWC_OVERLAY)
+        indices_to_composite.push_back(j);
+
+      layer.acquire_fence.Set(sf_layer->acquireFenceFd);
+      sf_layer->acquireFenceFd = -1;
+
+      std::ostringstream layer_fence_formatter;
+      layer_fence_formatter << "release fence for layer " << j << " of display "
+                            << i;
+      std::string layer_fence_description(layer_fence_formatter.str());
+      checked_output_fences.emplace_back(&sf_layer->releaseFenceFd,
+                                         layer_fence_description.c_str(),
+                                         ctx->dummy_timeline);
+      layer.release_fence = OutputFd(&sf_layer->releaseFenceFd);
+    }
+
+    // This is a catch-all in case we get a frame without any overlay layers, or
+    // skip layers, but with a value fb_target layer. This _shouldn't_ happen,
+    // but it's not ruled out by the hwc specification
+    if (indices_to_composite.empty() && framebuffer_target_index >= 0) {
+      hwc_layer_1_t *sf_layer = &dc->hwLayers[framebuffer_target_index];
+      if (!sf_layer->handle || (sf_layer->flags & HWC_SKIP_LAYER)) {
+        ALOGE(
+            "Expected valid layer with HWC_FRAMEBUFFER_TARGET when all "
+            "HWC_OVERLAY layers are skipped.");
+        ret = -EINVAL;
+      }
+      indices_to_composite.push_back(framebuffer_target_index);
+    }
+  }
+
+  if (ret)
+    return ret;
+
+  for (size_t i = 0; i < num_displays; ++i) {
+    hwc_display_contents_1_t *dc = sf_display_contents[i];
+    DrmHwcDisplayContents &display_contents = displays_contents[i];
+    if (!sf_display_contents[i] || i == HWC_DISPLAY_VIRTUAL)
+      continue;
+
+    layers_map.emplace_back();
+    DrmCompositionDisplayLayersMap &map = layers_map.back();
+    map.display = i;
+    map.geometry_changed =
+        (dc->flags & HWC_GEOMETRY_CHANGED) == HWC_GEOMETRY_CHANGED;
+    std::vector<size_t> &indices_to_composite = layers_indices[i];
+    for (size_t j : indices_to_composite) {
+      hwc_layer_1_t *sf_layer = &dc->hwLayers[j];
+
+      DrmHwcLayer &layer = display_contents.layers[j];
+
+      ret = layer.InitFromHwcLayer(sf_layer, ctx->importer.get(), ctx->gralloc);
+      if (ret) {
+        ALOGE("Failed to init composition from layer %d", ret);
+        return ret;
+      }
+      map.layers.emplace_back(std::move(layer));
+    }
+  }
+
+  std::unique_ptr<DrmComposition> composition(
+      ctx->drm.compositor()->CreateComposition(ctx->importer.get()));
+  if (!composition) {
+    ALOGE("Drm composition init failed");
+    return -EINVAL;
+  }
+
+  ret = composition->SetLayers(layers_map.size(), layers_map.data());
+  if (ret) {
+    return -EINVAL;
+  }
+
+  ret = ctx->drm.compositor()->QueueComposition(std::move(composition));
+  if (ret) {
+    return -EINVAL;
+  }
+
+  for (size_t i = 0; i < num_displays; ++i) {
+    hwc_display_contents_1_t *dc = sf_display_contents[i];
+    if (!dc)
+      continue;
+
+    size_t num_dc_layers = dc->numHwLayers;
+    for (size_t j = 0; j < num_dc_layers; ++j) {
+      hwc_layer_1_t *layer = &dc->hwLayers[j];
+      if (layer->flags & HWC_SKIP_LAYER)
+        continue;
+      hwc_add_layer_to_retire_fence(layer, dc);
+    }
+  }
+
+  composition.reset(NULL);
+
+  return ret;
+}
+
+static int hwc_event_control(struct hwc_composer_device_1 *dev, int display,
+                             int event, int enabled) {
+  if (event != HWC_EVENT_VSYNC || (enabled != 0 && enabled != 1))
+    return -EINVAL;
+
+  struct hwc_context_t *ctx = (struct hwc_context_t *)&dev->common;
+  hwc_drm_display_t *hd = &ctx->displays[display];
+  return hd->vsync_worker.VSyncControl(enabled);
+}
+
+static int hwc_set_power_mode(struct hwc_composer_device_1 *dev, int display,
+                              int mode) {
+  struct hwc_context_t *ctx = (struct hwc_context_t *)&dev->common;
+
+  uint64_t dpmsValue = 0;
+  switch (mode) {
+    case HWC_POWER_MODE_OFF:
+      dpmsValue = DRM_MODE_DPMS_OFF;
+      break;
+
+    /* We can't support dozing right now, so go full on */
+    case HWC_POWER_MODE_DOZE:
+    case HWC_POWER_MODE_DOZE_SUSPEND:
+    case HWC_POWER_MODE_NORMAL:
+      dpmsValue = DRM_MODE_DPMS_ON;
+      break;
+  };
+  return ctx->drm.SetDpmsMode(display, dpmsValue);
+}
+
+static int hwc_query(struct hwc_composer_device_1 * /* dev */, int what,
+                     int *value) {
+  switch (what) {
+    case HWC_BACKGROUND_LAYER_SUPPORTED:
+      *value = 0; /* TODO: We should do this */
+      break;
+    case HWC_VSYNC_PERIOD:
+      ALOGW("Query for deprecated vsync value, returning 60Hz");
+      *value = 1000 * 1000 * 1000 / 60;
+      break;
+    case HWC_DISPLAY_TYPES_SUPPORTED:
+      *value = HWC_DISPLAY_PRIMARY_BIT | HWC_DISPLAY_EXTERNAL_BIT |
+               HWC_DISPLAY_VIRTUAL_BIT;
+      break;
+  }
+  return 0;
+}
+
+static void hwc_register_procs(struct hwc_composer_device_1 *dev,
+                               hwc_procs_t const *procs) {
+  struct hwc_context_t *ctx = (struct hwc_context_t *)&dev->common;
+
+  ctx->procs = procs;
+
+  for (std::pair<const int, hwc_drm_display> &display_entry : ctx->displays)
+    display_entry.second.vsync_worker.SetProcs(procs);
+
+  ctx->hotplug_handler.Init(&ctx->drm, procs);
+  ctx->drm.event_listener()->RegisterHotplugHandler(&ctx->hotplug_handler);
+}
+
+static int hwc_get_display_configs(struct hwc_composer_device_1 *dev,
+                                   int display, uint32_t *configs,
+                                   size_t *num_configs) {
+  if (!*num_configs)
+    return 0;
+
+  struct hwc_context_t *ctx = (struct hwc_context_t *)&dev->common;
+  hwc_drm_display_t *hd = &ctx->displays[display];
+  hd->config_ids.clear();
+
+  DrmConnector *connector = ctx->drm.GetConnectorForDisplay(display);
+  if (!connector) {
+    ALOGE("Failed to get connector for display %d", display);
+    return -ENODEV;
+  }
+
+  int ret = connector->UpdateModes();
+  if (ret) {
+    ALOGE("Failed to update display modes %d", ret);
+    return ret;
+  }
+
+  for (const DrmMode &mode : connector->modes()) {
+    size_t idx = hd->config_ids.size();
+    if (idx == *num_configs)
+      break;
+    hd->config_ids.push_back(mode.id());
+    configs[idx] = mode.id();
+  }
+  *num_configs = hd->config_ids.size();
+  return *num_configs == 0 ? -1 : 0;
+}
+
+static int hwc_get_display_attributes(struct hwc_composer_device_1 *dev,
+                                      int display, uint32_t config,
+                                      const uint32_t *attributes,
+                                      int32_t *values) {
+  struct hwc_context_t *ctx = (struct hwc_context_t *)&dev->common;
+  DrmConnector *c = ctx->drm.GetConnectorForDisplay(display);
+  if (!c) {
+    ALOGE("Failed to get DrmConnector for display %d", display);
+    return -ENODEV;
+  }
+  DrmMode mode;
+  for (const DrmMode &conn_mode : c->modes()) {
+    if (conn_mode.id() == config) {
+      mode = conn_mode;
+      break;
+    }
+  }
+  if (mode.id() == 0) {
+    ALOGE("Failed to find active mode for display %d", display);
+    return -ENOENT;
+  }
+
+  uint32_t mm_width = c->mm_width();
+  uint32_t mm_height = c->mm_height();
+  for (int i = 0; attributes[i] != HWC_DISPLAY_NO_ATTRIBUTE; ++i) {
+    switch (attributes[i]) {
+      case HWC_DISPLAY_VSYNC_PERIOD:
+        values[i] = 1000 * 1000 * 1000 / mode.v_refresh();
+        break;
+      case HWC_DISPLAY_WIDTH:
+        values[i] = mode.h_display();
+        break;
+      case HWC_DISPLAY_HEIGHT:
+        values[i] = mode.v_display();
+        break;
+      case HWC_DISPLAY_DPI_X:
+        /* Dots per 1000 inches */
+        values[i] = mm_width ? (mode.h_display() * UM_PER_INCH) / mm_width : 0;
+        break;
+      case HWC_DISPLAY_DPI_Y:
+        /* Dots per 1000 inches */
+        values[i] =
+            mm_height ? (mode.v_display() * UM_PER_INCH) / mm_height : 0;
+        break;
+    }
+  }
+  return 0;
+}
+
+static int hwc_get_active_config(struct hwc_composer_device_1 *dev,
+                                 int display) {
+  struct hwc_context_t *ctx = (struct hwc_context_t *)&dev->common;
+  DrmConnector *c = ctx->drm.GetConnectorForDisplay(display);
+  if (!c) {
+    ALOGE("Failed to get DrmConnector for display %d", display);
+    return -ENODEV;
+  }
+
+  DrmMode mode = c->active_mode();
+  hwc_drm_display_t *hd = &ctx->displays[display];
+  for (size_t i = 0; i < hd->config_ids.size(); ++i) {
+    if (hd->config_ids[i] == mode.id())
+      return i;
+  }
+  return -1;
+}
+
+static int hwc_set_active_config(struct hwc_composer_device_1 *dev, int display,
+                                 int index) {
+  struct hwc_context_t *ctx = (struct hwc_context_t *)&dev->common;
+  hwc_drm_display_t *hd = &ctx->displays[display];
+  if (index >= (int)hd->config_ids.size()) {
+    ALOGE("Invalid config index %d passed in", index);
+    return -EINVAL;
+  }
+
+  DrmConnector *c = ctx->drm.GetConnectorForDisplay(display);
+  if (!c) {
+    ALOGE("Failed to get connector for display %d", display);
+    return -ENODEV;
+  }
+
+  if (c->state() != DRM_MODE_CONNECTED)
+    return -ENODEV;
+
+  DrmMode mode;
+  for (const DrmMode &conn_mode : c->modes()) {
+    if (conn_mode.id() == hd->config_ids[index]) {
+      mode = conn_mode;
+      break;
+    }
+  }
+  if (mode.id() != hd->config_ids[index]) {
+    ALOGE("Could not find active mode for %d/%d", index, hd->config_ids[index]);
+    return -ENOENT;
+  }
+  int ret = ctx->drm.SetDisplayActiveMode(display, mode);
+  if (ret) {
+    ALOGE("Failed to set active config %d", ret);
+    return ret;
+  }
+  ret = ctx->drm.SetDpmsMode(display, DRM_MODE_DPMS_ON);
+  if (ret) {
+    ALOGE("Failed to set dpms mode on %d", ret);
+    return ret;
+  }
+  return ret;
+}
+
+static int hwc_device_close(struct hw_device_t *dev) {
+  struct hwc_context_t *ctx = (struct hwc_context_t *)dev;
+  delete ctx;
+  return 0;
 }
 
-static int hwc_check_config_valid(struct hwc_context_t *ctx,
-                       drmModeConnectorPtr connector, int display,
-                       int config_idx)
-{
-       struct hwc_drm_display *hd = NULL;
-       drmModeModeInfoPtr m = NULL;
-       int ret = 0, i;
-
-       ret = hwc_get_drm_display(ctx, display, &hd);
-       if (ret)
-               return ret;
-
-       /* Make sure the requested config is still valid for the display */
-       for (i = 0; i < connector->count_modes; i++) {
-               if (hwc_mode_is_equal(&connector->modes[i],
-                               &hd->configs[config_idx])) {
-                       m = &hd->configs[config_idx];
-                       break;
-               }
-       }
-       if (!m)
-               return -ENOENT;
-
-       return 0;
-}
-
-static int hwc_get_display_attributes(struct hwc_composer_device_1* dev,
-               int display, uint32_t config, const uint32_t* attributes,
-               int32_t* values)
-{
-       struct hwc_context_t *ctx = (struct hwc_context_t *)&dev->common;
-       struct hwc_drm_display *hd = NULL;
-       drmModeConnectorPtr c;
-       drmModeModeInfoPtr m;
-       int ret, i;
-
-       ret = hwc_get_drm_display(ctx, display, &hd);
-       if (ret)
-               return ret;
-
-       if (config >= hd->num_configs) {
-               ALOGE("Requested config is out-of-bounds %d %d", config,
-                       hd->num_configs);
-               return -EINVAL;
-       }
-
-       c = drmModeGetConnector(ctx->fd, hd->connector_id);
-       if (!c) {
-               ALOGE("Failed to get connector %d", display);
-               return -ENODEV;
-       }
-
-       ret = hwc_check_config_valid(ctx, c, display, (int)config);
-       if (ret) {
-               ALOGE("Provided config is no longer valid %u", config);
-               goto out;
-       }
-
-       m = &hd->configs[config];
-       for (i = 0; attributes[i] != HWC_DISPLAY_NO_ATTRIBUTE; i++) {
-               switch(attributes[i]) {
-               case HWC_DISPLAY_VSYNC_PERIOD:
-                       values[i] = 1000 * 1000 * 1000 / m->vrefresh;
-                       break;
-               case HWC_DISPLAY_WIDTH:
-                       values[i] = m->hdisplay;
-                       break;
-               case HWC_DISPLAY_HEIGHT:
-                       values[i] = m->vdisplay;
-                       break;
-               case HWC_DISPLAY_DPI_X:
-                       /* Dots per 1000 inches */
-                       values[i] = c->mmWidth ?
-                               (m->hdisplay * UM_PER_INCH) / c->mmWidth : 0;
-                       break;
-               case HWC_DISPLAY_DPI_Y:
-                       /* Dots per 1000 inches */
-                       values[i] = c->mmHeight ?
-                               (m->vdisplay * UM_PER_INCH) / c->mmHeight : 0;
-                       break;
-               }
-       }
-
-out:
-       drmModeFreeConnector(c);
-       return ret;
-}
-
-static int hwc_get_active_config(struct hwc_composer_device_1* dev, int display)
-{
-       struct hwc_context_t *ctx = (struct hwc_context_t *)&dev->common;
-       struct hwc_drm_display *hd = NULL;
-       drmModeConnectorPtr c;
-       int ret;
-
-       ret = hwc_get_drm_display(ctx, display, &hd);
-       if (ret)
-               return ret;
-
-       if (hd->active_config < 0)
-               return -1;
-
-       c = drmModeGetConnector(ctx->fd, hd->connector_id);
-       if (!c) {
-               ALOGE("Failed to get connector %d", display);
-               return -ENODEV;
-       }
-
-       ret = hwc_check_config_valid(ctx, c, display, hd->active_config);
-       if (ret) {
-               ALOGE("Config is no longer valid %d", hd->active_config);
-               ret = -1;
-               goto out;
-       }
-
-       ret = hd->active_config;
-
-out:
-       drmModeFreeConnector(c);
-       return ret;
-}
-
-static bool hwc_crtc_is_bound(struct hwc_context_t *ctx, uint32_t crtc_id)
-{
-       int i;
-
-       for (i = 0; i < MAX_NUM_DISPLAYS; i++) {
-               if (ctx->displays[i].active_crtc == crtc_id)
-                       return true;
-       }
-       return false;
-}
-
-static int hwc_try_encoder(struct hwc_context_t *ctx, drmModeResPtr r,
-                       uint32_t encoder_id, uint32_t *crtc_id)
-{
-       drmModeEncoderPtr e;
-       int ret, i;
-
-       e = drmModeGetEncoder(ctx->fd, encoder_id);
-       if (!e) {
-               ALOGE("Failed to get encoder for connector %d", encoder_id);
-               return -ENODEV;
-       }
-
-       /* First try to use the currently-bound crtc */
-       if (e->crtc_id) {
-               if (!hwc_crtc_is_bound(ctx, e->crtc_id)) {
-                       *crtc_id = e->crtc_id;
-                       ret = 0;
-                       goto out;
-               }
-       }
-
-       /* Try to find a possible crtc which will work */
-       for (i = 0; i < r->count_crtcs; i++) {
-               if (!(e->possible_crtcs & (1 << i)))
-                       continue;
-
-               /* We've already tried this earlier */
-               if (e->crtc_id == r->crtcs[i])
-                       continue;
-
-               if (!hwc_crtc_is_bound(ctx, r->crtcs[i])) {
-                       *crtc_id = r->crtcs[i];
-                       ret = 0;
-                       goto out;
-               }
-       }
-
-       /* We can't use the encoder, but nothing went wrong, try another one */
-       ret = -EAGAIN;
-
-out:
-       drmModeFreeEncoder(e);
-       return ret;
-}
-
-static int hwc_set_active_config(struct hwc_composer_device_1* dev, int display,
-                       int index)
-{
-       struct hwc_context_t *ctx = (struct hwc_context_t *)&dev->common;
-       struct hwc_drm_display *hd = NULL;
-       drmModeResPtr r = NULL;
-       drmModeConnectorPtr c;
-       uint32_t crtc_id = 0;
-       int ret, i;
-       bool new_crtc, new_encoder;
-
-       ret = hwc_get_drm_display(ctx, display, &hd);
-       if (ret)
-               return ret;
-
-       c = drmModeGetConnector(ctx->fd, hd->connector_id);
-       if (!c) {
-               ALOGE("Failed to get connector %d", display);
-               return -ENODEV;
-       }
-
-       if (c->connection == DRM_MODE_DISCONNECTED) {
-               ALOGE("Tried to configure a disconnected display %d", display);
-               ret = -ENODEV;
-               goto out;
-       }
-
-       ret = hwc_check_config_valid(ctx, c, display, index);
-       if (ret) {
-               ALOGE("Provided config is no longer valid %u", index);
-               ret = -ENOENT;
-               goto out;
-       }
-
-       r = drmModeGetResources(ctx->fd);
-       if (!r) {
-               ALOGE("Failed to get drm resources");
-               goto out;
-       }
-
-       /* We no longer have an active_crtc */
-       hd->active_crtc = 0;
-       hd->active_pipe = -1;
-
-       /* First, try to use the currently-connected encoder */
-       if (c->encoder_id) {
-               ret = hwc_try_encoder(ctx, r, c->encoder_id, &crtc_id);
-               if (ret && ret != -EAGAIN) {
-                       ALOGE("Encoder try failed %d", ret);
-                       goto out;
-               }
-       }
-
-       /* We couldn't find a crtc with the attached encoder, try the others */
-       if (!crtc_id) {
-               for (i = 0; i < c->count_encoders; i++) {
-                       ret = hwc_try_encoder(ctx, r, c->encoders[i], &crtc_id);
-                       if (!ret) {
-                               break;
-                       } else if (ret != -EAGAIN) {
-                               ALOGE("Encoder try failed %d", ret);
-                               goto out;
-                       }
-               }
-               if (!crtc_id) {
-                       ALOGE("Couldn't find valid crtc to modeset");
-                       ret = -EINVAL;
-                       goto out;
-               }
-       }
-
-       hd->active_crtc = crtc_id;
-       hd->active_config = index;
-
-       /* Find the pipe corresponding to the crtc_id */
-       for (i = 0; i < r->count_crtcs; i++) {
-               /* We've already tried this earlier */
-               if (r->crtcs[i] == crtc_id) {
-                       hd->active_pipe = i;
-                       break;
-               }
-       }
-       /* This should never happen... hehehe */
-       if (hd->active_pipe == -1) {
-               ALOGE("Active crtc was not found in resources!!");
-               ret = -ENODEV;
-               goto out;
-       }
-
-       /* TODO: Once we have atomic, set the crtc timing info here */
-
-out:
-       if (r)
-               drmModeFreeResources(r);
-
-       drmModeFreeConnector(c);
-       return ret;
-}
-
-static int hwc_destroy_worker(struct hwc_worker *worker)
-{
-       int ret;
-
-       ret = pthread_mutex_lock(&worker->lock);
-       if (ret) {
-               ALOGE("Failed to lock in destroy() %d", ret);
-               return ret;
-       }
-
-       worker->exit = true;
-
-       ret |= pthread_cond_signal(&worker->cond);
-       if (ret)
-               ALOGE("Failed to signal cond in destroy() %d", ret);
-
-       ret |= pthread_mutex_unlock(&worker->lock);
-       if (ret)
-               ALOGE("Failed to unlock in destroy() %d", ret);
-
-       ret |= pthread_join(worker->thread, NULL);
-       if (ret && ret != ESRCH)
-               ALOGE("Failed to join thread in destroy() %d", ret);
-
-       return ret;
-}
-
-static void hwc_destroy_display(struct hwc_drm_display *hd)
-{
-       int ret;
-
-       if (hwc_destroy_worker(&hd->set_worker))
-               ALOGE("Destroy set worker failed");
-
-       if (hwc_destroy_worker(&hd->vsync_worker))
-               ALOGE("Destroy vsync worker failed");
-}
-
-static int hwc_device_close(struct hw_device_t *dev)
-{
-       struct hwc_context_t *ctx = (struct hwc_context_t *)dev;
-       int ret, i;
-
-       for (i = 0; i < MAX_NUM_DISPLAYS; i++)
-               hwc_destroy_display(&ctx->displays[i]);
-
-       drmClose(ctx->fd);
-
-       ret = hwc_import_destroy(ctx->import_ctx);
-       if (ret)
-               ALOGE("Could not destroy import %d", ret);
-
-       free(ctx);
-
-       return 0;
-}
-
-static int hwc_initialize_worker(struct hwc_drm_display *hd,
-                       struct hwc_worker *worker, void *(*routine)(void*))
-{
-       int ret;
-
-       ret = pthread_cond_init(&worker->cond, NULL);
-       if (ret) {
-               ALOGE("Failed to create worker condition %d", ret);
-               return ret;
-       }
-
-       ret = pthread_mutex_init(&worker->lock, NULL);
-       if (ret) {
-               ALOGE("Failed to initialize worker lock %d", ret);
-               goto err_cond;
-       }
-
-       worker->exit = false;
-
-       ret = pthread_create(&worker->thread, NULL, routine, hd);
-       if (ret) {
-               ALOGE("Could not create worker thread %d", ret);
-               goto err_lock;
-       }
-       return 0;
-
-err_lock:
-       pthread_mutex_destroy(&worker->lock);
-err_cond:
-       pthread_cond_destroy(&worker->cond);
-       return ret;
-}
-
-static int hwc_initialize_display(struct hwc_context_t *ctx, int display,
-                       uint32_t connector_id)
-{
-       struct hwc_drm_display *hd = NULL;
-       int ret;
-
-       ret = hwc_get_drm_display(ctx, display, &hd);
-       if (ret)
-               return ret;
-
-       hd->ctx = ctx;
-       hd->display = display;
-       hd->active_config = -1;
-       hd->active_pipe = -1;
-       hd->initial_modeset_required = true;
-       hd->connector_id = connector_id;
-
-       ret = sw_sync_timeline_create();
-       if (ret < 0) {
-               ALOGE("Failed to create sw sync timeline %d", ret);
-               return ret;
-       }
-       hd->timeline_fd = ret;
-
-       ret = hwc_initialize_worker(hd, &hd->set_worker, hwc_set_worker);
-       if (ret) {
-               ALOGE("Failed to create set worker %d\n", ret);
-               return ret;
-       }
-
-       ret = hwc_initialize_worker(hd, &hd->vsync_worker, hwc_vsync_worker);
-       if (ret) {
-               ALOGE("Failed to create vsync worker %d", ret);
-               goto err;
-       }
-
-       return 0;
-
-err:
-       if (hwc_destroy_worker(&hd->set_worker))
-               ALOGE("Failed to destroy set worker");
-
-       return ret;
-}
-
-static int hwc_enumerate_displays(struct hwc_context_t *ctx)
-{
-       struct hwc_drm_display *panel_hd;
-       drmModeResPtr res;
-       drmModeConnectorPtr *conn_list;
-       int ret = 0, i, j;
-
-       res = drmModeGetResources(ctx->fd);
-       if (!res) {
-               ALOGE("Failed to get drm resources");
-               return -ENODEV;
-       }
-
-       conn_list = (drmModeConnector **)calloc(res->count_connectors,
-                       sizeof(*conn_list));
-       if (!conn_list) {
-               ALOGE("Failed to allocate connector list");
-               ret = -ENOMEM;
-               goto out;
-       }
-
-       for (i = 0; i < res->count_connectors; i++) {
-               conn_list[i] = drmModeGetConnector(ctx->fd, res->connectors[i]);
-               if (!conn_list[i]) {
-                       ALOGE("Failed to get connector %d", res->connectors[i]);
-                       ret = -ENODEV;
-                       goto out;
-               }
-       }
-
-       ctx->num_displays = 0;
-
-       /* Find a connected, panel type connector for display 0 */
-       for (i = 0; i < res->count_connectors; i++) {
-               drmModeConnectorPtr c = conn_list[i];
-
-               for (j = 0; j < ARRAY_SIZE(panel_types); j++) {
-                       if (c->connector_type == panel_types[j] &&
-                           c->connection == DRM_MODE_CONNECTED)
-                               break;
-               }
-               if (j == ARRAY_SIZE(panel_types))
-                       continue;
-
-               hwc_initialize_display(ctx, ctx->num_displays, c->connector_id);
-               ctx->num_displays++;
-               break;
-       }
-
-       ret = hwc_get_drm_display(ctx, 0, &panel_hd);
-       if (ret)
-               goto out;
-
-       /* Fill in the other displays */
-       for (i = 0; i < res->count_connectors; i++) {
-               drmModeConnectorPtr c = conn_list[i];
-
-               if (panel_hd->connector_id == c->connector_id)
-                       continue;
-
-               hwc_initialize_display(ctx, ctx->num_displays, c->connector_id);
-               ctx->num_displays++;
-       }
-
-out:
-       for (i = 0; i < res->count_connectors; i++) {
-               if (conn_list[i])
-                       drmModeFreeConnector(conn_list[i]);
-       }
-       free(conn_list);
-
-       if (res)
-               drmModeFreeResources(res);
-
-       return ret;
+/*
+ * TODO: This function sets the active config to the first one in the list. This
+ * should be fixed such that it selects the preferred mode for the display, or
+ * some other, saner, method of choosing the config.
+ */
+static int hwc_set_initial_config(hwc_drm_display_t *hd) {
+  uint32_t config;
+  size_t num_configs = 1;
+  int ret = hwc_get_display_configs(&hd->ctx->device, hd->display, &config,
+                                    &num_configs);
+  if (ret || !num_configs)
+    return 0;
+
+  ret = hwc_set_active_config(&hd->ctx->device, hd->display, 0);
+  if (ret) {
+    ALOGE("Failed to set active config d=%d ret=%d", hd->display, ret);
+    return ret;
+  }
+
+  return ret;
+}
+
+static int hwc_initialize_display(struct hwc_context_t *ctx, int display) {
+  hwc_drm_display_t *hd = &ctx->displays[display];
+  hd->ctx = ctx;
+  hd->display = display;
+
+  int ret = hwc_set_initial_config(hd);
+  if (ret) {
+    ALOGE("Failed to set initial config for d=%d ret=%d", display, ret);
+    return ret;
+  }
+
+  ret = hd->vsync_worker.Init(&ctx->drm, display);
+  if (ret) {
+    ALOGE("Failed to create event worker for display %d %d\n", display, ret);
+    return ret;
+  }
+
+  return 0;
+}
+
+static int hwc_enumerate_displays(struct hwc_context_t *ctx) {
+  int ret;
+  for (auto &conn : ctx->drm.connectors()) {
+    ret = hwc_initialize_display(ctx, conn->display());
+    if (ret) {
+      ALOGE("Failed to initialize display %d", conn->display());
+      return ret;
+    }
+  }
+
+  ret = ctx->virtual_compositor_worker.Init();
+  if (ret) {
+    ALOGE("Failed to initialize virtual compositor worker");
+    return ret;
+  }
+  return 0;
+}
+
+static int hwc_device_open(const struct hw_module_t *module, const char *name,
+                           struct hw_device_t **dev) {
+  if (strcmp(name, HWC_HARDWARE_COMPOSER)) {
+    ALOGE("Invalid module name- %s", name);
+    return -EINVAL;
+  }
+
+  std::unique_ptr<hwc_context_t> ctx(new hwc_context_t());
+  if (!ctx) {
+    ALOGE("Failed to allocate hwc context");
+    return -ENOMEM;
+  }
+
+  int ret = ctx->drm.Init();
+  if (ret) {
+    ALOGE("Can't initialize Drm object %d", ret);
+    return ret;
+  }
+
+  ret = hw_get_module(GRALLOC_HARDWARE_MODULE_ID,
+                      (const hw_module_t **)&ctx->gralloc);
+  if (ret) {
+    ALOGE("Failed to open gralloc module %d", ret);
+    return ret;
+  }
+
+  ret = ctx->dummy_timeline.Init();
+  if (ret) {
+    ALOGE("Failed to create dummy sw sync timeline %d", ret);
+    return ret;
+  }
+
+  ctx->importer.reset(Importer::CreateInstance(&ctx->drm));
+  if (!ctx->importer) {
+    ALOGE("Failed to create importer instance");
+    return ret;
+  }
+
+  ret = hwc_enumerate_displays(ctx.get());
+  if (ret) {
+    ALOGE("Failed to enumerate displays: %s", strerror(ret));
+    return ret;
+  }
+
+  ctx->device.common.tag = HARDWARE_DEVICE_TAG;
+  ctx->device.common.version = HWC_DEVICE_API_VERSION_1_4;
+  ctx->device.common.module = const_cast<hw_module_t *>(module);
+  ctx->device.common.close = hwc_device_close;
+
+  ctx->device.dump = hwc_dump;
+  ctx->device.prepare = hwc_prepare;
+  ctx->device.set = hwc_set;
+  ctx->device.eventControl = hwc_event_control;
+  ctx->device.setPowerMode = hwc_set_power_mode;
+  ctx->device.query = hwc_query;
+  ctx->device.registerProcs = hwc_register_procs;
+  ctx->device.getDisplayConfigs = hwc_get_display_configs;
+  ctx->device.getDisplayAttributes = hwc_get_display_attributes;
+  ctx->device.getActiveConfig = hwc_get_active_config;
+  ctx->device.setActiveConfig = hwc_set_active_config;
+  ctx->device.setCursorPositionAsync = NULL; /* TODO: Add cursor */
+
+  *dev = &ctx->device.common;
+  ctx.release();
+
+  return 0;
 }
-
-static int hwc_device_open(const struct hw_module_t* module, const char* name,
-                       struct hw_device_t** dev)
-{
-       int ret = 0;
-       struct hwc_context_t *ctx;
-
-       if (strcmp(name, HWC_HARDWARE_COMPOSER)) {
-               ALOGE("Invalid module name- %s", name);
-               return -EINVAL;
-       }
-
-       ctx = new hwc_context_t();
-       if (!ctx) {
-               ALOGE("Failed to allocate hwc context");
-               return -ENOMEM;
-       }
-
-       ret = hwc_import_init(&ctx->import_ctx);
-       if (ret) {
-               ALOGE("Failed to initialize import context");
-               goto out;
-       }
-
-       /* TODO: Use drmOpenControl here instead */
-       ctx->fd = open(HWCOMPOSER_DRM_DEVICE, O_RDWR);
-       if (ctx->fd < 0) {
-               ALOGE("Failed to open dri- %s", strerror(-errno));
-               goto out;
-       }
-
-       ret = drmSetMaster(ctx->fd);
-       if (ret) {
-               ALOGE("Failed to set hwcomposer as drm master %d", ret);
-               goto out;
-       }
-
-       ret = hwc_enumerate_displays(ctx);
-       if (ret) {
-               ALOGE("Failed to enumerate displays: %s", strerror(ret));
-               goto out;
-       }
-
-       ctx->device.common.tag = HARDWARE_DEVICE_TAG;
-       ctx->device.common.version = HWC_DEVICE_API_VERSION_1_4;
-       ctx->device.common.module = const_cast<hw_module_t*>(module);
-       ctx->device.common.close = hwc_device_close;
-
-       ctx->device.prepare = hwc_prepare;
-       ctx->device.set = hwc_set;
-       ctx->device.eventControl = hwc_event_control;
-       ctx->device.setPowerMode = hwc_set_power_mode;
-       ctx->device.query = hwc_query;
-       ctx->device.registerProcs = hwc_register_procs;
-       ctx->device.getDisplayConfigs = hwc_get_display_configs;
-       ctx->device.getDisplayAttributes = hwc_get_display_attributes;
-       ctx->device.getActiveConfig = hwc_get_active_config;
-       ctx->device.setActiveConfig = hwc_set_active_config;
-       ctx->device.setCursorPositionAsync = NULL; /* TODO: Add cursor */
-
-       *dev = &ctx->device.common;
-
-       return 0;
-out:
-       if (ctx->fd >= 0)
-               close(ctx->fd);
-
-       free(ctx);
-       return ret;
 }
 
 static struct hw_module_methods_t hwc_module_methods = {
-       open: hwc_device_open
+  .open = android::hwc_device_open
 };
 
 hwc_module_t HAL_MODULE_INFO_SYM = {
-       common: {
-               tag: HARDWARE_MODULE_TAG,
-               version_major: 1,
-               version_minor: 0,
-               id: HWC_HARDWARE_MODULE_ID,
-               name: "DRM hwcomposer module",
-               author: "The Android Open Source Project",
-               methods: &hwc_module_methods,
-               dso: NULL,
-               reserved: { 0 },
-       }
+  .common = {
+    .tag = HARDWARE_MODULE_TAG,
+    .version_major = 1,
+    .version_minor = 0,
+    .id = HWC_HARDWARE_MODULE_ID,
+    .name = "DRM hwcomposer module",
+    .author = "The Android Open Source Project",
+    .methods = &hwc_module_methods,
+    .dso = NULL,
+    .reserved = {0},
+  }
 };