summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmil Velikov <emil.l.velikov@gmail.com>2016-09-29 18:35:04 +0100
committerAdam Jackson <ajax@redhat.com>2016-10-05 14:38:13 -0400
commitcc69d4f110bd8a87b9e6c238ebebf8d85cbd93ec (patch)
treee2a9beda74cd486a232ac15622bdbada1543c0b2
parent962962e978e5cededc20e577a36f77eb24d14bda (diff)
xfree86/dri: remove libdrm runtime checks
As of last commit all the places in our configure.ac require version 2.3.1 (released back in 2007) or later. With the latter introducing the 1.3.0 version, as returned by drmGetLibVersion. Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Reviewed-by: Adam Jackson <ajax@redhat.com>
-rw-r--r--hw/xfree86/dri/dri.c22
1 files changed, 1 insertions, 21 deletions
diff --git a/hw/xfree86/dri/dri.c b/hw/xfree86/dri/dri.c
index e4a21dc06..0142b6ea7 100644
--- a/hw/xfree86/dri/dri.c
+++ b/hw/xfree86/dri/dri.c
@@ -158,9 +158,6 @@ DRIOpenDRMMaster(ScrnInfoPtr pScrn,
Bool drmWasAvailable;
DRIEntPrivPtr pDRIEntPriv;
DRIEntPrivRec tmp;
- drmVersionPtr drmlibv;
- int drmlibmajor, drmlibminor;
- const char *openBusID;
int count;
int err;
@@ -176,23 +173,6 @@ DRIOpenDRMMaster(ScrnInfoPtr pScrn,
memset(&tmp, 0, sizeof(tmp));
- /* Check the DRM lib version.
- */
-
- drmlibmajor = 1;
- drmlibminor = 0;
- drmlibv = drmGetLibVersion(-1);
- if (drmlibv != NULL) {
- drmlibmajor = drmlibv->version_major;
- drmlibminor = drmlibv->version_minor;
- drmFreeVersion(drmlibv);
- }
-
- /* Check if the libdrm can handle falling back to loading based on name
- * if a busid string is passed.
- */
- openBusID = (drmlibmajor == 1 && drmlibminor >= 2) ? busID : NULL;
-
tmp.drmFD = -1;
sv.drm_di_major = 1;
sv.drm_di_minor = 1;
@@ -201,7 +181,7 @@ DRIOpenDRMMaster(ScrnInfoPtr pScrn,
saveSv = sv;
count = 10;
while (count--) {
- tmp.drmFD = drmOpen(drmDriverName, openBusID);
+ tmp.drmFD = drmOpen(drmDriverName, busID);
if (tmp.drmFD < 0) {
DRIDrvMsg(-1, X_ERROR, "[drm] drmOpen failed.\n");