diff --git a/drmresources.cpp b/drmresources.cpp
new file mode 100644
index 0000000..3da0f04
--- /dev/null
+++ b/drmresources.cpp
@@ -0,0 +1,421 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#define LOG_TAG "hwc-drm-resources"
+
+#include "drmconnector.h"
+#include "drmcrtc.h"
+#include "drmencoder.h"
+#include "drmplane.h"
+#include "drmresources.h"
+
+#include <errno.h>
+#include <fcntl.h>
+#include <stdint.h>
+#include <xf86drm.h>
+#include <xf86drmMode.h>
+
+#include <cutils/log.h>
+#include <cutils/properties.h>
+
+namespace android {
+
+DrmResources::DrmResources() : fd_(-1), mode_id_(0) {
+}
+
+DrmResources::~DrmResources() {
+  for (std::vector<DrmConnector *>::const_iterator iter = connectors_.begin();
+       iter != connectors_.end(); ++iter)
+    delete *iter;
+  connectors_.clear();
+
+  for (std::vector<DrmEncoder *>::const_iterator iter = encoders_.begin();
+       iter != encoders_.end(); ++iter)
+    delete *iter;
+  encoders_.clear();
+
+  for (std::vector<DrmCrtc *>::const_iterator iter = crtcs_.begin();
+       iter != crtcs_.end(); ++iter)
+    delete *iter;
+  crtcs_.clear();
+
+  for (std::vector<DrmPlane *>::const_iterator iter = planes_.begin();
+       iter != planes_.end(); ++iter)
+    delete *iter;
+  planes_.clear();
+
+  if (fd_ >= 0)
+    close(fd_);
+}
+
+int DrmResources::Init() {
+  char path[PROPERTY_VALUE_MAX];
+  property_get("hwc.drm.device", path, "/dev/dri/card0");
+
+  /* TODO: Use drmOpenControl here instead */
+  fd_ = open(path, O_RDWR);
+  if (fd_ < 0) {
+    ALOGE("Failed to open dri- %s", strerror(-errno));
+    return -ENODEV;
+  }
+
+  int ret = drmSetClientCap(fd_, DRM_CLIENT_CAP_UNIVERSAL_PLANES, 1);
+  if (ret) {
+    ALOGE("Failed to set universal plane cap %d", ret);
+    return ret;
+  }
+
+  ret = drmSetClientCap(fd_, DRM_CLIENT_CAP_ATOMIC, 1);
+  if (ret) {
+    ALOGE("Failed to set atomic cap %d", ret);
+    return ret;
+  }
+
+  drmModeResPtr res = drmModeGetResources(fd_);
+  if (!res) {
+    ALOGE("Failed to get DrmResources resources");
+    return -ENODEV;
+  }
+
+  bool found_primary = false;
+  int display_num = 1;
+
+  for (int i = 0; !ret && i < res->count_crtcs; ++i) {
+    drmModeCrtcPtr c = drmModeGetCrtc(fd_, res->crtcs[i]);
+    if (!c) {
+      ALOGE("Failed to get crtc %d", res->crtcs[i]);
+      ret = -ENODEV;
+      break;
+    }
+
+    DrmCrtc *crtc = new DrmCrtc(c, i);
+
+    drmModeFreeCrtc(c);
+
+    if (!crtc) {
+      ALOGE("Failed to allocate crtc %d", res->crtcs[i]);
+      ret = -ENOMEM;
+      break;
+    }
+    crtcs_.push_back(crtc);
+  }
+
+  for (int i = 0; !ret && i < res->count_encoders; ++i) {
+    drmModeEncoderPtr e = drmModeGetEncoder(fd_, res->encoders[i]);
+    if (!e) {
+      ALOGE("Failed to get encoder %d", res->encoders[i]);
+      ret = -ENODEV;
+      break;
+    }
+
+    std::vector<DrmCrtc *> possible_crtcs;
+    DrmCrtc *current_crtc = NULL;
+    for (std::vector<DrmCrtc *>::const_iterator iter = crtcs_.begin();
+         iter != crtcs_.end(); ++iter) {
+      if ((1 << (*iter)->pipe()) & e->possible_crtcs)
+        possible_crtcs.push_back(*iter);
+
+      if ((*iter)->id() == e->crtc_id)
+        current_crtc = (*iter);
+    }
+
+    DrmEncoder *enc = new DrmEncoder(e, current_crtc, possible_crtcs);
+
+    drmModeFreeEncoder(e);
+
+    if (!enc) {
+      ALOGE("Failed to allocate enc %d", res->encoders[i]);
+      ret = -ENOMEM;
+      break;
+    }
+    encoders_.push_back(enc);
+  }
+
+  for (int i = 0; !ret && i < res->count_connectors; ++i) {
+    drmModeConnectorPtr c = drmModeGetConnector(fd_, res->connectors[i]);
+    if (!c) {
+      ALOGE("Failed to get connector %d", res->connectors[i]);
+      ret = -ENODEV;
+      break;
+    }
+
+    std::vector<DrmEncoder *> possible_encoders;
+    DrmEncoder *current_encoder = NULL;
+    for (int j = 0; j < c->count_encoders; ++j) {
+      for (std::vector<DrmEncoder *>::const_iterator iter = encoders_.begin();
+           iter != encoders_.end(); ++iter) {
+        if ((*iter)->id() == c->encoders[j])
+          possible_encoders.push_back((*iter));
+        if ((*iter)->id() == c->encoder_id)
+          current_encoder = *iter;
+      }
+    }
+
+    DrmConnector *conn =
+        new DrmConnector(this, c, current_encoder, possible_encoders);
+
+    drmModeFreeConnector(c);
+
+    if (!conn) {
+      ALOGE("Failed to allocate conn %d", res->connectors[i]);
+      ret = -ENOMEM;
+      break;
+    }
+
+    ret = conn->Init();
+    if (ret) {
+      ALOGE("Init connector %d failed", res->connectors[i]);
+      delete conn;
+      break;
+    }
+    connectors_.push_back(conn);
+
+    if (conn->built_in() && !found_primary) {
+      conn->set_display(0);
+      found_primary = true;
+    } else {
+      conn->set_display(display_num);
+      ++display_num;
+    }
+  }
+  if (res)
+    drmModeFreeResources(res);
+
+  // Catch-all for the above loops
+  if (ret)
+    return ret;
+
+  drmModePlaneResPtr plane_res = drmModeGetPlaneResources(fd_);
+  if (!plane_res) {
+    ALOGE("Failed to get plane resources");
+    return -ENOENT;
+  }
+
+  for (uint32_t i = 0; i < plane_res->count_planes; ++i) {
+    drmModePlanePtr p = drmModeGetPlane(fd_, plane_res->planes[i]);
+    if (!p) {
+      ALOGE("Failed to get plane %d", plane_res->planes[i]);
+      ret = -ENODEV;
+      break;
+    }
+
+    DrmPlane *plane = new DrmPlane(this, p);
+
+    drmModeFreePlane(p);
+
+    if (!plane) {
+      ALOGE("Allocate plane %d failed", plane_res->planes[i]);
+      ret = -ENOMEM;
+      break;
+    }
+
+    ret = plane->Init();
+    if (ret) {
+      ALOGE("Init plane %d failed", plane_res->planes[i]);
+      delete plane;
+      break;
+    }
+
+    planes_.push_back(plane);
+  }
+  drmModeFreePlaneResources(plane_res);
+  if (ret)
+    return ret;
+
+  return 0;
+}
+
+int DrmResources::fd() const {
+  return fd_;
+}
+
+DrmResources::ConnectorIter DrmResources::begin_connectors() const {
+  return connectors_.begin();
+}
+
+DrmResources::ConnectorIter DrmResources::end_connectors() const {
+  return connectors_.end();
+}
+
+DrmConnector *DrmResources::GetConnectorForDisplay(int display) const {
+  for (ConnectorIter iter = connectors_.begin(); iter != connectors_.end();
+       ++iter) {
+    if ((*iter)->display() == display)
+      return *iter;
+  }
+  return NULL;
+}
+
+DrmCrtc *DrmResources::GetCrtcForDisplay(int display) const {
+  for (std::vector<DrmCrtc *>::const_iterator iter = crtcs_.begin();
+       iter != crtcs_.end(); ++iter) {
+    if ((*iter)->display() == display)
+      return *iter;
+  }
+  return NULL;
+}
+
+DrmResources::PlaneIter DrmResources::begin_planes() const {
+  return planes_.begin();
+}
+
+DrmResources::PlaneIter DrmResources::end_planes() const {
+  return planes_.end();
+}
+
+DrmPlane *DrmResources::GetPlane(uint32_t id) const {
+  for (std::vector<DrmPlane *>::const_iterator iter = planes_.begin();
+       iter != planes_.end(); ++iter) {
+    if ((*iter)->id() == id)
+      return *iter;
+  }
+  return NULL;
+}
+
+uint32_t DrmResources::next_mode_id() {
+  return ++mode_id_;
+}
+
+int DrmResources::TryEncoderForDisplay(int display, DrmEncoder *enc) {
+  /* First try to use the currently-bound crtc */
+  DrmCrtc *crtc = enc->crtc();
+  if (crtc && crtc->can_bind(display)) {
+    crtc->set_display(display);
+    return 0;
+  }
+
+  /* Try to find a possible crtc which will work */
+  for (DrmEncoder::CrtcIter iter = enc->begin_possible_crtcs();
+       iter != enc->end_possible_crtcs(); ++iter) {
+    /* We've already tried this earlier */
+    if (*iter == enc->crtc())
+      continue;
+
+    if ((*iter)->can_bind(display)) {
+      enc->set_crtc(*iter);
+      (*iter)->set_display(display);
+      return 0;
+    }
+  }
+
+  /* We can't use the encoder, but nothing went wrong, try another one */
+  return -EAGAIN;
+}
+
+int DrmResources::SetDisplayActiveMode(int display, uint32_t mode_id) {
+  DrmEncoder *enc;
+  int ret;
+
+  DrmConnector *con = GetConnectorForDisplay(display);
+  if (!con) {
+    ALOGE("Could not locate connector for display %d", display);
+    return -ENODEV;
+  }
+
+  /* Try to use current setup first */
+  enc = con->encoder();
+  if (enc) {
+    ret = TryEncoderForDisplay(display, enc);
+    if (!ret) {
+      con->set_encoder(enc);
+      return con->set_active_mode(mode_id);
+    } else if (ret != -EAGAIN) {
+      ALOGE("Could not set mode %d/%d", display, ret);
+      return ret;
+    }
+  }
+
+  for (DrmConnector::EncoderIter iter = con->begin_possible_encoders();
+       iter != con->end_possible_encoders(); ++iter) {
+    ret = TryEncoderForDisplay(display, *iter);
+    if (!ret) {
+      con->set_encoder(*iter);
+      return con->set_active_mode(mode_id);
+    } else if (ret != -EAGAIN) {
+      ALOGE("Could not set mode %d/%d", display, ret);
+      return ret;
+    }
+  }
+
+  ALOGE("Could not find a suitable encoder/crtc for display %d", display);
+  return -EINVAL;
+}
+
+int DrmResources::SetDpmsMode(int display, uint64_t mode) {
+  if (mode != DRM_MODE_DPMS_ON && mode != DRM_MODE_DPMS_OFF) {
+    ALOGE("Invalid dpms mode %d", mode);
+    return -EINVAL;
+  }
+
+  DrmCrtc *crtc = GetCrtcForDisplay(display);
+  if (!crtc) {
+    ALOGE("Failed to get DrmCrtc for display %d", display);
+    return -ENODEV;
+  }
+  crtc->set_requires_modeset(true);
+
+  DrmConnector *c = GetConnectorForDisplay(display);
+  if (!c) {
+    ALOGE("Failed to get DrmConnector for display %d", display);
+    return -ENODEV;
+  }
+
+  const DrmProperty &prop = c->dpms_property();
+  int ret = drmModeConnectorSetProperty(fd_, c->id(), prop.id(), mode);
+  if (ret) {
+    ALOGE("Failed to set DPMS property for connector %d", c->id());
+    return ret;
+  }
+
+  return 0;
+}
+
+int DrmResources::GetProperty(uint32_t obj_id, uint32_t obj_type,
+                              const char *prop_name, DrmProperty *property) {
+  drmModeObjectPropertiesPtr props;
+
+  props = drmModeObjectGetProperties(fd_, obj_id, obj_type);
+  if (!props) {
+    ALOGE("Failed to get properties for %d/%x", obj_id, obj_type);
+    return -ENODEV;
+  }
+
+  bool found = false;
+  for (int i = 0; !found && (size_t)i < props->count_props; ++i) {
+    drmModePropertyPtr p = drmModeGetProperty(fd_, props->props[i]);
+    if (!strcmp(p->name, prop_name)) {
+      property->Init(p, props->prop_values[i]);
+      found = true;
+    }
+    drmModeFreeProperty(p);
+  }
+
+  drmModeFreeObjectProperties(props);
+  return found ? 0 : -ENOENT;
+}
+
+int DrmResources::GetPlaneProperty(const DrmPlane &plane, const char *prop_name,
+                                   DrmProperty *property) {
+  return GetProperty(plane.id(), DRM_MODE_OBJECT_PLANE, prop_name, property);
+}
+
+int DrmResources::GetConnectorProperty(const DrmConnector &connector,
+                                       const char *prop_name,
+                                       DrmProperty *property) {
+  return GetProperty(connector.id(), DRM_MODE_OBJECT_CONNECTOR, prop_name,
+                     property);
+}
+}