[PATCH v2 weston 13/16] compositor-drm: Retain DRM FB for cursor plane

[Daniel Stone]

We already keep a GBM BO for the cursor plane, but also keep a DRM FB,
so we can reuse it for atomic modesetting.

Signed-off-by: Daniel Stone <daniels at collabora.com>
---
 src/compositor-drm.c | 28 ++++++++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/src/compositor-drm.c b/src/compositor-drm.c
index fa520bc..689b318 100644
--- a/src/compositor-drm.c
+++ b/src/compositor-drm.c
@@ -262,6 +262,7 @@ struct drm_output {
 
 	struct gbm_surface *surface;
 	struct gbm_bo *cursor_bo[2];
+	struct drm_fb *cursor_fb[2];
 	struct drm_plane *cursor_plane;
 	struct weston_plane fb_plane;
 	struct weston_view *cursor_view;
@@ -822,11 +823,15 @@ drm_output_release_fb(struct drm_output *output, struct drm_fb *fb)
 	if (!fb)
 		return;
 
+	/* XXX: These static checks to output->dumb and output->cursor_fb
+	 *      are really unpleasant; we should revisit this with an explicit
+	 *      type attribute. */
 	if (fb->map &&
             (fb != output->dumb[0] && fb != output->dumb[1])) {
 		drm_fb_destroy_dumb(fb);
 	} else if (fb->bo) {
-		if (fb->is_client_buffer)
+		if (fb->is_client_buffer ||
+		    (fb == output->cursor_fb[0] || fb == output->cursor_fb[1]))
 			gbm_bo_destroy(fb->bo);
 		else
 			gbm_surface_release_buffer(output->surface,
@@ -1486,8 +1491,14 @@ drm_output_set_cursor(struct drm_output *output)
 	    pixman_region32_not_empty(&output->cursor_plane->base.damage)) {
 		pixman_region32_fini(&output->cursor_plane->base.damage);
 		pixman_region32_init(&output->cursor_plane->base.damage);
+		assert(output->cursor_plane->current ==
+		       output->cursor_fb[output->current_cursor]);
+		output->cursor_plane->next =
+			output->cursor_fb[output->current_cursor];
 		output->current_cursor ^= 1;
 		bo = output->cursor_bo[output->current_cursor];
+		output->cursor_plane->current =
+			output->cursor_fb[output->current_cursor];
 
 		cursor_bo_update(c, bo, ev);
 		handle = gbm_bo_get_handle(bo).s32;
@@ -2150,6 +2161,10 @@ drm_output_init_egl(struct drm_output *output, struct drm_compositor *ec)
 		return -1;
 	}
 
+	/* No point creating cursors if we don't have a plane for them. */
+	if (!output->cursor_plane)
+		return 0;
+
 	flags = GBM_BO_USE_CURSOR | GBM_BO_USE_WRITE;
 
 	for (i = 0; i < 2; i++) {
@@ -2159,9 +2174,18 @@ drm_output_init_egl(struct drm_output *output, struct drm_compositor *ec)
 		output->cursor_bo[i] =
 			gbm_bo_create(ec->gbm, ec->cursor_width, ec->cursor_height,
 				GBM_FORMAT_ARGB8888, flags);
+		if (!output->cursor_bo[i])
+			break;
+
+		output->cursor_fb[i] =
+			drm_fb_get_from_bo(output->cursor_bo[i], ec,
+					   GBM_FORMAT_ARGB8888);
+		if (!output->cursor_fb[i])
+			break;
 	}
 
-	if (output->cursor_bo[0] == NULL || output->cursor_bo[1] == NULL) {
+	if (output->cursor_bo[0] == NULL || output->cursor_bo[1] == NULL ||
+	    output->cursor_fb[0] == NULL || output->cursor_fb[1] == NULL) {
 		weston_log("cursor buffers unavailable, using gl cursors\n");
 		ec->cursors_are_broken = 1;
 	}
-- 
2.4.3