mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-11-03 09:01:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

backend/drm: stop using goto in set_plane_props()

Browse source 
We only have one error code-path, no need for goto here.
This commit is contained in:
Simon Ser 2022-12-06 17:23:18 +01:00
parent 72d1fd1446
commit bc2d2e853b
1 changed files with 3 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

11
backend/drm/atomic.c
View file

@ -176,8 +176,9 @@ static void set_plane_props(struct atomic *atom, struct wlr_drm_backend *drm,
const union wlr_drm_plane_props *props = &plane->props; const union wlr_drm_plane_props *props = &plane->props;
struct wlr_drm_fb *fb = plane_get_next_fb(plane); struct wlr_drm_fb *fb = plane_get_next_fb(plane);
if (fb == NULL) { if (fb == NULL) {
wlr_log(WLR_ERROR, "Failed to acquire FB"); wlr_log(WLR_ERROR, "Failed to acquire FB for plane %"PRIu32, plane->id);
goto error; atom->failed = true;
return;
} }
uint32_t width = fb->wlr_buf->width; uint32_t width = fb->wlr_buf->width;
@ -194,12 +195,6 @@ static void set_plane_props(struct atomic *atom, struct wlr_drm_backend *drm,
atomic_add(atom, id, props->crtc_id, crtc_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_x, (uint64_t)x);
atomic_add(atom, id, props->crtc_y, (uint64_t)y); atomic_add(atom, id, props->crtc_y, (uint64_t)y);
return;
error:
wlr_log(WLR_ERROR, "Failed to set plane %"PRIu32" properties", plane->id);
atom->failed = true;
} }
static bool atomic_crtc_commit(struct wlr_drm_connector *conn, static bool atomic_crtc_commit(struct wlr_drm_connector *conn,