mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-10-29 05:40:12 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

backend/drm: simplify drm_fb_lock_surface

Browse source 
Make it take a plane instead, and rename to drm_plane_lock_surface.
This commit is contained in:
Simon Ser 2021-01-24 18:22:03 +01:00
parent 44a3d6e74d
commit 4af85f4c19
3 changed files with 13 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

11
backend/drm/drm.c
View file

@ -486,9 +486,8 @@ static bool drm_connector_commit_buffer(struct wlr_output *output) {
assert(output->pending.committed & WLR_OUTPUT_STATE_BUFFER);
switch (output->pending.buffer_type) {
case WLR_OUTPUT_STATE_BUFFER_RENDER:
if (!drm_fb_lock_surface(&plane->pending_fb, drm, &plane->surf,
&plane->mgpu_surf)) {
wlr_drm_conn_log(conn, WLR_ERROR, "drm_fb_lock_surface failed");
if (!drm_plane_lock_surface(plane, drm)) {
wlr_drm_conn_log(conn, WLR_ERROR, "drm_plane_lock_surface failed");
return false;
}
break;
@ -681,8 +680,7 @@ static bool drm_connector_pageflip_renderer(struct wlr_drm_connector *conn) {
if (!drm_surface_render_black_frame(&plane->surf)) {
return false;
}
if (!drm_fb_lock_surface(&plane->pending_fb, drm, &plane->surf,
&plane->mgpu_surf)) {
if (!drm_plane_lock_surface(plane, drm)) {
return false;
}
}
@ -949,8 +947,7 @@ static bool drm_connector_set_cursor(struct wlr_output *output,
wlr_render_texture_with_matrix(rend, texture, matrix, 1.0);
wlr_renderer_end(rend);
if (!drm_fb_lock_surface(&plane->pending_fb, drm, &plane->surf,
&plane->mgpu_surf)) {
if (!drm_plane_lock_surface(plane, drm)) {
return false;
}