diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2022-06-14 12:00:27 +0200 |
|---|---|---|
| committer | Daniel Stone <daniels@collabora.com> | 2022-06-16 09:53:01 +0000 |
| commit | 3e44a6eb3d00a40555e80a4bd0c1cc020c126aec (patch) | |
| tree | f4e77b6ea67b8ee797b01e91ae196ac5a2f1a9d9 | |
| parent | f962b4895891a495e147d795cc47a7af9ca441f6 (diff) | |
| download | weston-3e44a6eb3d00a40555e80a4bd0c1cc020c126aec.tar.gz | |
backend-drm: don't try to disable planes on session deactivation
This uses the legacy DRM API it incomplete and no longer works anyways.
At this point, weston is no longer DRM master, so these calls fail with
"Permission denied".
So just remove the corresponding code.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | libweston/backend-drm/drm.c | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/libweston/backend-drm/drm.c b/libweston/backend-drm/drm.c index ffb584ad..98515c03 100644 --- a/libweston/backend-drm/drm.c +++ b/libweston/backend-drm/drm.c @@ -2686,9 +2686,7 @@ session_notify(struct wl_listener *listener, void *data) struct weston_compositor *compositor = data; struct drm_backend *b = to_drm_backend(compositor); struct drm_device *device = b->drm; - struct drm_plane *plane; struct drm_output *output; - struct drm_crtc *crtc; if (compositor->session_active) { weston_log("activating session\n"); @@ -2710,24 +2708,8 @@ session_notify(struct wl_listener *listener, void *data) * back, we schedule a repaint, which will process * pending frame callbacks. */ - wl_list_for_each(output, &compositor->output_list, base.link) { - crtc = output->crtc; + wl_list_for_each(output, &compositor->output_list, base.link) output->base.repaint_needed = false; - if (output->cursor_plane) - drmModeSetCursor(device->drm.fd, crtc->crtc_id, - 0, 0, 0); - } - - output = container_of(compositor->output_list.next, - struct drm_output, base.link); - crtc = output->crtc; - - wl_list_for_each(plane, &device->plane_list, link) { - if (plane->type != WDRM_PLANE_TYPE_OVERLAY) - continue; - drmModeSetPlane(device->drm.fd, plane->plane_id, crtc->crtc_id, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); - } } } |