summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJordan Justen <jordan.l.justen@intel.com>2021-02-06 15:33:03 -0800
committerJordan Justen <jordan.l.justen@intel.com>2021-02-08 00:00:25 -0800
commit6ca01bee804bdfcffa7ff78528ae371ec7e20963 (patch)
treeab075fb44368ea9421e65a95536af9e743285b19
parent6566714d2a68efab97f03fb648162976fbf7c89c (diff)
util/dma_buf: Prefer gbm over libdrm-inteldmabuf-prefer-gbm-over-libdrm-intel
The Intel OpenGL drivers and gbm are both part of the Mesa project. Therefore, assuming the OpenGL driver supports the graphics device, then gbm should support it as well. The libdrm installed on the system may be older and unable to recognize the graphics device. This can lead to the dmabuf tests failing simply due to an outdated libdrm. For this reason, it is preferable to rely on gbm if it available. Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
-rw-r--r--tests/util/piglit-framework-gl/piglit_drm_dma_buf.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/util/piglit-framework-gl/piglit_drm_dma_buf.c b/tests/util/piglit-framework-gl/piglit_drm_dma_buf.c
index 4a83e6dc4..56e1c6b7c 100644
--- a/tests/util/piglit-framework-gl/piglit_drm_dma_buf.c
+++ b/tests/util/piglit-framework-gl/piglit_drm_dma_buf.c
@@ -106,7 +106,7 @@ piglit_drm_x11_authenticate(int fd)
return true;
}
-#ifdef HAVE_LIBDRM_INTEL
+#if defined(HAVE_LIBDRM_INTEL) && !defined(PIGLIT_HAS_GBM_BO_MAP)
static drm_intel_bufmgr *
piglit_intel_bufmgr_get(void)
{
@@ -469,7 +469,7 @@ piglit_drm_get_driver(void)
if (0) {
/* empty */
}
-#ifdef HAVE_LIBDRM_INTEL
+#if defined(HAVE_LIBDRM_INTEL) && !defined(PIGLIT_HAS_GBM_BO_MAP)
else if (streq(version->name, "i915")) {
drv.create = piglit_intel_buf_create;
drv.export = piglit_intel_buf_export;