commit 3fe15e7
Michael Forney
·
2022-10-22 06:32:49 +0000 UTC
parent 6586736
wayland-drm: Finish removal of wl_drm_authenticate In 6586736176, usage of wl_drm_authenticate was removed, but we still waited for an authenticate event to use the device. This caused DRM drivers to never be selected and we always fell back to SHM.
1 files changed,
+1,
-13
+1,
-13
1@@ -42,7 +42,6 @@ struct drm_context {
2 struct wl_array formats;
3 uint32_t capabilities;
4 int fd;
5- bool authenticated;
6 };
7
8 #define WAYLAND_IMPL_NAME drm
9@@ -118,14 +117,6 @@ wayland_create_context(struct wl_display *display,
10 goto error3;
11 }
12
13- /* Wait for DRM authentication. */
14- wl_display_roundtrip_queue(display, queue);
15-
16- if (!context->authenticated) {
17- DEBUG("DRM authentication failed\n");
18- goto error4;
19- }
20-
21 if (!(context->driver_context = wld_drm_create_context(context->fd))) {
22 DEBUG("Couldn't initialize context for DRM device\n");
23 goto error4;
24@@ -166,7 +157,7 @@ wld_wayland_drm_get_fd(struct wld_context *base)
25 {
26 struct drm_context *context = drm_context(base);
27
28- return context->authenticated ? context->fd : -1;
29+ return context->fd;
30 }
31
32 struct wld_renderer *
33@@ -280,9 +271,6 @@ drm_format(void *data, struct wl_drm *wl, uint32_t format)
34 void
35 drm_authenticated(void *data, struct wl_drm *wl)
36 {
37- struct drm_context *context = data;
38-
39- context->authenticated = true;
40 }
41
42 void