Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

hwcomposer: Synchronization fixes #48

Draft
wants to merge 3 commits into
base: lineage-18.1
Choose a base branch
from
Draft

hwcomposer: Synchronization fixes #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
48dd99a
hwcomposer: Always post contents fence
aleasto Jan 29, 2023
c852dc6
hwcomposer: Correctly synchronize buffer release
aleasto Jan 29, 2023
84f46f2
hwcomposer: Snapshot buffer is now also freed in release
aleasto Jan 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 22 additions & 28 deletions hwcomposer/hwcomposer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,24 +188,28 @@ static struct buffer *get_wl_buffer(struct waydroid_hwc_composer_device_1 *pdev,

auto it = pdev->display->buffer_map.find(layer->handle);
if (it != pdev->display->buffer_map.end()) {
std::lock_guard(pdev->display->buffers_mutex);
if (it->second->isShm) {
if (width != it->second->width || height != it->second->height) {
if (it->second->buffer)
wl_buffer_destroy(it->second->buffer);
delete (it->second);
it->second->refcount--;
if (it->second->refcount == 0)
destroy_buffer(it->second);
pdev->display->buffer_map.erase(it);
} else {
it->second->refcount++;
update_shm_buffer(pdev->display, it->second);
return it->second;
}
} else
} else {
it->second->refcount++;
return it->second;
}
}

struct buffer *buf;
int ret = 0;

