diff options
| author | Simon Ser <contact@emersion.fr> | 2020-12-15 12:21:40 +0100 |
|---|---|---|
| committer | Simon Ser <contact@emersion.fr> | 2020-12-22 15:53:10 +0100 |
| commit | d3bcd63a4002394f86a2d7fe80dcb2d5b4ea5f93 (patch) | |
| tree | 0e710a919ef7551da8928eb0832756d3279eab59 /backend/drm/atomic.c | |
| parent | 5ee8b12dc3fe26f27116547d480c2b2637b242bb (diff) | |
| download | wlroots-d3bcd63a4002394f86a2d7fe80dcb2d5b4ea5f93.tar.xz | |
backend/drm: remove drm_fb_acquire
Instead, import the buffer into GBM and KMS in drm_fb_import. Also move
the multi-GPU copy there if necessary.
Diffstat (limited to 'backend/drm/atomic.c')
| -rw-r--r-- | backend/drm/atomic.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/backend/drm/atomic.c b/backend/drm/atomic.c index 3e2047e4..5b4f8f79 100644 --- a/backend/drm/atomic.c +++ b/backend/drm/atomic.c @@ -135,8 +135,8 @@ static void set_plane_props(struct atomic *atom, struct wlr_drm_backend *drm, uint32_t id = plane->id; const union wlr_drm_plane_props *props = &plane->props; struct wlr_drm_fb *fb = plane_get_next_fb(plane); - uint32_t fb_id = drm_fb_acquire(fb, drm, &plane->mgpu_surf); - if (!fb_id) { + if (!fb->id) { + wlr_log(WLR_ERROR, "Failed to acquire FB"); goto error; } @@ -147,7 +147,7 @@ static void set_plane_props(struct atomic *atom, struct wlr_drm_backend *drm, atomic_add(atom, id, props->src_h, (uint64_t)plane->surf.height << 16); atomic_add(atom, id, props->crtc_w, plane->surf.width); atomic_add(atom, id, props->crtc_h, plane->surf.height); - atomic_add(atom, id, props->fb_id, fb_id); + atomic_add(atom, id, props->fb_id, fb->id); atomic_add(atom, id, props->crtc_id, crtc_id); atomic_add(atom, id, props->crtc_x, (uint64_t)x); atomic_add(atom, id, props->crtc_y, (uint64_t)y); |