compositor-drm: Drop output from release_fb
We only need it for the GBM surface the FB was originally created
against; a mismatch here is very bad indeed, so no reason to pass it in
explictly every time rather than store it.
Following patches change drm_fb to be explicitly reference counted; in
order to reduce churn, rename drm_output_release_fb to drm_fb_unref
whilst changing its call signature here, even though it does not yet
actually perform reference counting.
Signed-off-by: Daniel Stone <daniels@collabora.com>
Reviewed-by: Armin Krezović <krezovic.armin@gmail.com>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
diff --git a/libweston/compositor-drm.c b/libweston/compositor-drm.c
index 8788da7..e4c91f2 100644
--- a/libweston/compositor-drm.c
+++ b/libweston/compositor-drm.c
@@ -146,6 +146,7 @@
/* Used by gbm fbs */
struct gbm_bo *bo;
+ struct gbm_surface *gbm_surface;
/* Used by dumb fbs */
void *map;
@@ -546,7 +547,7 @@
}
static void
-drm_output_release_fb(struct drm_output *output, struct drm_fb *fb)
+drm_fb_unref(struct drm_fb *fb)
{
if (!fb)
return;
@@ -559,7 +560,7 @@
gbm_bo_destroy(fb->bo);
break;
case BUFFER_GBM_SURFACE:
- gbm_surface_release_buffer(output->gbm_surface, fb->bo);
+ gbm_surface_release_buffer(fb->gbm_surface, fb->bo);
break;
default:
assert(NULL);
@@ -695,6 +696,7 @@
gbm_surface_release_buffer(output->gbm_surface, bo);
return;
}
+ output->next->gbm_surface = output->gbm_surface;
}
static void
@@ -883,7 +885,7 @@
err_pageflip:
output->cursor_view = NULL;
if (output->next) {
- drm_output_release_fb(output, output->next);
+ drm_fb_unref(output->next);
output->next = NULL;
}
@@ -988,7 +990,7 @@
drm_output_update_msc(output, frame);
output->vblank_pending = 0;
- drm_output_release_fb(output, s->current);
+ drm_fb_unref(s->current);
s->current = s->next;
s->next = NULL;
@@ -1022,7 +1024,7 @@
* we just want to page flip to the current buffer to get an accurate
* timestamp */
if (output->page_flip_pending) {
- drm_output_release_fb(output, output->current);
+ drm_fb_unref(output->current);
output->current = output->next;
output->next = NULL;
}
@@ -1559,8 +1561,8 @@
WL_OUTPUT_MODE_CURRENT | WL_OUTPUT_MODE_PREFERRED;
/* reset rendering stuff. */
- drm_output_release_fb(output, output->current);
- drm_output_release_fb(output, output->next);
+ drm_fb_unref(output->current);
+ drm_fb_unref(output->next);
output->current = output->next = NULL;
if (b->use_pixman) {
@@ -2784,8 +2786,8 @@
sprite->plane_id,
output->crtc_id, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0);
- drm_output_release_fb(output, sprite->current);
- drm_output_release_fb(output, sprite->next);
+ drm_fb_unref(sprite->current);
+ drm_fb_unref(sprite->next);
weston_plane_release(&sprite->plane);
free(sprite);
}