[Mesa-dev] [PATCH 4/4] st/dri: remove #ifdef DRM_CAP_PRIME guard

Emil Velikov emil.l.velikov at gmail.com
Wed Feb 12 17:03:07 PST 2014


Required for libdrm 2.4.37 and earlier. Both scons and automake
require version 2.4.38 now so that guard is not longer needed.

Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
---
 src/gallium/state_trackers/dri/drm/dri2.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/gallium/state_trackers/dri/drm/dri2.c b/src/gallium/state_trackers/dri/drm/dri2.c
index 0589644..973773c 100644
--- a/src/gallium/state_trackers/dri/drm/dri2.c
+++ b/src/gallium/state_trackers/dri/drm/dri2.c
@@ -1053,7 +1053,6 @@ dri2_init_screen(__DRIscreen * sPriv)
       screen->default_throttle_frames = throttle_ret->val.val_int;
    }
 
-#ifdef DRM_CAP_PRIME /* Old libdrm? */
    if (dmabuf_ret && dmabuf_ret->val.val_bool) {
       uint64_t cap;
 
@@ -1064,7 +1063,6 @@ dri2_init_screen(__DRIscreen * sPriv)
          dri2ImageExtension.createImageFromFds = dri2_from_fds;
       }
    }
-#endif /* DRM_CAP_PRIME */
 
    sPriv->extensions = dri_screen_extensions;
 
-- 
1.8.5.4



More information about the mesa-dev mailing list