From cdb6fdbc6cb734e174bfcb53e4622eeef89d0d79 Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Mon, 11 May 2020 10:53:17 +0200 Subject: [PATCH] backend/drm: remove missing cursor plane workaround We have a workaround for legacy drivers that support drmModeSetCursor without exposing a cursor plane. It doesn't work anymore now that we've moved to a more atomic interface. Let's just remove this workaround and fallback to software cursors. Closes: https://github.com/swaywm/wlroots/issues/2166 --- backend/drm/drm.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/backend/drm/drm.c b/backend/drm/drm.c index 9e71e45e..12aacd80 100644 --- a/backend/drm/drm.c +++ b/backend/drm/drm.c @@ -941,14 +941,8 @@ static bool drm_connector_set_cursor(struct wlr_output *output, } struct wlr_drm_plane *plane = crtc->cursor; - if (!plane) { - // We don't have a real cursor plane, so we make a fake one - plane = calloc(1, sizeof(*plane)); - if (!plane) { - wlr_log_errno(WLR_ERROR, "Allocation failed"); - return false; - } - crtc->cursor = plane; + if (plane == NULL) { + return false; } if (!plane->surf.gbm) {