#include "drmconnector.h"
#include "drmcrtc.h"
#include "drmencoder.h"
+#include "drmeventlistener.h"
#include "drmplane.h"
#include "drmresources.h"
+#include <cinttypes>
#include <errno.h>
#include <fcntl.h>
#include <stdint.h>
#include <xf86drm.h>
#include <xf86drmMode.h>
-#include <cutils/log.h>
+#include <log/log.h>
#include <cutils/properties.h>
namespace android {
-DrmResources::DrmResources() : fd_(-1), mode_id_(0), compositor_(this) {
+DrmResources::DrmResources() : compositor_(this), event_listener_(this) {
}
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_);
+ event_listener_.Exit();
}
int DrmResources::Init() {
property_get("hwc.drm.device", path, "/dev/dri/card0");
/* TODO: Use drmOpenControl here instead */
- fd_ = open(path, O_RDWR);
- if (fd_ < 0) {
+ fd_.Set(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);
+ 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);
+ ret = drmSetClientCap(fd(), DRM_CLIENT_CAP_ATOMIC, 1);
if (ret) {
ALOGE("Failed to set atomic cap %d", ret);
return ret;
}
- drmModeResPtr res = drmModeGetResources(fd_);
+ drmModeResPtr res = drmModeGetResources(fd());
if (!res) {
ALOGE("Failed to get DrmResources resources");
return -ENODEV;
}
+ min_resolution_ =
+ std::pair<uint32_t, uint32_t>(res->min_width, res->min_height);
+ max_resolution_ =
+ std::pair<uint32_t, uint32_t>(res->max_width, res->max_height);
+
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]);
+ 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(this, c, i);
-
+ std::unique_ptr<DrmCrtc> crtc(new DrmCrtc(this, c, i));
drmModeFreeCrtc(c);
- if (!crtc) {
- ALOGE("Failed to allocate crtc %d", res->crtcs[i]);
- ret = -ENOMEM;
- break;
- }
-
ret = crtc->Init();
if (ret) {
ALOGE("Failed to initialize crtc %d", res->crtcs[i]);
- delete crtc;
break;
}
- crtcs_.push_back(crtc);
+ crtcs_.emplace_back(std::move(crtc));
}
for (int i = 0; !ret && i < res->count_encoders; ++i) {
- drmModeEncoderPtr e = drmModeGetEncoder(fd_, res->encoders[i]);
+ drmModeEncoderPtr e = drmModeGetEncoder(fd(), res->encoders[i]);
if (!e) {
ALOGE("Failed to get encoder %d", res->encoders[i]);
ret = -ENODEV;
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);
+ for (auto &crtc : crtcs_) {
+ if ((1 << crtc->pipe()) & e->possible_crtcs)
+ possible_crtcs.push_back(crtc.get());
- if ((*iter)->id() == e->crtc_id)
- current_crtc = (*iter);
+ if (crtc->id() == e->crtc_id)
+ current_crtc = crtc.get();
}
- DrmEncoder *enc = new DrmEncoder(e, current_crtc, possible_crtcs);
+ std::unique_ptr<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);
+ encoders_.emplace_back(std::move(enc));
}
for (int i = 0; !ret && i < res->count_connectors; ++i) {
- drmModeConnectorPtr c = drmModeGetConnector(fd_, res->connectors[i]);
+ drmModeConnectorPtr c = drmModeGetConnector(fd(), res->connectors[i]);
if (!c) {
ALOGE("Failed to get connector %d", res->connectors[i]);
ret = -ENODEV;
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;
+ for (auto &encoder : encoders_) {
+ if (encoder->id() == c->encoders[j])
+ possible_encoders.push_back(encoder.get());
+ if (encoder->id() == c->encoder_id)
+ current_encoder = encoder.get();
}
}
- DrmConnector *conn =
- new DrmConnector(this, c, current_encoder, possible_encoders);
+ std::unique_ptr<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) {
+ connectors_.emplace_back(std::move(conn));
+ }
+
+ // First look for primary amongst internal connectors
+ for (auto &conn : connectors_) {
+ if (conn->state() == DRM_MODE_CONNECTED && conn->internal() && !found_primary) {
conn->set_display(0);
found_primary = true;
} else {
++display_num;
}
}
+
+ // Then look for primary amongst external connectors
+ for (auto &conn : connectors_) {
+ if (conn->state() == DRM_MODE_CONNECTED && conn->external() && !found_primary) {
+ conn->set_display(0);
+ found_primary = true;
+ }
+ }
+
if (res)
drmModeFreeResources(res);
if (ret)
return ret;
- drmModePlaneResPtr plane_res = drmModeGetPlaneResources(fd_);
+ 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]);
+ 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);
+ std::unique_ptr<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);
+ planes_.emplace_back(std::move(plane));
}
drmModeFreePlaneResources(plane_res);
if (ret)
return ret;
- return compositor_.Init();
-}
-
-int DrmResources::fd() const {
- return fd_;
-}
+ ret = compositor_.Init();
+ if (ret)
+ return ret;
-DrmResources::ConnectorIter DrmResources::begin_connectors() const {
- return connectors_.begin();
-}
+ ret = event_listener_.Init();
+ if (ret) {
+ ALOGE("Can't initialize event listener %d", ret);
+ return ret;
+ }
-DrmResources::ConnectorIter DrmResources::end_connectors() const {
- return connectors_.end();
+ for (auto &conn : connectors_) {
+ ret = CreateDisplayPipe(conn.get());
+ if (ret) {
+ ALOGE("Failed CreateDisplayPipe %d with %d", conn->id(), ret);
+ return ret;
+ }
+ }
+ return 0;
}
DrmConnector *DrmResources::GetConnectorForDisplay(int display) const {
- for (ConnectorIter iter = connectors_.begin(); iter != connectors_.end();
- ++iter) {
- if ((*iter)->display() == display)
- return *iter;
+ for (auto &conn : connectors_) {
+ if (conn->display() == display)
+ return conn.get();
}
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;
+ for (auto &crtc : crtcs_) {
+ if (crtc->display() == display)
+ return crtc.get();
}
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;
+ for (auto &plane : planes_) {
+ if (plane->id() == id)
+ return plane.get();
}
return NULL;
}
+const std::vector<std::unique_ptr<DrmCrtc>> & DrmResources::crtcs() const {
+ return crtcs_;
+}
+
uint32_t DrmResources::next_mode_id() {
return ++mode_id_;
}
}
/* Try to find a possible crtc which will work */
- for (DrmEncoder::CrtcIter iter = enc->begin_possible_crtcs();
- iter != enc->end_possible_crtcs(); ++iter) {
+ for (DrmCrtc *crtc : enc->possible_crtcs()) {
/* We've already tried this earlier */
- if (*iter == enc->crtc())
+ if (crtc == enc->crtc())
continue;
- if ((*iter)->can_bind(display)) {
- enc->set_crtc(*iter);
- (*iter)->set_display(display);
+ if (crtc->can_bind(display)) {
+ enc->set_crtc(crtc);
+ crtc->set_display(display);
return 0;
}
}
int DrmResources::CreateDisplayPipe(DrmConnector *connector) {
int display = connector->display();
+
+ // skip not connected
+ if (connector->state() == DRM_MODE_DISCONNECTED)
+ return 0;
+
/* Try to use current setup first */
if (connector->encoder()) {
int ret = TryEncoderForDisplay(display, connector->encoder());
}
}
- for (DrmConnector::EncoderIter iter = connector->begin_possible_encoders();
- iter != connector->end_possible_encoders(); ++iter) {
- int ret = TryEncoderForDisplay(display, *iter);
+ for (DrmEncoder *enc : connector->possible_encoders()) {
+ int ret = TryEncoderForDisplay(display, enc);
if (!ret) {
- connector->set_encoder(*iter);
+ connector->set_encoder(enc);
return 0;
} else if (ret != -EAGAIN) {
ALOGE("Could not set mode %d/%d", display, ret);
create_blob.length = length;
create_blob.data = (__u64)data;
- int ret = drmIoctl(fd_, DRM_IOCTL_MODE_CREATEPROPBLOB, &create_blob);
+ int ret = drmIoctl(fd(), DRM_IOCTL_MODE_CREATEPROPBLOB, &create_blob);
if (ret) {
ALOGE("Failed to create mode property blob %d", ret);
return ret;
}
int DrmResources::DestroyPropertyBlob(uint32_t blob_id) {
+ if (!blob_id)
+ return 0;
+
struct drm_mode_destroy_blob destroy_blob;
memset(&destroy_blob, 0, sizeof(destroy_blob));
destroy_blob.blob_id = (__u32)blob_id;
- int ret = drmIoctl(fd_, DRM_IOCTL_MODE_DESTROYPROPBLOB, &destroy_blob);
+ int ret = drmIoctl(fd(), DRM_IOCTL_MODE_DESTROYPROPBLOB, &destroy_blob);
if (ret) {
- ALOGE("Failed to destroy mode property blob %d", ret);
+ ALOGE("Failed to destroy mode property blob %" PRIu32 "/%d", blob_id, ret);
return ret;
}
return 0;
}
int DrmResources::SetDisplayActiveMode(int display, const DrmMode &mode) {
- DrmConnector *connector = GetConnectorForDisplay(display);
- if (!connector) {
- ALOGE("Could not locate connector for display %d", display);
- return -ENODEV;
- }
-
- int ret = CreateDisplayPipe(connector);
- if (ret) {
- ALOGE("Failed CreateDisplayPipe with %d", ret);
- return ret;
- }
-
- DrmCrtc *crtc = connector->encoder()->crtc();
- DrmProperty old_mode;
- ret = GetCrtcProperty(*crtc, crtc->mode_property().name().c_str(), &old_mode);
- if (ret) {
- ALOGE("Failed to get old mode property from crtc %d", crtc->id());
- return ret;
- }
-
- struct drm_mode_modeinfo drm_mode;
- memset(&drm_mode, 0, sizeof(drm_mode));
- mode.ToDrmModeModeInfo(&drm_mode);
-
- uint32_t blob_id;
- ret =
- CreatePropertyBlob(&drm_mode, sizeof(struct drm_mode_modeinfo), &blob_id);
- if (ret) {
- ALOGE("Failed to create mode property blob %d", ret);
- return ret;
- }
-
- drmModePropertySetPtr pset = drmModePropertySetAlloc();
- if (!pset) {
- ALOGE("Failed to allocate property set");
- DestroyPropertyBlob(blob_id);
+ std::unique_ptr<DrmComposition> comp(compositor_.CreateComposition(NULL));
+ if (!comp) {
+ ALOGE("Failed to create composition for dpms on %d", display);
return -ENOMEM;
}
-
- ret = drmModePropertySetAdd(pset, crtc->id(), crtc->mode_property().id(),
- blob_id) ||
- drmModePropertySetAdd(pset, connector->id(),
- connector->crtc_id_property().id(), crtc->id());
+ int ret = comp->SetDisplayMode(display, mode);
if (ret) {
- ALOGE("Failed to add blob %d to pset", blob_id);
- DestroyPropertyBlob(blob_id);
- drmModePropertySetFree(pset);
+ ALOGE("Failed to add mode to composition on %d %d", display, ret);
return ret;
}
-
- ret =
- drmModePropertySetCommit(fd_, DRM_MODE_ATOMIC_ALLOW_MODESET, NULL, pset);
-
- drmModePropertySetFree(pset);
-
- if (ret) {
- ALOGE("Failed to commit pset ret=%d\n", ret);
- DestroyPropertyBlob(blob_id);
- return ret;
- }
-
- connector->set_active_mode(mode);
-
- uint64_t old_blob_id;
- ret = old_mode.value(&old_blob_id);
- if (ret) {
- ALOGE("Could not get old blob id value %d", ret);
- return ret;
- }
- if (!old_blob_id)
- return 0;
-
- ret = DestroyPropertyBlob(old_blob_id);
+ ret = compositor_.QueueComposition(std::move(comp));
if (ret) {
- ALOGE("Failed to destroy old mode property blob", old_blob_id);
+ ALOGE("Failed to queue dpms composition on %d %d", display, ret);
return ret;
}
-
return 0;
}
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);
+ ALOGE("Invalid dpms mode %" PRIu64, mode);
return -EINVAL;
}
- DrmConnector *c = GetConnectorForDisplay(display);
- if (!c) {
- ALOGE("Failed to get DrmConnector for display %d", display);
- return -ENODEV;
+ std::unique_ptr<DrmComposition> comp(compositor_.CreateComposition(NULL));
+ if (!comp) {
+ ALOGE("Failed to create composition for dpms on %d", display);
+ return -ENOMEM;
}
-
- const DrmProperty &prop = c->dpms_property();
- int ret = drmModeConnectorSetProperty(fd_, c->id(), prop.id(), mode);
+ int ret = comp->SetDpmsMode(display, mode);
if (ret) {
- ALOGE("Failed to set DPMS property for connector %d", c->id());
+ ALOGE("Failed to add dpms %" PRIu64 " to composition on %d %d", mode,
+ display, ret);
+ return ret;
+ }
+ ret = compositor_.QueueComposition(std::move(comp));
+ if (ret) {
+ ALOGE("Failed to queue dpms composition on %d %d", display, ret);
return ret;
}
-
return 0;
}
return &compositor_;
}
+DrmEventListener *DrmResources::event_listener() {
+ return &event_listener_;
+}
+
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);
+ 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]);
+ drmModePropertyPtr p = drmModeGetProperty(fd(), props->props[i]);
if (!strcmp(p->name, prop_name)) {
property->Init(p, props->prop_values[i]);
found = true;
OSDN Git Service
