* limitations under the License.
*/
+#define ATRACE_TAG ATRACE_TAG_GRAPHICS
#define LOG_TAG "hwcomposer-drm"
#include "drm_hwcomposer.h"
+#include "drmresources.h"
+#include "importer.h"
+#include "virtualcompositorworker.h"
+#include "vsyncworker.h"
+
+#include <stdlib.h>
+
+#include <map>
+#include <vector>
+#include <sstream>
#include <errno.h>
#include <fcntl.h>
#include <pthread.h>
-#include <stdlib.h>
#include <sys/param.h>
#include <sys/resource.h>
-
-#include <list>
-
#include <xf86drm.h>
#include <xf86drmMode.h>
#include <hardware/hwcomposer.h>
#include <sw_sync.h>
#include <sync/sync.h>
+#include <utils/Trace.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
+#define HWC_FB_BUFFERS 3
-static const uint32_t panel_types[] = {
- DRM_MODE_CONNECTOR_LVDS, DRM_MODE_CONNECTOR_eDP, DRM_MODE_CONNECTOR_DSI,
-};
-
-struct hwc_worker {
- pthread_t thread;
- pthread_mutex_t lock;
- pthread_cond_t cond;
- bool exit;
-};
+namespace android {
-struct hwc_drm_display {
- struct hwc_context_t *ctx;
- int display;
+class DummySwSyncTimeline {
+ public:
+ int Init() {
+ int ret = timeline_fd_.Set(sw_sync_timeline_create());
+ if (ret < 0)
+ return ret;
+ return 0;
+ }
- uint32_t connector_id;
+ 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;
+ }
- drmModeModeInfoPtr configs;
- uint32_t num_configs;
+ UniqueFd ret_fd(ret);
- drmModeModeInfo active_mode;
- uint32_t active_crtc;
- int active_pipe;
- bool initial_modeset_required;
+ ret = sw_sync_timeline_inc(timeline_fd_.get(), 1);
+ if (ret) {
+ ALOGE("Failed to increment dummy sync timeline %d", ret);
+ return ret;
+ }
- struct hwc_worker set_worker;
+ ++timeline_pt_;
+ return ret_fd;
+ }
- std::list<struct hwc_drm_bo> buf_queue;
- struct hwc_drm_bo front;
- pthread_mutex_t flip_lock;
- pthread_cond_t flip_cond;
+ private:
+ UniqueFd timeline_fd_;
+ int timeline_pt_ = 0;
+};
- int timeline_fd;
- unsigned timeline_next;
+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_);
+ }
- bool enable_vsync_events;
- unsigned int vsync_sequence;
-};
+ CheckedOutputFd &operator=(const CheckedOutputFd &rhs) = delete;
-struct hwc_context_t {
- hwc_composer_device_1_t device;
+ ~CheckedOutputFd() {
+ if (fd_ == NULL)
+ return;
- int fd;
+ if (*fd_ >= 0)
+ return;
- hwc_procs_t const *procs;
- struct hwc_import_context *import_ctx;
+ *fd_ = timeline_.CreateDummyFence().Release();
- struct hwc_drm_display displays[MAX_NUM_DISPLAYS];
- int num_displays;
+ if (*fd_ < 0)
+ ALOGE("Failed to fill %s (%p == %d) before destruction",
+ description_.c_str(), fd_, *fd_);
+ }
- struct hwc_worker event_worker;
+ private:
+ int *fd_ = NULL;
+ std::string description_;
+ DummySwSyncTimeline &timeline_;
};
-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;
-}
+typedef struct hwc_drm_display {
+ struct hwc_context_t *ctx;
+ int display;
-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");
+ std::vector<uint32_t> config_ids;
- /* TODO: Support sideband compositions */
- } else if (layer->compositionType == HWC_SIDEBAND) {
- layer->compositionType = HWC_FRAMEBUFFER;
- ALOGV("Can't handle sideband content yet");
- }
+ VSyncWorker vsync_worker;
+} hwc_drm_display_t;
- layer->hints = 0;
+struct hwc_context_t {
+ // map of display:hwc_drm_display_t
+ typedef std::map<int, hwc_drm_display_t> DisplayMap;
+ typedef DisplayMap::iterator DisplayMapIter;
- /* TODO: Handle cursor by setting compositionType=HWC_CURSOR_OVERLAY */
- if (layer->flags & HWC_IS_CURSOR_LAYER) {
- ALOGV("Can't handle async cursors yet");
+ hwc_context_t() : procs(NULL), importer(NULL), use_framebuffer_target(false) {
}
- /* TODO: Handle transformations */
- if (layer->transform) {
- ALOGV("Can't handle transformations yet");
+ ~hwc_context_t() {
+ virtual_compositor_worker.Exit();
+ delete importer;
}
- /* TODO: Handle blending & plane alpha*/
- if (layer->blending == HWC_BLENDING_PREMULT ||
- layer->blending == HWC_BLENDING_COVERAGE) {
- ALOGV("Can't handle blending yet");
- }
+ hwc_composer_device_1_t device;
+ hwc_procs_t const *procs;
- /* TODO: Handle cropping & scaling */
+ DisplayMap displays;
+ DrmResources drm;
+ Importer *importer;
+ const gralloc_module_t *gralloc;
+ DummySwSyncTimeline dummy_timeline;
+ bool use_framebuffer_target;
+ VirtualCompositorWorker virtual_compositor_worker;
+};
- return 0;
-}
+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;
-static int hwc_prepare(hwc_composer_device_1_t * /* dev */, size_t num_displays,
- hwc_display_contents_1_t **display_contents) {
- /* TODO: Check flags for HWC_GEOMETRY_CHANGED */
+ 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);
- for (int i = 0; i < (int)num_displays && i < MAX_NUM_DISPLAYS; ++i) {
- if (!display_contents[i])
- continue;
+ return new_handle;
+}
- for (int j = 0; j < (int)display_contents[i]->numHwLayers; ++j) {
- int ret = hwc_prepare_layer(&display_contents[i]->hwLayers[j]);
- if (ret) {
- ALOGE("Failed to prepare layer %d:%d", j, i);
- 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);
+}
+
+OutputFd &OutputFd::operator=(OutputFd &&rhs) {
+ if (fd_ == NULL) {
+ std::swap(fd_, rhs.fd_);
+ } else {
+ if (*fd_ < 0) {
+ ALOGE("Failed to fill OutputFd %p before assignment", fd_);
}
+ fd_ = rhs.fd_;
+ rhs.fd_ = NULL;
}
- return 0;
+ return *this;
}
-static int hwc_queue_vblank_event(struct hwc_drm_display *hd) {
- if (hd->active_pipe == -1) {
- ALOGE("Active pipe is -1 disp=%d", hd->display);
- return -EINVAL;
+const hwc_drm_bo *DrmHwcBuffer::operator->() const {
+ if (importer_ == NULL) {
+ ALOGE("Access of non-existent BO");
+ exit(1);
+ return NULL;
}
+ return &bo_;
+}
- drmVBlank vblank;
- memset(&vblank, 0, sizeof(vblank));
-
- uint32_t high_crtc = (hd->active_pipe << DRM_VBLANK_HIGH_CRTC_SHIFT);
- vblank.request.type = (drmVBlankSeqType)(
- DRM_VBLANK_ABSOLUTE | DRM_VBLANK_NEXTONMISS | DRM_VBLANK_EVENT |
- (high_crtc & DRM_VBLANK_HIGH_CRTC_MASK));
- vblank.request.signal = (unsigned long)hd;
- vblank.request.sequence = hd->vsync_sequence + 1;
-
- int ret = drmWaitVBlank(hd->ctx->fd, &vblank);
- if (ret) {
- ALOGE("Failed to wait for vblank %d", ret);
- return ret;
+void DrmHwcBuffer::Clear() {
+ if (importer_ != NULL) {
+ importer_->ReleaseBuffer(&bo_);
+ importer_ = NULL;
}
-
- return 0;
}
-static void hwc_vblank_event_handler(int /* fd */, unsigned int sequence,
- unsigned int tv_sec, unsigned int tv_usec,
- void *user_data) {
- struct hwc_drm_display *hd = (struct hwc_drm_display *)user_data;
+int DrmHwcBuffer::ImportBuffer(buffer_handle_t handle, Importer *importer) {
+ hwc_drm_bo tmp_bo;
- if (!hd->enable_vsync_events || !hd->ctx->procs->vsync)
- return;
+ int ret = importer->ImportBuffer(handle, &tmp_bo);
+ if (ret)
+ return ret;
- /*
- * Discard duplicate vsync (can happen when enabling vsync events while
- * already processing vsyncs).
- */
- if (sequence <= hd->vsync_sequence)
- return;
+ if (importer_ != NULL) {
+ importer_->ReleaseBuffer(&bo_);
+ }
- hd->vsync_sequence = sequence;
- int ret = hwc_queue_vblank_event(hd);
- if (ret)
- ALOGE("Failed to queue vblank event ret=%d", ret);
+ importer_ = importer;
- int64_t timestamp =
- (int64_t)tv_sec * 1000 * 1000 * 1000 + (int64_t)tv_usec * 1000;
- hd->ctx->procs->vsync(hd->ctx->procs, hd->display, timestamp);
-}
+ bo_ = tmp_bo;
-static void hwc_flip_event_handler(int /* fd */, unsigned int /* sequence */,
- unsigned int /* tv_sec */,
- unsigned int /* tv_usec */,
- void *user_data) {
- struct hwc_drm_display *hd = (struct hwc_drm_display *)user_data;
+ return 0;
+}
- int ret = pthread_mutex_lock(&hd->flip_lock);
- if (ret) {
- ALOGE("Failed to lock flip lock ret=%d", ret);
- return;
+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;
}
- ret = pthread_cond_signal(&hd->flip_cond);
- if (ret)
- ALOGE("Failed to signal flip condition ret=%d", ret);
-
- ret = pthread_mutex_unlock(&hd->flip_lock);
+ int ret = gralloc->registerBuffer(gralloc, handle_copy);
if (ret) {
- ALOGE("Failed to unlock flip lock ret=%d", ret);
- return;
+ ALOGE("Failed to register buffer handle %d", ret);
+ free_buffer_handle(handle_copy);
+ return ret;
}
-}
-
-static void *hwc_event_worker(void *arg) {
- setpriority(PRIO_PROCESS, 0, HAL_PRIORITY_URGENT_DISPLAY);
-
- struct hwc_context_t *ctx = (struct hwc_context_t *)arg;
- do {
- fd_set fds;
- FD_ZERO(&fds);
- FD_SET(ctx->fd, &fds);
- drmEventContext event_context;
- event_context.version = DRM_EVENT_CONTEXT_VERSION;
- event_context.page_flip_handler = hwc_flip_event_handler;
- event_context.vblank_handler = hwc_vblank_event_handler;
-
- int ret;
- do {
- ret = select(ctx->fd + 1, &fds, NULL, NULL, NULL);
- } while (ret == -1 && errno == EINTR);
-
- if (ret != 1) {
- ALOGE("Failed waiting for drm event\n");
- continue;
- }
+ Clear();
- drmHandleEvent(ctx->fd, &event_context);
- } while (true);
+ gralloc_ = gralloc;
+ handle_ = handle_copy;
- return NULL;
+ return 0;
}
-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);
+DrmHwcNativeHandle::~DrmHwcNativeHandle() {
+ Clear();
}
-static int hwc_modeset_required(struct hwc_drm_display *hd,
- bool *modeset_required) {
- if (hd->initial_modeset_required) {
- *modeset_required = true;
- hd->initial_modeset_required = false;
- return 0;
+void DrmHwcNativeHandle::Clear() {
+ if (gralloc_ != NULL && handle_ != NULL) {
+ gralloc_->unregisterBuffer(gralloc_, handle_);
+ free_buffer_handle(handle_);
+ gralloc_ = NULL;
+ handle_ = NULL;
}
+}
- drmModeCrtcPtr crtc;
- crtc = drmModeGetCrtc(hd->ctx->fd, hd->active_crtc);
- if (!crtc) {
- ALOGE("Failed to get crtc for display %d", hd->display);
- return -ENODEV;
- }
-
- drmModeModeInfoPtr m;
- m = &hd->active_mode;
-
- /* 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);
+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;
- return 0;
-}
+ 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);
-static int hwc_flip(struct hwc_drm_display *hd, struct hwc_drm_bo *buf) {
- bool modeset_required;
- int ret = hwc_modeset_required(hd, &modeset_required);
- if (ret) {
- ALOGE("Failed to determine if modeset is required %d", ret);
- return ret;
+ switch (sf_layer->transform) {
+ case 0:
+ transform = DrmHwcTransform::kIdentity;
+ break;
+ case HWC_TRANSFORM_FLIP_H:
+ transform = DrmHwcTransform::kFlipH;
+ break;
+ case HWC_TRANSFORM_FLIP_V:
+ transform = DrmHwcTransform::kFlipV;
+ break;
+ case HWC_TRANSFORM_ROT_90:
+ transform = DrmHwcTransform::kRotate90;
+ break;
+ case HWC_TRANSFORM_ROT_180:
+ transform = DrmHwcTransform::kRotate180;
+ break;
+ case HWC_TRANSFORM_ROT_270:
+ transform = DrmHwcTransform::kRotate270;
+ break;
+ default:
+ ALOGE("Invalid transform in hwc_layer_1_t %d", sf_layer->transform);
+ return -EINVAL;
}
- if (modeset_required) {
- ret = drmModeSetCrtc(hd->ctx->fd, hd->active_crtc, buf->fb_id, 0, 0,
- &hd->connector_id, 1, &hd->active_mode);
- if (ret) {
- ALOGE("Modeset failed for crtc %d", hd->active_crtc);
- return ret;
- }
- return 0;
+
+ 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;
}
- 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);
+ int ret = buffer.ImportBuffer(sf_layer->handle, importer);
+ if (ret)
return ret;
- }
- ret = pthread_cond_wait(&hd->flip_cond, &hd->flip_lock);
- if (ret) {
- ALOGE("Failed to wait on condition %d", ret);
+ ret = handle.CopyBufferHandle(sf_layer->handle, gralloc);
+ if (ret)
return ret;
- }
return 0;
}
-static int hwc_wait_and_set(struct hwc_drm_display *hd,
- struct hwc_drm_bo *buf) {
- int ret;
- if (buf->acquire_fence_fd >= 0) {
- ret = sync_wait(buf->acquire_fence_fd, -1);
- close(buf->acquire_fence_fd);
- buf->acquire_fence_fd = -1;
- if (ret) {
- ALOGE("Failed to wait for acquire %d", ret);
- return ret;
- }
- }
+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;
- ret = hwc_flip(hd, buf);
- if (ret) {
- ALOGE("Failed to perform flip\n");
- return ret;
- }
+ 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()));
+}
- if (hwc_import_bo_release(hd->ctx->fd, hd->ctx->import_ctx, &hd->front)) {
- struct drm_gem_close args;
- memset(&args, 0, sizeof(args));
- for (int i = 0; i < ARRAY_SIZE(hd->front.gem_handles); ++i) {
- if (!hd->front.gem_handles[i])
- continue;
+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;
- ret = pthread_mutex_lock(&hd->set_worker.lock);
- if (ret) {
- ALOGE("Failed to lock set lock in wait_and_set() %d", ret);
- continue;
+ char use_framebuffer_target[PROPERTY_VALUE_MAX];
+ property_get("hwc.drm.use_framebuffer_target", use_framebuffer_target, "0");
+ bool new_use_framebuffer_target = atoi(use_framebuffer_target);
+ if (ctx->use_framebuffer_target != new_use_framebuffer_target)
+ ALOGW("Starting to %s HWC_FRAMEBUFFER_TARGET",
+ new_use_framebuffer_target ? "use" : "not use");
+ ctx->use_framebuffer_target = new_use_framebuffer_target;
+
+ for (int i = 0; i < (int)num_displays; ++i) {
+ if (!display_contents[i])
+ continue;
+
+ bool use_framebuffer_target = ctx->use_framebuffer_target;
+ if (i == HWC_DISPLAY_VIRTUAL) {
+ use_framebuffer_target = true;
+ } else {
+ DrmCrtc *crtc = ctx->drm.GetCrtcForDisplay(i);
+ if (!crtc) {
+ ALOGE("No crtc for display %d", i);
+ return -ENODEV;
}
+ }
- /* check for duplicate handle in buf_queue */
- bool found = false;
- for (std::list<struct hwc_drm_bo>::iterator bi = hd->buf_queue.begin();
- bi != hd->buf_queue.end(); ++bi)
- for (int j = 0; j < ARRAY_SIZE(bi->gem_handles); ++j)
- if (hd->front.gem_handles[i] == bi->gem_handles[j])
- found = true;
-
- for (int j = 0; j < ARRAY_SIZE(buf->gem_handles); ++j)
- if (hd->front.gem_handles[i] == buf->gem_handles[j])
- found = true;
-
- if (!found) {
- args.handle = hd->front.gem_handles[i];
- drmIoctl(hd->ctx->fd, DRM_IOCTL_GEM_CLOSE, &args);
+ int num_layers = display_contents[i]->numHwLayers;
+ for (int j = 0; j < num_layers; j++) {
+ hwc_layer_1_t *layer = &display_contents[i]->hwLayers[j];
+
+ if (!use_framebuffer_target) {
+ 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;
+ }
}
- if (pthread_mutex_unlock(&hd->set_worker.lock))
- ALOGE("Failed to unlock set lock in wait_and_set() %d", ret);
}
}
- hd->front = *buf;
-
- return ret;
+ return 0;
}
-static void *hwc_set_worker(void *arg) {
- setpriority(PRIO_PROCESS, 0, HAL_PRIORITY_URGENT_DISPLAY);
+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;
- struct hwc_drm_display *hd = (struct hwc_drm_display *)arg;
- int ret = pthread_mutex_lock(&hd->flip_lock);
- if (ret) {
- ALOGE("Failed to lock flip lock ret=%d", ret);
- return NULL;
+ 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);
}
+}
- do {
- ret = pthread_mutex_lock(&hd->set_worker.lock);
- if (ret) {
- ALOGE("Failed to lock set lock %d", ret);
- return NULL;
- }
+static int hwc_set(hwc_composer_device_1_t *dev, size_t num_displays,
+ hwc_display_contents_1_t **sf_display_contents) {
+ ATRACE_CALL();
+ struct hwc_context_t *ctx = (struct hwc_context_t *)&dev->common;
+ int ret = 0;
- if (hd->set_worker.exit)
- break;
+ 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 (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);
- break;
- }
+ if (i == HWC_DISPLAY_VIRTUAL) {
+ ctx->virtual_compositor_worker.QueueComposite(dc);
+ continue;
}
- struct hwc_drm_bo buf;
- buf = hd->buf_queue.front();
- hd->buf_queue.pop_front();
+ 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);
- ret = pthread_mutex_unlock(&hd->set_worker.lock);
- if (ret) {
- ALOGE("Failed to unlock set lock %d", ret);
- return NULL;
- }
+ 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];
- ret = hwc_wait_and_set(hd, &buf);
- if (ret)
- ALOGE("Failed to wait and set %d", ret);
+ display_contents.layers.emplace_back();
+ DrmHwcLayer &layer = display_contents.layers.back();
- ret = sw_sync_timeline_inc(hd->timeline_fd, 1);
- if (ret)
- ALOGE("Failed to increment sync timeline %d", ret);
- } while (true);
-
- ret = pthread_mutex_unlock(&hd->set_worker.lock);
- if (ret)
- ALOGE("Failed to unlock set lock while exiting %d", ret);
+ if (sf_layer->flags & HWC_SKIP_LAYER)
+ continue;
- ret = pthread_mutex_unlock(&hd->flip_lock);
- if (ret)
- ALOGE("Failed to unlock flip lock ret=%d", ret);
+ if (!ctx->use_framebuffer_target) {
+ if (sf_layer->compositionType == HWC_OVERLAY)
+ indices_to_composite.push_back(j);
+ if (sf_layer->compositionType == HWC_FRAMEBUFFER_TARGET)
+ framebuffer_target_index = j;
+ } else {
+ if (sf_layer->compositionType == HWC_FRAMEBUFFER_TARGET)
+ indices_to_composite.push_back(j);
+ }
- return NULL;
-}
+ 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);
+ }
-static void hwc_close_fences(hwc_display_contents_1_t *display_contents) {
- for (int i = 0; i < (int)display_contents->numHwLayers; ++i) {
- hwc_layer_1_t *layer = &display_contents->hwLayers[i];
- if (layer->acquireFenceFd >= 0) {
- close(layer->acquireFenceFd);
- layer->acquireFenceFd = -1;
+ if (ctx->use_framebuffer_target) {
+ if (indices_to_composite.size() != 1) {
+ ALOGE("Expected 1 (got %d) layer with HWC_FRAMEBUFFER_TARGET",
+ indices_to_composite.size());
+ ret = -EINVAL;
+ }
+ } else {
+ 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 (display_contents->outbufAcquireFenceFd >= 0) {
- close(display_contents->outbufAcquireFenceFd);
- display_contents->outbufAcquireFenceFd = -1;
- }
-}
-static int hwc_set_display(hwc_context_t *ctx, int display,
- hwc_display_contents_1_t *display_contents) {
- struct hwc_drm_display *hd = NULL;
- int ret = hwc_get_drm_display(ctx, display, &hd);
- if (ret) {
- hwc_close_fences(display_contents);
+ if (ret)
return ret;
- }
- if (!hd->active_crtc) {
- ALOGE("There is no active crtc for display %d", display);
- hwc_close_fences(display_contents);
- return -ENOENT;
- }
+ 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])
+ continue;
- /*
- * TODO: We can only support one hw layer atm, so choose either the
- * first one or the framebuffer target.
- */
- hwc_layer_1_t *layer = NULL;
- if (!display_contents->numHwLayers) {
- return 0;
- } else if (display_contents->numHwLayers == 1) {
- layer = &display_contents->hwLayers[0];
- } else {
- int i;
- 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);
+ layers_map.emplace_back();
+ DrmCompositionDisplayLayersMap &map = layers_map.back();
+ map.display = i;
+ 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, ctx->gralloc);
+ if (ret) {
+ ALOGE("Failed to init composition from layer %d", ret);
+ return ret;
+ }
+ map.layers.emplace_back(std::move(layer));
}
}
- ret = pthread_mutex_lock(&hd->set_worker.lock);
- if (ret) {
- ALOGE("Failed to lock set lock in set() %d", ret);
- hwc_close_fences(display_contents);
- return ret;
+ std::unique_ptr<DrmComposition> composition(
+ ctx->drm.compositor()->CreateComposition(ctx->importer));
+ if (!composition) {
+ ALOGE("Drm composition init failed");
+ return -EINVAL;
}
- struct hwc_drm_bo buf;
- memset(&buf, 0, sizeof(buf));
- ret = hwc_import_bo_create(ctx->fd, ctx->import_ctx, layer->handle, &buf);
+ ret = composition->SetLayers(layers_map.size(), layers_map.data());
if (ret) {
- ALOGE("Failed to import handle to drm bo %d", ret);
- hwc_close_fences(display_contents);
- return ret;
+ return -EINVAL;
}
- buf.acquire_fence_fd = layer->acquireFenceFd;
- layer->acquireFenceFd = -1;
-
- /*
- * 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_back(buf);
-
- ret = pthread_cond_signal(&hd->set_worker.cond);
- if (ret)
- ALOGE("Failed to signal set worker %d", ret);
- if (pthread_mutex_unlock(&hd->set_worker.lock))
- ALOGE("Failed to unlock set lock in set()");
-
- hwc_close_fences(display_contents);
- return ret;
-}
+ ret = ctx->drm.compositor()->QueueComposition(std::move(composition));
+ if (ret) {
+ return -EINVAL;
+ }
-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;
+ for (size_t i = 0; i < num_displays; ++i) {
+ hwc_display_contents_1_t *dc = sf_display_contents[i];
+ if (!dc)
+ continue;
- int ret = 0;
- for (int i = 0; i < (int)num_displays && i < MAX_NUM_DISPLAYS; ++i) {
- if (display_contents[i])
- ret = hwc_set_display(ctx, i, display_contents[i]);
+ 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) {
- struct hwc_context_t *ctx = (struct hwc_context_t *)&dev->common;
- struct hwc_drm_display *hd = NULL;
- int 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;
- }
-
- hd->enable_vsync_events = !!enabled;
-
- if (!hd->enable_vsync_events)
- return 0;
-
- /*
- * Note that it's possible that the event worker is already waiting for
- * a vsync, and this will be a duplicate request. In that event, we'll
- * end up firing the event handler twice, and it will discard the second
- * event. Not ideal, but not worth introducing a bunch of additional
- * logic/locks/state for.
- */
- ret = hwc_queue_vblank_event(hd);
- if (ret) {
- ALOGE("Failed to queue vblank event ret=%d", ret);
- return ret;
- }
-
- return 0;
+ 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;
- struct hwc_drm_display *hd = NULL;
- int ret = hwc_get_drm_display(ctx, display, &hd);
- if (ret)
- return ret;
-
- drmModeConnectorPtr c = drmModeGetConnector(ctx->fd, hd->connector_id);
- if (!c) {
- ALOGE("Failed to get connector %d", display);
- return -ENODEV;
- }
-
- uint32_t dpms_prop = 0;
- for (int 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);
- drmModeFreeConnector(c);
- return -ENOENT;
- }
-
- uint64_t dpms_value = 0;
+ uint64_t dpmsValue = 0;
switch (mode) {
case HWC_POWER_MODE_OFF:
- dpms_value = DRM_MODE_DPMS_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:
- dpms_value = DRM_MODE_DPMS_ON;
+ dpmsValue = 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);
- drmModeFreeConnector(c);
- return ret;
- }
-
- drmModeFreeConnector(c);
- return 0;
+ return ctx->drm.SetDpmsMode(display, dpmsValue);
}
static int hwc_query(struct hwc_composer_device_1 * /* dev */, int what,
*value = 1000 * 1000 * 1000 / 60;
break;
case HWC_DISPLAY_TYPES_SUPPORTED:
- *value = HWC_DISPLAY_PRIMARY | HWC_DISPLAY_EXTERNAL;
+ *value = HWC_DISPLAY_PRIMARY | HWC_DISPLAY_EXTERNAL | HWC_DISPLAY_VIRTUAL;
break;
}
return 0;
struct hwc_context_t *ctx = (struct hwc_context_t *)&dev->common;
ctx->procs = procs;
+
+ for (hwc_context_t::DisplayMapIter iter = ctx->displays.begin();
+ iter != ctx->displays.end(); ++iter) {
+ iter->second.vsync_worker.SetProcs(procs);
+ }
}
static int hwc_get_display_configs(struct hwc_composer_device_1 *dev,
int display, uint32_t *configs,
- size_t *numConfigs) {
- if (!*numConfigs)
+ size_t *num_configs) {
+ if (!*num_configs)
return 0;
struct hwc_context_t *ctx = (struct hwc_context_t *)&dev->common;
- struct hwc_drm_display *hd = NULL;
- int ret = hwc_get_drm_display(ctx, display, &hd);
- if (ret)
- return ret;
+ hwc_drm_display_t *hd = &ctx->displays[display];
+ hd->config_ids.clear();
- drmModeConnectorPtr c = drmModeGetConnector(ctx->fd, hd->connector_id);
- if (!c) {
- ALOGE("Failed to get connector %d", display);
+ DrmConnector *connector = ctx->drm.GetConnectorForDisplay(display);
+ if (!connector) {
+ ALOGE("Failed to get connector for display %d", display);
return -ENODEV;
}
- if (hd->configs) {
- free(hd->configs);
- hd->configs = NULL;
- }
-
- if (c->connection == DRM_MODE_DISCONNECTED) {
- drmModeFreeConnector(c);
- return -ENODEV;
- }
-
- hd->configs =
- (drmModeModeInfoPtr)calloc(c->count_modes, sizeof(*hd->configs));
- if (!hd->configs) {
- ALOGE("Failed to allocate config list for display %d", display);
- hd->num_configs = 0;
- drmModeFreeConnector(c);
- return -ENOMEM;
- }
-
- for (int 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);
-
- drmModeFreeConnector(c);
- 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;
- int ret = hwc_get_drm_display(ctx, display, &hd);
- if (ret)
+ int ret = connector->UpdateModes();
+ if (ret) {
+ ALOGE("Failed to update display modes %d", ret);
return ret;
+ }
- /* Make sure the requested config is still valid for the display */
- drmModeModeInfoPtr m = NULL;
- for (int i = 0; i < connector->count_modes; ++i) {
- if (hwc_mode_is_equal(&connector->modes[i], &hd->configs[config_idx])) {
- m = &hd->configs[config_idx];
+ for (DrmConnector::ModeIter iter = connector->begin_modes();
+ iter != connector->end_modes(); ++iter) {
+ size_t idx = hd->config_ids.size();
+ if (idx == *num_configs)
break;
- }
+ hd->config_ids.push_back(iter->id());
+ configs[idx] = iter->id();
}
- if (!m)
- return -ENOENT;
-
- return 0;
+ *num_configs = hd->config_ids.size();
+ return *num_configs == 0 ? -1 : 0;
}
static int hwc_get_display_attributes(struct hwc_composer_device_1 *dev,
const uint32_t *attributes,
int32_t *values) {
struct hwc_context_t *ctx = (struct hwc_context_t *)&dev->common;
- struct hwc_drm_display *hd = NULL;
- int 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;
- }
-
- drmModeConnectorPtr c = drmModeGetConnector(ctx->fd, hd->connector_id);
+ DrmConnector *c = ctx->drm.GetConnectorForDisplay(display);
if (!c) {
- ALOGE("Failed to get connector %d", display);
+ ALOGE("Failed to get DrmConnector for display %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);
- drmModeFreeConnector(c);
- return ret;
+ DrmMode mode;
+ for (DrmConnector::ModeIter iter = c->begin_modes(); iter != c->end_modes();
+ ++iter) {
+ if (iter->id() == config) {
+ mode = *iter;
+ break;
+ }
+ }
+ if (mode.id() == 0) {
+ ALOGE("Failed to find active mode for display %d", display);
+ return -ENOENT;
}
- drmModeModeInfoPtr m = &hd->configs[config];
+ 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 / m->vrefresh;
+ values[i] = 1000 * 1000 * 1000 / mode.v_refresh();
break;
case HWC_DISPLAY_WIDTH:
- values[i] = m->hdisplay;
+ values[i] = mode.h_display();
break;
case HWC_DISPLAY_HEIGHT:
- values[i] = m->vdisplay;
+ values[i] = mode.v_display();
break;
case HWC_DISPLAY_DPI_X:
/* Dots per 1000 inches */
- values[i] = c->mmWidth ? (m->hdisplay * UM_PER_INCH) / c->mmWidth : 0;
+ 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] = c->mmHeight ? (m->vdisplay * UM_PER_INCH) / c->mmHeight : 0;
+ values[i] =
+ mm_height ? (mode.v_display() * UM_PER_INCH) / mm_height : 0;
break;
}
}
-
- drmModeFreeConnector(c);
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;
- struct hwc_drm_display *hd = NULL;
- int ret = hwc_get_drm_display(ctx, display, &hd);
- if (ret)
- return ret;
-
- /* Find the current mode in the config list */
- int index = -1;
- for (int i = 0; i < (int)hd->num_configs; ++i) {
- if (hwc_mode_is_equal(&hd->configs[i], &hd->active_mode)) {
- index = i;
- break;
- }
- }
- return index;
-}
-
-static bool hwc_crtc_is_bound(struct hwc_context_t *ctx, uint32_t crtc_id) {
- for (int 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 = drmModeGetEncoder(ctx->fd, encoder_id);
- if (!e) {
- ALOGE("Failed to get encoder for connector %d", encoder_id);
+ DrmConnector *c = ctx->drm.GetConnectorForDisplay(display);
+ if (!c) {
+ ALOGE("Failed to get DrmConnector for display %d", display);
return -ENODEV;
}
- /* First try to use the currently-bound crtc */
- int ret = 0;
- if (e->crtc_id) {
- if (!hwc_crtc_is_bound(ctx, e->crtc_id)) {
- *crtc_id = e->crtc_id;
- drmModeFreeEncoder(e);
- return 0;
- }
- }
-
- /* Try to find a possible crtc which will work */
- for (int 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];
- drmModeFreeEncoder(e);
- return 0;
- }
+ 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;
}
-
- /* We can't use the encoder, but nothing went wrong, try another one */
- drmModeFreeEncoder(e);
- return -EAGAIN;
+ 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;
- struct hwc_drm_display *hd = NULL;
- int ret = hwc_get_drm_display(ctx, display, &hd);
- if (ret)
- return ret;
-
- drmModeConnectorPtr 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);
- drmModeFreeConnector(c);
- return -ENODEV;
- }
-
- if (index >= c->count_modes) {
- ALOGE("Index is out-of-bounds %d/%d", index, c->count_modes);
- drmModeFreeConnector(c);
- return -ENOENT;
+ 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;
}
- drmModeResPtr r = drmModeGetResources(ctx->fd);
- if (!r) {
- ALOGE("Failed to get drm resources");
- drmModeFreeResources(r);
- drmModeFreeConnector(c);
+ DrmConnector *c = ctx->drm.GetConnectorForDisplay(display);
+ if (!c) {
+ ALOGE("Failed to get connector for display %d", display);
return -ENODEV;
}
-
- /* We no longer have an active_crtc */
- hd->active_crtc = 0;
- hd->active_pipe = -1;
-
- /* First, try to use the currently-connected encoder */
- uint32_t crtc_id = 0;
- 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);
- drmModeFreeResources(r);
- drmModeFreeConnector(c);
- return ret;
- }
- }
-
- /* We couldn't find a crtc with the attached encoder, try the others */
- if (!crtc_id) {
- for (int 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);
- drmModeFreeResources(r);
- drmModeFreeConnector(c);
- return ret;
- }
- }
- if (!crtc_id) {
- ALOGE("Couldn't find valid crtc to modeset");
- drmModeFreeConnector(c);
- drmModeFreeResources(r);
- return -EINVAL;
- }
- }
- drmModeFreeConnector(c);
-
- hd->active_crtc = crtc_id;
- memcpy(&hd->active_mode, &hd->configs[index], sizeof(hd->active_mode));
-
- /* Find the pipe corresponding to the crtc_id */
- for (int i = 0; i < r->count_crtcs; ++i) {
- /* We've already tried this earlier */
- if (r->crtcs[i] == crtc_id) {
- hd->active_pipe = i;
+ DrmMode mode;
+ for (DrmConnector::ModeIter iter = c->begin_modes(); iter != c->end_modes();
+ ++iter) {
+ if (iter->id() == hd->config_ids[index]) {
+ mode = *iter;
break;
}
}
- drmModeFreeResources(r);
- /* This should never happen... hehehe */
- if (hd->active_pipe == -1) {
- ALOGE("Active crtc was not found in resources!!");
- return -ENODEV;
+ if (mode.id() != hd->config_ids[index]) {
+ ALOGE("Could not find active mode for %d/%d", index, hd->config_ids[index]);
+ return -ENOENT;
}
-
- /* TODO: Once we have atomic, set the crtc timing info here */
- return 0;
-}
-
-static int hwc_destroy_worker(struct hwc_worker *worker) {
- int ret = pthread_mutex_lock(&worker->lock);
+ int ret = ctx->drm.SetDisplayActiveMode(display, mode);
if (ret) {
- ALOGE("Failed to lock in destroy() %d", ret);
+ ALOGE("Failed to set active config %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) {
- if (hwc_destroy_worker(&hd->set_worker))
- ALOGE("Destroy set worker failed");
-}
-
static int hwc_device_close(struct hw_device_t *dev) {
struct hwc_context_t *ctx = (struct hwc_context_t *)dev;
-
- for (int i = 0; i < MAX_NUM_DISPLAYS; ++i)
- hwc_destroy_display(&ctx->displays[i]);
-
- if (hwc_destroy_worker(&ctx->event_worker))
- ALOGE("Destroy event worker failed");
-
- drmClose(ctx->fd);
-
- int ret = hwc_import_destroy(ctx->import_ctx);
- if (ret)
- ALOGE("Could not destroy import %d", ret);
-
delete ctx;
-
- return 0;
-}
-
-static int hwc_initialize_worker(struct hwc_worker *worker,
- void *(*routine)(void *), void *arg) {
- int 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);
- pthread_cond_destroy(&worker->cond);
- return ret;
- }
-
- worker->exit = false;
-
- ret = pthread_create(&worker->thread, NULL, routine, arg);
- if (ret) {
- ALOGE("Could not create worker thread %d", ret);
- pthread_mutex_destroy(&worker->lock);
- pthread_cond_destroy(&worker->cond);
- return ret;
- }
return 0;
}
* 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(struct hwc_drm_display *hd) {
+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,
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 = hwc_get_drm_display(ctx, display, &hd);
- if (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;
- hd->active_pipe = -1;
- hd->initial_modeset_required = true;
- hd->connector_id = connector_id;
- hd->enable_vsync_events = false;
- hd->vsync_sequence = 0;
-
- ret = pthread_mutex_init(&hd->flip_lock, NULL);
- if (ret) {
- ALOGE("Failed to initialize flip lock %d", ret);
- return ret;
- }
-
- ret = pthread_cond_init(&hd->flip_cond, NULL);
- if (ret) {
- ALOGE("Failed to intiialize flip condition %d", ret);
- pthread_mutex_destroy(&hd->flip_lock);
- return ret;
- }
- ret = sw_sync_timeline_create();
- if (ret < 0) {
- ALOGE("Failed to create sw sync timeline %d", ret);
- pthread_cond_destroy(&hd->flip_cond);
- pthread_mutex_destroy(&hd->flip_lock);
- return ret;
- }
- hd->timeline_fd = ret;
-
- /*
- * Initialize timeline_next to 1, because point 0 will be the very first
- * set operation. Since we increment every time set() is called,
- * initializing to 0 would cause an off-by-one error where
- * surfaceflinger would composite on the front buffer.
- */
- hd->timeline_next = 1;
-
- ret = hwc_set_initial_config(hd);
+ int ret = hwc_set_initial_config(hd);
if (ret) {
ALOGE("Failed to set initial config for d=%d ret=%d", display, ret);
- close(hd->timeline_fd);
- pthread_cond_destroy(&hd->flip_cond);
- pthread_mutex_destroy(&hd->flip_lock);
return ret;
}
- ret = hwc_initialize_worker(&hd->set_worker, hwc_set_worker, hd);
+ ret = hd->vsync_worker.Init(&ctx->drm, display);
if (ret) {
- ALOGE("Failed to create set worker %d\n", ret);
- close(hd->timeline_fd);
- pthread_cond_destroy(&hd->flip_cond);
- pthread_mutex_destroy(&hd->flip_lock);
+ ALOGE("Failed to create event worker for display %d %d\n", display, ret);
return ret;
}
return 0;
}
-static void hwc_free_conn_list(drmModeConnectorPtr *conn_list, int num_conn) {
- for (int i = 0; i < num_conn; ++i) {
- if (conn_list[i])
- drmModeFreeConnector(conn_list[i]);
- }
- free(conn_list);
-}
-
static int hwc_enumerate_displays(struct hwc_context_t *ctx) {
- drmModeResPtr res = drmModeGetResources(ctx->fd);
- if (!res) {
- ALOGE("Failed to get drm resources");
- return -ENODEV;
- }
- int num_connectors = res->count_connectors;
-
- drmModeConnectorPtr *conn_list =
- (drmModeConnector **)calloc(num_connectors, sizeof(*conn_list));
- if (!conn_list) {
- ALOGE("Failed to allocate connector list");
- drmModeFreeResources(res);
- return -ENOMEM;
- }
-
- for (int i = 0; i < num_connectors; ++i) {
- conn_list[i] = drmModeGetConnector(ctx->fd, res->connectors[i]);
- if (!conn_list[i]) {
- ALOGE("Failed to get connector %d", res->connectors[i]);
- drmModeFreeResources(res);
- return -ENODEV;
- }
- }
- drmModeFreeResources(res);
-
- ctx->num_displays = 0;
-
- /* Find a connected, panel type connector for display 0 */
- for (int i = 0; i < num_connectors; ++i) {
- drmModeConnectorPtr c = conn_list[i];
-
- int j;
- for (j = 0; j < ARRAY_SIZE(panel_types); ++j) {
- if (c->connector_type == panel_types[j] &&
- c->connection == DRM_MODE_CONNECTED)
- break;
+ int ret;
+ for (DrmResources::ConnectorIter c = ctx->drm.begin_connectors();
+ c != ctx->drm.end_connectors(); ++c) {
+ ret = hwc_initialize_display(ctx, (*c)->display());
+ if (ret) {
+ ALOGE("Failed to initialize display %d", (*c)->display());
+ return ret;
}
- if (j == ARRAY_SIZE(panel_types))
- continue;
-
- hwc_initialize_display(ctx, ctx->num_displays, c->connector_id);
- ++ctx->num_displays;
- break;
- }
-
- struct hwc_drm_display *panel_hd;
- int ret = hwc_get_drm_display(ctx, 0, &panel_hd);
- if (ret) {
- hwc_free_conn_list(conn_list, num_connectors);
- return ret;
}
- /* Fill in the other displays */
- for (int i = 0; i < num_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;
- }
- hwc_free_conn_list(conn_list, num_connectors);
-
- ret = hwc_initialize_worker(&ctx->event_worker, hwc_event_worker, ctx);
+ ret = ctx->virtual_compositor_worker.Init();
if (ret) {
- ALOGE("Failed to create event worker %d\n", ret);
+ ALOGE("Failed to initialize virtual compositor worker");
return ret;
}
-
return 0;
}
return -ENOMEM;
}
- int ret = hwc_import_init(&ctx->import_ctx);
+ int ret = ctx->drm.Init();
if (ret) {
- ALOGE("Failed to initialize import context");
+ ALOGE("Can't initialize Drm object %d", ret);
delete ctx;
return ret;
}
- char path[PROPERTY_VALUE_MAX];
- property_get("hwc.drm.device", path, HWCOMPOSER_DRM_DEVICE);
- /* TODO: Use drmOpenControl here instead */
- ctx->fd = open(path, O_RDWR);
- if (ctx->fd < 0) {
- ALOGE("Failed to open dri- %s", strerror(-errno));
+ ret = hw_get_module(GRALLOC_HARDWARE_MODULE_ID,
+ (const hw_module_t **)&ctx->gralloc);
+ if (ret) {
+ ALOGE("Failed to open gralloc module %d", ret);
delete ctx;
- return -ENOENT;
+ return ret;
+ }
+
+ ret = ctx->dummy_timeline.Init();
+ if (ret) {
+ ALOGE("Failed to create dummy sw sync timeline %d", ret);
+ return ret;
+ }
+
+ ctx->importer = Importer::CreateInstance(&ctx->drm);
+ if (!ctx->importer) {
+ ALOGE("Failed to create importer instance");
+ delete ctx;
+ return ret;
}
ret = hwc_enumerate_displays(ctx);
if (ret) {
ALOGE("Failed to enumerate displays: %s", strerror(ret));
- close(ctx->fd);
delete ctx;
return ret;
}
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;
return 0;
}
+}
-static struct hw_module_methods_t hwc_module_methods = {open : hwc_device_open};
+static struct hw_module_methods_t hwc_module_methods = {
+ open : android::hwc_device_open
+};
hwc_module_t HAL_MODULE_INFO_SYM = {
common : {
OSDN Git Service
