mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2026-04-21 06:46:46 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

backend/drm: pass wlr_drm_crtc in set_plane_props()

Browse source 
This is more type-safe than passing an integer: mixing it up with
coordinates will give an error, for instance.
This commit is contained in:
Simon Ser 2022-12-06 17:57:54 +01:00
parent 8f58c060fd
commit de8cc83ef3
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
backend/drm/atomic.c
View file

@ -171,7 +171,7 @@ static void plane_disable(struct atomic *atom, struct wlr_drm_plane *plane) {
} }
static void set_plane_props(struct atomic *atom, struct wlr_drm_backend *drm, static void set_plane_props(struct atomic *atom, struct wlr_drm_backend *drm,
struct wlr_drm_plane *plane, struct wlr_drm_fb *fb, uint32_t crtc_id, struct wlr_drm_plane *plane, struct wlr_drm_fb *fb, struct wlr_drm_crtc *crtc,
int32_t x, int32_t y) { int32_t x, int32_t y) {
uint32_t id = plane->id; uint32_t id = plane->id;
const union wlr_drm_plane_props *props = &plane->props; const union wlr_drm_plane_props *props = &plane->props;
@ -193,7 +193,7 @@ static void set_plane_props(struct atomic *atom, struct wlr_drm_backend *drm,
atomic_add(atom, id, props->crtc_w, width); atomic_add(atom, id, props->crtc_w, width);
atomic_add(atom, id, props->crtc_h, height); atomic_add(atom, id, props->crtc_h, 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_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);
} }
@ -294,7 +294,7 @@ static bool atomic_crtc_commit(struct wlr_drm_connector *conn,
if (crtc->props.vrr_enabled != 0) { if (crtc->props.vrr_enabled != 0) {
atomic_add(&atom, crtc->id, crtc->props.vrr_enabled, vrr_enabled); atomic_add(&atom, crtc->id, crtc->props.vrr_enabled, vrr_enabled);
} }
set_plane_props(&atom, drm, crtc->primary, state->primary_fb, crtc->id, set_plane_props(&atom, drm, crtc->primary, state->primary_fb, crtc,
0, 0); 0, 0);
if (crtc->primary->props.fb_damage_clips != 0) { if (crtc->primary->props.fb_damage_clips != 0) {
atomic_add(&atom, crtc->primary->id, atomic_add(&atom, crtc->primary->id,
@ -303,7 +303,7 @@ static bool atomic_crtc_commit(struct wlr_drm_connector *conn,
if (crtc->cursor) { if (crtc->cursor) {
if (drm_connector_is_cursor_visible(conn)) { if (drm_connector_is_cursor_visible(conn)) {
set_plane_props(&atom, drm, crtc->cursor, get_next_cursor_fb(conn), set_plane_props(&atom, drm, crtc->cursor, get_next_cursor_fb(conn),
crtc->id, conn->cursor_x, conn->cursor_y); crtc, conn->cursor_x, conn->cursor_y);
} else { } else {
plane_disable(&atom, crtc->cursor); plane_disable(&atom, crtc->cursor);
} }