diff options
| author | Simon Ser <contact@emersion.fr> | 2020-12-18 16:24:36 +0100 |
|---|---|---|
| committer | Simon Ser <contact@emersion.fr> | 2021-01-10 11:24:44 +0100 |
| commit | c94728b53ade17d152ba1f600475140660db7a75 (patch) | |
| tree | afe3bbf109603ff26534574cfd1fe06acdcd7986 /backend/drm/atomic.c | |
| parent | d9bbc416a62c2d280e6921da6b25128a1b3a9e22 (diff) | |
backend/drm: stop using surface size for BO
Stop using wlr_drm_surface.{width,height} to figure out the size of a
gbm_bo. In the future we'll stop using wlr_drm_plane.surf, so these will
be zero. Instead, rely on gbm_bo_get_{width,height}.
Diffstat (limited to 'backend/drm/atomic.c')
| -rw-r--r-- | backend/drm/atomic.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/backend/drm/atomic.c b/backend/drm/atomic.c index a6a12278..75c79525 100644 --- a/backend/drm/atomic.c +++ b/backend/drm/atomic.c @@ -139,13 +139,16 @@ static void set_plane_props(struct atomic *atom, struct wlr_drm_backend *drm, goto error; } + uint32_t width = gbm_bo_get_width(fb->bo); + uint32_t height = gbm_bo_get_height(fb->bo); + // The src_* properties are in 16.16 fixed point atomic_add(atom, id, props->src_x, 0); atomic_add(atom, id, props->src_y, 0); - atomic_add(atom, id, props->src_w, (uint64_t)plane->surf.width << 16); - 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->src_w, (uint64_t)width << 16); + atomic_add(atom, id, props->src_h, (uint64_t)height << 16); + atomic_add(atom, id, props->crtc_w, width); + atomic_add(atom, id, props->crtc_h, height); 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); |