buf = new struct buffer();
buf = create_buffer(pdev->display);
if (pdev->display->gtype == GRALLOC_GBM) {
struct gralloc_handle_t *drm_handle = (struct gralloc_handle_t *)layer->handle;
if (pdev->display->dmabuf) {
Expand Down Expand Up @@ -236,7 +240,7 @@ static struct buffer *get_wl_buffer(struct waydroid_hwc_composer_device_1 *pdev,
return NULL;
}
pdev->display->buffer_map[layer->handle] = buf;

buf->refcount++;
return pdev->display->buffer_map[layer->handle];
}

Expand Down Expand Up @@ -410,16 +414,15 @@ static int hwc_set(struct hwc_composer_device_1* dev,size_t numDisplays,
}

hwc_display_contents_1_t* contents = displays[HWC_DISPLAY_PRIMARY];
size_t fb_target = -1;
int err = 0;

if (pdev->display->geo_changed) {
std::lock_guard(pdev->display->buffers_mutex);
for (auto it = pdev->display->buffer_map.begin(); it != pdev->display->buffer_map.end(); it++) {
if (it->second) {
if (it->second->buffer)
wl_buffer_destroy(it->second->buffer);
if (it->second->isShm)
munmap(it->second->shm_data, it->second->size);
delete (it->second);
}
it->second->refcount--;
if (it->second->refcount == 0)
destroy_buffer(it->second);
}
pdev->display->buffer_map.clear();
}
Expand Down Expand Up @@ -470,7 +473,7 @@ static int hwc_set(struct hwc_composer_device_1* dev,size_t numDisplays,
}

property_set("waydroid.open_windows", "0");
return 0;
goto sync;
} else if (active_apps == "Waydroid") {
// Clear all open windows if there's any and just keep "Waydroid"
if (pdev->windows.find(active_apps) == pdev->windows.end() || !pdev->windows[active_apps]->isActive) {
Expand Down Expand Up @@ -527,7 +530,7 @@ static int hwc_set(struct hwc_composer_device_1* dev,size_t numDisplays,
}

property_set("waydroid.open_windows", "0");
return 0;
goto sync;
}
bool shouldCloseLeftover = true;
for (auto it = pdev->windows.cbegin(); it != pdev->windows.cend();) {
Expand Down Expand Up @@ -595,7 +598,6 @@ static int hwc_set(struct hwc_composer_device_1* dev,size_t numDisplays,
}
}

size_t fb_target = -1;
for (size_t l = 0; l < contents->numHwLayers; l++) {
hwc_layer_1_t* fb_layer = &contents->hwLayers[l];
if (fb_layer->compositionType == HWC_FRAMEBUFFER_TARGET) {
Expand All @@ -604,7 +606,6 @@ static int hwc_set(struct hwc_composer_device_1* dev,size_t numDisplays,
}
}

int err = 0;
for (size_t l = 0; l < contents->numHwLayers; l++) {
size_t layer = l;
if (l == skipped.first && fb_target >= 0) {
Expand Down Expand Up @@ -769,12 +770,8 @@ static int hwc_set(struct hwc_composer_device_1* dev,size_t numDisplays,
if (fb_layer->compositionType != HWC_FRAMEBUFFER &&
fb_layer->compositionType != HWC_SIDEBAND)
{
int timeline_fd = sw_sync_timeline_create();
/* To be signaled when the compositor releases the buffer */
fb_layer->releaseFenceFd = sw_sync_fence_create(timeline_fd, "wayland_release", 1);
buf->timeline_fd = timeline_fd;
} else {
buf->timeline_fd = -1;
fb_layer->releaseFenceFd = sw_sync_fence_create(buf->timeline_fd, "wayland_release", ++buf->sync_point);
}

struct wl_surface *surface = get_surface(pdev, fb_layer, window, pdev->use_subsurface);
Expand Down Expand Up @@ -828,12 +825,8 @@ static int hwc_set(struct hwc_composer_device_1* dev,size_t numDisplays,

wl_surface_commit(surface);

if (window->snapshot_buffer) {
// Snapshot buffer should be detached by now, clean up
wl_buffer_destroy(window->snapshot_buffer->buffer);
delete window->snapshot_buffer;
window->snapshot_buffer = nullptr;
}
// Snapshot buffer is no longer used
window->snapshot_buffer = nullptr;

const int kAcquireWarningMS = 100;
err = sync_wait(fb_layer->acquireFenceFd, kAcquireWarningMS);
Expand Down Expand Up @@ -881,6 +874,7 @@ static int hwc_set(struct hwc_composer_device_1* dev,size_t numDisplays,
wl_surface_commit(it->second->surface);
wl_display_flush(pdev->display->display);

sync:
sw_sync_timeline_inc(pdev->timeline_fd, 1);
contents->retireFenceFd = sw_sync_fence_create(pdev->timeline_fd, "hwc_contents_release", ++pdev->next_sync_point);

Expand Down
26 changes: 22 additions & 4 deletions hwcomposer/wayland-hwc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,16 +72,34 @@

using ::android::hardware::hidl_string;

struct buffer;
struct buffer*
create_buffer(struct display* display) {
struct buffer* buf = new struct buffer();
buf->display = display;
buf->timeline_fd = sw_sync_timeline_create();
buf->refcount = 1;
return buf;
}

void
destroy_buffer(struct buffer* buf) {
close(buf->timeline_fd);
wl_buffer_destroy(buf->buffer);
if (buf->isShm)
munmap(buf->shm_data, buf->size);
delete buf;
}

static void
buffer_release(void *data, struct wl_buffer *)
{
struct buffer *mybuf = (struct buffer*)data;

sw_sync_timeline_inc(mybuf->timeline_fd, 1);
close(mybuf->timeline_fd);
mybuf->timeline_fd = -1;
std::lock_guard(mybuf->display->buffers_mutex);
mybuf->refcount--;
if (mybuf->refcount == 0)
destroy_buffer(mybuf);
}

static const struct wl_buffer_listener buffer_listener = {
Expand Down Expand Up @@ -296,7 +314,7 @@ void snapshot_inactive_app_window(struct display *display, struct window *window
ALOGI("Making inactive window snapshot for %s", window->taskID.c_str());

struct buffer *old_buf = window->last_layer_buffer;
struct buffer *new_buf = new struct buffer();
struct buffer *new_buf = create_buffer(display);
// FIXME won't work as expected if there are multiple surfaces
struct wl_surface *surface = window->surface;

Expand Down
10 changes: 10 additions & 0 deletions hwcomposer/wayland-hwc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,7 @@ struct display {
std::map<uint32_t, struct handleExt> layer_handles_ext;
struct handleExt target_layer_handle_ext;
std::map<buffer_handle_t, struct buffer *> buffer_map;
std::mutex buffers_mutex;
std::array<uint8_t, 239> keysDown;

bool isWinResSet;
Expand All @@ -174,9 +175,13 @@ struct buffer {
uint32_t hal_format;

int timeline_fd;
int sync_point;
bool isShm;
void *shm_data;
int size;

int refcount;
struct display* display;
};

struct window {
Expand Down Expand Up @@ -219,6 +224,11 @@ create_shm_wl_buffer(struct display *display, struct buffer *buffer,
void
snapshot_inactive_app_window(struct display *display, struct window *window);

void
destroy_buffer(struct buffer* buffer);
struct buffer*
create_buffer(struct display* display);

struct display *
create_display(const char* gralloc);
void
Expand Down