worker.cpp
LOCAL_MODULE := libdrmhwc_utils
+ LOCAL_VENDOR_MODULE := true
include $(BUILD_STATIC_LIBRARY)
LOCAL_STATIC_LIBRARIES := libdrmhwc_utils
LOCAL_C_INCLUDES := \
- external/gbm_gralloc \
system/core/libsync
LOCAL_SRC_FILES := \
autolock.cpp \
drmresources.cpp \
+ drmcomposition.cpp \
+ drmcompositor.cpp \
+ drmcompositorworker.cpp \
drmconnector.cpp \
drmcrtc.cpp \
drmdisplaycomposition.cpp \
drmdisplaycompositor.cpp \
drmencoder.cpp \
drmeventlistener.cpp \
- drmhwctwo.cpp \
drmmode.cpp \
drmplane.cpp \
drmproperty.cpp \
virtualcompositorworker.cpp \
vsyncworker.cpp
+ifeq ($(strip $(TARGET_USES_HWC2)),true)
+LOCAL_SRC_FILES += drmhwctwo.cpp
LOCAL_CPPFLAGS += \
-DHWC2_USE_CPP11 \
-DHWC2_INCLUDE_STRINGIFICATION
+else
+LOCAL_SRC_FILES += hwcomposer.cpp
+endif
+
+ ifeq ($(TARGET_PRODUCT),hikey960)
+ LOCAL_CPPFLAGS += -DUSE_HISI_IMPORTER
+ LOCAL_SRC_FILES += platformhisi.cpp
+ LOCAL_C_INCLUDES += device/linaro/hikey/gralloc960/
+ else ifeq ($(TARGET_PRODUCT),hikey)
+ LOCAL_CPPFLAGS += -DUSE_HISI_IMPORTER
+ LOCAL_SRC_FILES += platformhisi.cpp
+ LOCAL_C_INCLUDES += device/linaro/hikey/gralloc/
+ else ifeq ($(strip $(BOARD_DRM_HWCOMPOSER_BUFFER_IMPORTER)),minigbm)
+ LOCAL_SRC_FILES += platformminigbm.cpp
+ LOCAL_C_INCLUDES += external/minigbm/cros_gralloc/
+ else
LOCAL_CPPFLAGS += -DUSE_DRM_GENERIC_IMPORTER
+ endif
LOCAL_MODULE := hwcomposer.drm
LOCAL_MODULE_TAGS := optional
#include <errno.h>
#include <stdint.h>
- #include <cutils/log.h>
+ #include <log/log.h>
+#include <cutils/properties.h>
#include <xf86drmMode.h>
namespace android {
}
int DrmConnector::UpdateModes() {
+ char value[PROPERTY_VALUE_MAX];
+ uint32_t xres = 0, yres = 0, rate = 0;
+ if (property_get("debug.drm.mode.force", value, NULL)) {
+ // parse <xres>x<yres>[@<refreshrate>]
+ if (sscanf(value, "%dx%d@%d", &xres, &yres, &rate) != 3) {
+ rate = 0;
+ if (sscanf(value, "%dx%d", &xres, &yres) != 2) {
+ xres = yres = 0;
+ }
+ }
+ ALOGI_IF(xres && yres, "force mode to %dx%d@%dHz", xres, yres, rate);
+ }
+
int fd = drm_->fd();
drmModeConnectorPtr c = drmModeGetConnector(fd, id_);
continue;
DrmMode m(&c->modes[i]);
+ if (xres && yres) {
+ if (m.h_display() != xres || m.v_display() != yres ||
+ (rate && uint32_t(m.v_refresh()) != rate))
+ continue;
+ }
m.set_id(drm_->next_mode_id());
new_modes.push_back(m);
+ ALOGD("add new mode %dx%d@%.1f id %d for display %d", m.h_display(), m.v_display(), m.v_refresh(), m.id(), display_);
}
modes_.swap(new_modes);
return 0;
#define LOG_TAG "hwc-drm-display-composition"
#include "drmdisplaycomposition.h"
-#include "drmdisplaycompositor.h"
#include "drmcrtc.h"
#include "drmplane.h"
#include "drmresources.h"
#include <algorithm>
#include <unordered_set>
- #include <cutils/log.h>
+ #include <log/log.h>
#include <sw_sync.h>
#include <sync/sync.h>
#include <xf86drmMode.h>
#include <sstream>
#include <vector>
- #include <cutils/log.h>
+ #include <log/log.h>
#include <drm/drm_mode.h>
#include <sync/sync.h>
#include <utils/Trace.h>
#include "drmresources.h"
#include "glworker.h"
+#define DRM_DISPLAY_COMPOSITOR_MAX_QUEUE_DEPTH 2
+
namespace android {
void SquashState::Init(DrmHwcLayer *layers, size_t num_layers) {
});
}
+DrmDisplayCompositor::FrameWorker::FrameWorker(DrmDisplayCompositor *compositor)
+ : Worker("frame-worker", HAL_PRIORITY_URGENT_DISPLAY),
+ compositor_(compositor) {
+}
+
+DrmDisplayCompositor::FrameWorker::~FrameWorker() {
+}
+
+int DrmDisplayCompositor::FrameWorker::Init() {
+ return InitWorker();
+}
+
+void DrmDisplayCompositor::FrameWorker::QueueFrame(
+ std::unique_ptr<DrmDisplayComposition> composition, int status) {
+ Lock();
+ FrameState frame;
+ frame.composition = std::move(composition);
+ frame.status = status;
+ frame_queue_.push(std::move(frame));
+ Unlock();
+ Signal();
+}
+
+void DrmDisplayCompositor::FrameWorker::Routine() {
+ int wait_ret = 0;
+
+ Lock();
+ if (frame_queue_.empty()) {
+ wait_ret = WaitForSignalOrExitLocked();
+ }
+
+ FrameState frame;
+ if (!frame_queue_.empty()) {
+ frame = std::move(frame_queue_.front());
+ frame_queue_.pop();
+ }
+ Unlock();
+
+ if (wait_ret == -EINTR) {
+ return;
+ } else if (wait_ret) {
+ ALOGE("Failed to wait for signal, %d", wait_ret);
+ return;
+ }
+ compositor_->ApplyFrame(std::move(frame.composition), frame.status);
+}
+
DrmDisplayCompositor::DrmDisplayCompositor()
: drm_(NULL),
display_(-1),
+ worker_(this),
+ frame_worker_(this),
initialized_(false),
active_(false),
use_hw_overlays_(true),
if (!initialized_)
return;
+ worker_.Exit();
+ frame_worker_.Exit();
+
int ret = pthread_mutex_lock(&lock_);
if (ret)
ALOGE("Failed to acquire compositor lock %d", ret);
if (mode_.old_blob_id)
drm_->DestroyPropertyBlob(mode_.old_blob_id);
+ while (!composite_queue_.empty()) {
+ composite_queue_.front().reset();
+ composite_queue_.pop();
+ }
active_composition_.reset();
ret = pthread_mutex_unlock(&lock_);
ALOGE("Failed to initialize drm compositor lock %d\n", ret);
return ret;
}
+ ret = worker_.Init();
+ if (ret) {
+ pthread_mutex_destroy(&lock_);
+ ALOGE("Failed to initialize compositor worker %d\n", ret);
+ return ret;
+ }
+ ret = frame_worker_.Init();
+ if (ret) {
+ pthread_mutex_destroy(&lock_);
+ ALOGE("Failed to initialize frame worker %d\n", ret);
+ return ret;
+ }
+ pre_compositor_.reset(new GLWorkerCompositor());
+ ret = pre_compositor_->Init();
+ if (ret) {
+ ALOGE("Failed to initialize OpenGL compositor %d", ret);
+ pre_compositor_.reset();
+ }
+
initialized_ = true;
return 0;
}
return std::unique_ptr<DrmDisplayComposition>(new DrmDisplayComposition());
}
+int DrmDisplayCompositor::QueueComposition(
+ std::unique_ptr<DrmDisplayComposition> composition) {
+ switch (composition->type()) {
+ case DRM_COMPOSITION_TYPE_FRAME:
+ if (!active_)
+ return -ENODEV;
+ break;
+ case DRM_COMPOSITION_TYPE_DPMS:
+ /*
+ * Update the state as soon as we get it so we can start/stop queuing
+ * frames asap.
+ */
+ active_ = (composition->dpms_mode() == DRM_MODE_DPMS_ON);
+ break;
+ case DRM_COMPOSITION_TYPE_MODESET:
+ break;
+ case DRM_COMPOSITION_TYPE_EMPTY:
+ return 0;
+ default:
+ ALOGE("Unknown composition type %d/%d", composition->type(), display_);
+ return -ENOENT;
+ }
+
+ int ret = pthread_mutex_lock(&lock_);
+ if (ret) {
+ ALOGE("Failed to acquire compositor lock %d", ret);
+ return ret;
+ }
+
+ // Block the queue if it gets too large. Otherwise, SurfaceFlinger will start
+ // to eat our buffer handles when we get about 1 second behind.
+ while (composite_queue_.size() >= DRM_DISPLAY_COMPOSITOR_MAX_QUEUE_DEPTH) {
+ pthread_mutex_unlock(&lock_);
+ sched_yield();
+ pthread_mutex_lock(&lock_);
+ }
+
+ composite_queue_.push(std::move(composition));
+
+ ret = pthread_mutex_unlock(&lock_);
+ if (ret) {
+ ALOGE("Failed to release compositor lock %d", ret);
+ return ret;
+ }
+
+ worker_.Signal();
+ return 0;
+}
+
std::tuple<uint32_t, uint32_t, int>
DrmDisplayCompositor::GetActiveModeResolution() {
DrmConnector *connector = drm_->GetConnectorForDisplay(display_);
}
std::vector<DrmCompositionRegion> ®ions = display_comp->squash_regions();
- ret = pre_compositor_->Composite(display_comp->layers().data(),
+ if (pre_compositor_) {
+ ret = pre_compositor_->Composite(display_comp->layers().data(),
regions.data(), regions.size(), fb.buffer(),
display_comp->importer());
- pre_compositor_->Finish();
+ pre_compositor_->Finish();
- if (ret) {
- ALOGE("Failed to squash layers");
- return ret;
+ if (ret) {
+ ALOGE("Failed to squash layers");
+ return ret;
+ }
}
ret = display_comp->CreateNextTimelineFence();
}
std::vector<DrmCompositionRegion> ®ions = display_comp->pre_comp_regions();
- ret = pre_compositor_->Composite(display_comp->layers().data(),
+ if (pre_compositor_) {
+ ret = pre_compositor_->Composite(display_comp->layers().data(),
regions.data(), regions.size(), fb.buffer(),
display_comp->importer());
- pre_compositor_->Finish();
+ pre_compositor_->Finish();
- if (ret) {
- ALOGE("Failed to pre-composite layers");
- return ret;
+ if (ret) {
+ ALOGE("Failed to pre-composite layers");
+ return ret;
+ }
}
ret = display_comp->CreateNextTimelineFence();
ALOGE("Failed to release lock for active_composition swap");
}
-int DrmDisplayCompositor::ApplyComposition(
- std::unique_ptr<DrmDisplayComposition> composition) {
- int ret = 0;
+int DrmDisplayCompositor::Composite() {
+ ATRACE_CALL();
+
+ if (!pre_compositor_) {
+ pre_compositor_.reset(new GLWorkerCompositor());
+ int ret = pre_compositor_->Init();
+ if (ret) {
+ ALOGE("Failed to initialize OpenGL compositor %d", ret);
+ return ret;
+ }
+ }
+
+ int ret = pthread_mutex_lock(&lock_);
+ if (ret) {
+ ALOGE("Failed to acquire compositor lock %d", ret);
+ return ret;
+ }
+ if (composite_queue_.empty()) {
+ ret = pthread_mutex_unlock(&lock_);
+ if (ret)
+ ALOGE("Failed to release compositor lock %d", ret);
+ return ret;
+ }
+
+ std::unique_ptr<DrmDisplayComposition> composition(
+ std::move(composite_queue_.front()));
+
+ composite_queue_.pop();
+
+ ret = pthread_mutex_unlock(&lock_);
+ if (ret) {
+ ALOGE("Failed to release compositor lock %d", ret);
+ return ret;
+ }
+
switch (composition->type()) {
case DRM_COMPOSITION_TYPE_FRAME:
ret = PrepareFrame(composition.get());
}
// If use_hw_overlays_ is false, we can't use hardware to composite the
- // frame. So squash all layers into a single composition and apply that
+ // frame. So squash all layers into a single composition and queue that
// instead.
if (!use_hw_overlays_) {
std::unique_ptr<DrmDisplayComposition> squashed = CreateComposition();
return ret;
}
}
- ApplyFrame(std::move(composition), ret);
+ frame_worker_.QueueFrame(std::move(composition), ret);
break;
case DRM_COMPOSITION_TYPE_DPMS:
- active_ = (composition->dpms_mode() == DRM_MODE_DPMS_ON);
ret = ApplyDpms(composition.get());
if (ret)
ALOGE("Failed to apply dpms for display %d", display_);
return ret;
}
+bool DrmDisplayCompositor::HaveQueuedComposites() const {
+ int ret = pthread_mutex_lock(&lock_);
+ if (ret) {
+ ALOGE("Failed to acquire compositor lock %d", ret);
+ return false;
+ }
+
+ bool empty_ret = !composite_queue_.empty();
+
+ ret = pthread_mutex_unlock(&lock_);
+ if (ret) {
+ ALOGE("Failed to release compositor lock %d", ret);
+ return false;
+ }
+
+ return empty_ret;
+}
+
int DrmDisplayCompositor::SquashAll() {
AutoLock lock(&lock_, "compositor");
int ret = lock.Lock();
#define ANDROID_DRM_DISPLAY_COMPOSITOR_H_
#include "drmhwcomposer.h"
-#include "drmdisplaycomposition.h"
+#include "drmcomposition.h"
+#include "drmcompositorworker.h"
#include "drmframebuffer.h"
#include "separate_rects.h"
#include <pthread.h>
#include <memory>
+#include <queue>
#include <sstream>
#include <tuple>
int Init(DrmResources *drm, int display);
std::unique_ptr<DrmDisplayComposition> CreateComposition() const;
- int ApplyComposition(std::unique_ptr<DrmDisplayComposition> composition);
+ int QueueComposition(std::unique_ptr<DrmDisplayComposition> composition);
int Composite();
int SquashAll();
void Dump(std::ostringstream *out) const;
std::tuple<uint32_t, uint32_t, int> GetActiveModeResolution();
+ bool HaveQueuedComposites() const;
+
SquashState *squash_state() {
return &squash_state_;
}
+ bool uses_GL() {
+ return !!pre_compositor_;
+ }
private:
+ struct FrameState {
+ std::unique_ptr<DrmDisplayComposition> composition;
+ int status = 0;
+ };
+
+ class FrameWorker : public Worker {
+ public:
+ FrameWorker(DrmDisplayCompositor *compositor);
+ ~FrameWorker() override;
+
+ int Init();
+ void QueueFrame(std::unique_ptr<DrmDisplayComposition> composition,
+ int status);
+
+ protected:
+ void Routine() override;
+
+ private:
+ DrmDisplayCompositor *compositor_;
+ std::queue<FrameState> frame_queue_;
+ };
+
struct ModeState {
bool needs_modeset = false;
DrmMode mode;
DrmResources *drm_;
int display_;
+ DrmCompositorWorker worker_;
+ FrameWorker frame_worker_;
+
+ std::queue<std::unique_ptr<DrmDisplayComposition>> composite_queue_;
std::unique_ptr<DrmDisplayComposition> active_composition_;
bool initialized_;
int squash_framebuffer_index_;
DrmFramebuffer squash_framebuffers_[2];
- // mutable since we need to acquire in Dump()
+ // mutable since we need to acquire in HaveQueuedComposites
mutable pthread_mutex_t lock_;
// State tracking progress since our last Dump(). These are mutable since
#include "drmresources.h"
#include <assert.h>
-#include <errno.h>
#include <linux/netlink.h>
#include <sys/socket.h>
- #include <cutils/log.h>
+ #include <log/log.h>
-#include <hardware/hardware.h>
-#include <hardware/hwcomposer.h>
#include <xf86drm.h>
+#include <assert.h>
namespace android {
struct sockaddr_nl addr;
memset(&addr, 0, sizeof(addr));
addr.nl_family = AF_NETLINK;
- addr.nl_pid = getpid();
+ addr.nl_pid = 0;
addr.nl_groups = 0xFFFFFFFF;
int ret = bind(uevent_fd_.get(), (struct sockaddr *)&addr, sizeof(addr));
#include <inttypes.h>
#include <string>
- #include <cutils/log.h>
+ #include <log/log.h>
#include <cutils/properties.h>
#include <hardware/hardware.h>
#include <hardware/hwcomposer2.h>
AddFenceToRetireFence(composition->take_out_fence());
- ret = compositor_.ApplyComposition(std::move(composition));
+ ret = compositor_.QueueComposition(std::move(composition));
if (ret) {
ALOGE("Failed to apply the frame composition ret=%d", ret);
return HWC2::Error::BadParameter;
compositor_.CreateComposition();
composition->Init(drm_, crtc_, importer_.get(), planner_.get(), frame_no_);
int ret = composition->SetDisplayMode(*mode);
- ret = compositor_.ApplyComposition(std::move(composition));
+ ret = compositor_.QueueComposition(std::move(composition));
if (ret) {
ALOGE("Failed to queue dpms composition on %d", ret);
return HWC2::Error::BadConfig;
compositor_.CreateComposition();
composition->Init(drm_, crtc_, importer_.get(), planner_.get(), frame_no_);
composition->SetDpmsMode(dpms_value);
- int ret = compositor_.ApplyComposition(std::move(composition));
+ int ret = compositor_.QueueComposition(std::move(composition));
if (ret) {
ALOGE("Failed to apply the dpms composition ret=%d", ret);
return HWC2::Error::BadParameter;
layer.set_validated_type(HWC2::Composition::Client);
++*num_types;
break;
+ case HWC2::Composition::Device:
+ if (!compositor_.uses_GL()) {
+ layer.set_validated_type(HWC2::Composition::Client);
+ ++*num_types;
+ break;
+ }
+ /* fall through */
default:
layer.set_validated_type(layer.sf_type());
break;
#include <xf86drm.h>
#include <xf86drmMode.h>
- #include <cutils/log.h>
+ #include <log/log.h>
#include <cutils/properties.h>
namespace android {
-DrmResources::DrmResources() : event_listener_(this) {
+DrmResources::DrmResources() : compositor_(this), event_listener_(this) {
}
DrmResources::~DrmResources() {
// First look for primary amongst internal connectors
for (auto &conn : connectors_) {
- if (conn->internal() && !found_primary) {
+ if (conn->state() == DRM_MODE_CONNECTED && conn->internal() && !found_primary) {
conn->set_display(0);
found_primary = true;
} else {
// Then look for primary amongst external connectors
for (auto &conn : connectors_) {
- if (conn->external() && !found_primary) {
+ if (conn->state() == DRM_MODE_CONNECTED && conn->external() && !found_primary) {
conn->set_display(0);
found_primary = true;
}
if (ret)
return ret;
+ ret = compositor_.Init();
+ if (ret)
+ return ret;
+
ret = event_listener_.Init();
if (ret) {
ALOGE("Can't initialize event listener %d", ret);
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());
return 0;
}
+int DrmResources::SetDisplayActiveMode(int display, const DrmMode &mode) {
+ std::unique_ptr<DrmComposition> comp(compositor_.CreateComposition(NULL));
+ if (!comp) {
+ ALOGE("Failed to create composition for dpms on %d", display);
+ return -ENOMEM;
+ }
+ int ret = comp->SetDisplayMode(display, mode);
+ if (ret) {
+ ALOGE("Failed to add mode to composition on %d %d", 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;
+}
+
+int DrmResources::SetDpmsMode(int display, uint64_t mode) {
+ if (mode != DRM_MODE_DPMS_ON && mode != DRM_MODE_DPMS_OFF) {
+ ALOGE("Invalid dpms mode %" PRIu64, mode);
+ return -EINVAL;
+ }
+
+ std::unique_ptr<DrmComposition> comp(compositor_.CreateComposition(NULL));
+ if (!comp) {
+ ALOGE("Failed to create composition for dpms on %d", display);
+ return -ENOMEM;
+ }
+ int ret = comp->SetDpmsMode(display, mode);
+ if (ret) {
+ 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;
+}
+
+DrmCompositor *DrmResources::compositor() {
+ return &compositor_;
+}
+
DrmEventListener *DrmResources::event_listener() {
return &event_listener_;
}
#include <xf86drm.h>
#include <xf86drmMode.h>
- #include <cutils/log.h>
+ #include <log/log.h>
#include <cutils/properties.h>
#include <hardware/hardware.h>
#include <hardware/hwcomposer.h>
#include <utils/Trace.h>
#define UM_PER_INCH 25400
+#define MIN_DPI 160 /* Min 160 DPI value to keep things sane*/
namespace android {
if (!display_contents[i])
continue;
- bool use_framebuffer_target = false;
+ bool use_framebuffer_target = true;
DrmMode mode;
if (i == HWC_DISPLAY_VIRTUAL) {
use_framebuffer_target = true;
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;
+ if (mm_width) {
+ /* Dots per 1000 inches */
+ int32_t dpki = (mode.h_display() * UM_PER_INCH) / mm_width;
+ values[i] = std::max(dpki, MIN_DPI*1000);
+ } else
+ values[i] = 0;
break;
case HWC_DISPLAY_DPI_Y:
- /* Dots per 1000 inches */
- values[i] =
- mm_height ? (mode.v_display() * UM_PER_INCH) / mm_height : 0;
+ if (mm_height) {
+ /* Dots per 1000 inches */
+ int32_t dpki = (mode.v_display() * UM_PER_INCH) / mm_height;
+ values[i] = std::max(dpki, MIN_DPI*1000);
+ } else
+ values[i] = 0;
break;
}
}
OSDN Git Service
