blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

backend/drm: don't blit in drm_fb_import 

Instead blit in drm_plane_lock_surface. This makes drm_fb_import simpler
and better fits its name.
This commit is contained in:
Simon Ser 2021-01-24 18:33:56 +01:00
parent 4af85f4c19
commit 73ffab70b0
3 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/drm/drm.c
View File

@ -496,7 +496,7 @@ static bool drm_connector_commit_buffer(struct wlr_output *output) {
if (!test_buffer(conn, output->pending.buffer)) { if (!test_buffer(conn, output->pending.buffer)) {
return false; return false;
} }
if (!drm_fb_import(&plane->pending_fb, drm, buffer, NULL, if (!drm_fb_import(&plane->pending_fb, drm, buffer,
&crtc->primary->formats)) { &crtc->primary->formats)) {
return false; return false;
} }

41
backend/drm/renderer.c
View File

@ -297,15 +297,27 @@ void drm_fb_clear(struct wlr_drm_fb **fb_ptr) {
bool drm_plane_lock_surface(struct wlr_drm_plane *plane, bool drm_plane_lock_surface(struct wlr_drm_plane *plane,
struct wlr_drm_backend *drm) { struct wlr_drm_backend *drm) {
assert(plane->surf.back_buffer != NULL); assert(plane->surf.back_buffer != NULL);
struct wlr_buffer *buffer = wlr_buffer_lock(plane->surf.back_buffer); struct wlr_buffer *buf = wlr_buffer_lock(plane->surf.back_buffer);
// Unset the current EGL context ASAP, because other operations may require // Unset the current EGL context ASAP, because other operations may require
// making another context current. // making another context current.
drm_surface_unset_current(&plane->surf); drm_surface_unset_current(&plane->surf);
bool ok = drm_fb_import(&plane->pending_fb, drm, buffer, struct wlr_buffer *local_buf;
&plane->mgpu_surf, NULL); if (drm->parent) {
wlr_buffer_unlock(buffer); // Perform a copy across GPUs
local_buf = drm_surface_blit(&plane->mgpu_surf, buf);
if (!local_buf) {
wlr_log(WLR_ERROR, "Failed to blit buffer across GPUs");
return false;
}
} else {
local_buf = wlr_buffer_lock(buf);
}
wlr_buffer_unlock(buf);
bool ok = drm_fb_import(&plane->pending_fb, drm, local_buf, NULL);
wlr_buffer_unlock(local_buf);
return ok; return ok;
} }
@ -432,29 +444,16 @@ static struct wlr_drm_fb *drm_fb_get(struct wlr_drm_backend *drm,
} }
bool drm_fb_import(struct wlr_drm_fb **fb_ptr, struct wlr_drm_backend *drm, bool drm_fb_import(struct wlr_drm_fb **fb_ptr, struct wlr_drm_backend *drm,
struct wlr_buffer *buf, struct wlr_drm_surface *mgpu, struct wlr_buffer *buf, const struct wlr_drm_format_set *formats) {
const struct wlr_drm_format_set *formats) { struct wlr_drm_fb *fb = drm_fb_get(drm, buf);
struct wlr_buffer *local_buf;
if (drm->parent && mgpu) {
// Perform a copy across GPUs
local_buf = drm_surface_blit(mgpu, buf);
if (!local_buf) {
wlr_log(WLR_ERROR, "Failed to blit buffer across GPUs");
return false;
}
} else {
local_buf = wlr_buffer_lock(buf);
}
struct wlr_drm_fb *fb = drm_fb_get(drm, local_buf);
if (!fb) { if (!fb) {
fb = drm_fb_create(drm, local_buf, formats); fb = drm_fb_create(drm, buf, formats);
if (!fb) { if (!fb) {
wlr_buffer_unlock(local_buf);
return false; return false;
} }
} }
wlr_buffer_lock(buf);
drm_fb_move(fb_ptr, &fb); drm_fb_move(fb_ptr, &fb);
return true; return true;
} }

3
include/backend/drm/renderer.h
View File

@ -47,8 +47,7 @@ bool drm_surface_make_current(struct wlr_drm_surface *surf, int *buffer_age);
void drm_surface_unset_current(struct wlr_drm_surface *surf); void drm_surface_unset_current(struct wlr_drm_surface *surf);
bool drm_fb_import(struct wlr_drm_fb **fb, struct wlr_drm_backend *drm, bool drm_fb_import(struct wlr_drm_fb **fb, struct wlr_drm_backend *drm,
struct wlr_buffer *buf, struct wlr_drm_surface *mgpu, struct wlr_buffer *buf, const struct wlr_drm_format_set *formats);
const struct wlr_drm_format_set *formats);
void drm_fb_destroy(struct wlr_drm_fb *fb); void drm_fb_destroy(struct wlr_drm_fb *fb);
void drm_fb_clear(struct wlr_drm_fb **fb); void drm_fb_clear(struct wlr_drm_fb **fb);