summaryrefslogtreecommitdiff
path: root/glamor
diff options
context:
space:
mode:
authorEmil Velikov <emil.velikov@collabora.com>2018-03-07 18:45:30 +0000
committerAdam Jackson <ajax@redhat.com>2018-03-21 10:06:12 -0400
commit22b489d27365d2513bf1cab6da92254e3bdbcf41 (patch)
tree677ab6d0e7565c7b3398a74fd520fde5592a6c36 /glamor
parente0748b10a8621066b404d713a76826907da777b9 (diff)
Remove always true GLAMOR_HAS_DRM_* guards
With earlier commit the required version was bumped to 2.4.89, thus the guards always evaluate to true. Fixes: e4e3447603b ("Add RandR leases with modesetting driver support [v6]") Cc: Keith Packard <keithp@keithp.com> Cc: Daniel Stone <daniels@collabora.com> Cc: Louis-Francis Ratté-Boulianne <lfrb@collabora.com> Signed-off-by: Emil Velikov <emil.velikov@collabora.com> Reviewed-by: Adam Jackson <ajax@redhat.com>
Diffstat (limited to 'glamor')
-rw-r--r--glamor/glamor_egl.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/glamor/glamor_egl.c b/glamor/glamor_egl.c
index eccc79561..2ea3efc58 100644
--- a/glamor/glamor_egl.c
+++ b/glamor/glamor_egl.c
@@ -801,11 +801,7 @@ glamor_egl_screen_init(ScreenPtr screen, struct glamor_context *glamor_ctx)
/* To do DRI3 device FD generation, we need to open a new fd
* to the same device we were handed in originally.
*/
-#ifdef GLAMOR_HAS_DRM_NAME_FROM_FD_2
glamor_egl->device_path = drmGetDeviceNameFromFd2(glamor_egl->fd);
-#else
- glamor_egl->device_path = drmGetDeviceNameFromFd(glamor_egl->fd);
-#endif
if (!dri3_screen_init(screen, &glamor_dri3_info)) {
xf86DrvMsg(scrn->scrnIndex, X_ERROR,