fdo-mirrors/weston
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/weston.git synced 2026-05-04 23:27:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

drm: No longer force the use of the first cursor fb

Browse source 
The assert added in 78657c5ff3 will cause
problems when we try to reuse cached drm plane layouts in the future -
instead of asserting on an exact gbm fb, assert that the the fb type
corresponds has the cursor type instead.

Signed-off-by: Daniel Stone <daniels@collabora.com>
This commit is contained in:
Daniel Stone 2025-10-20 15:29:47 -05:00
parent 58614d4f5b
commit 6155981cc6
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libweston/backend-drm/drm.c
View file

@ -856,9 +856,10 @@ drm_output_repaint(struct weston_output *output_base)
output->cursor_plane);
if (cursor_state && cursor_state->fb) {
pixman_region32_t damage;
struct drm_fb *old_fb = cursor_state->fb;
assert(cursor_state->plane == output->cursor_plane);
assert(cursor_state->fb == output->gbm_cursor_fb[0]);
assert(old_fb->type == BUFFER_CURSOR);
pixman_region32_init(&damage);
weston_output_flush_damage_for_plane(&output->base,
@ -873,8 +874,9 @@ drm_output_repaint(struct weston_output *output_base)
}
pixman_region32_fini(&damage);
cursor_state->fb = drm_fb_ref(output->gbm_cursor_fb[output->current_cursor]);
drm_fb_unref(output->gbm_cursor_fb[0]);
cursor_state->fb =
drm_fb_ref(output->gbm_cursor_fb[output->current_cursor]);
drm_fb_unref(old_fb);
}