From 4dc785728aacdf63e123c801215f686d547819c1 Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Wed, 1 Mar 2017 15:29:09 -0800 Subject: i965: Drop duplicate #defines now that we've bumped libdrm requirements. We've updated our libdrm requirement, and it will already provide these. Signed-off-by: Kenneth Graunke Reviewed-by: Jason Ekstrand Reviewed-by: Emil Velikov --- src/mesa/drivers/dri/i965/intel_batchbuffer.c | 5 ----- src/mesa/drivers/dri/i965/intel_screen.c | 8 -------- 2 files changed, 13 deletions(-) diff --git a/src/mesa/drivers/dri/i965/intel_batchbuffer.c b/src/mesa/drivers/dri/i965/intel_batchbuffer.c index 67054cf77fe..3e87e3479ae 100644 --- a/src/mesa/drivers/dri/i965/intel_batchbuffer.c +++ b/src/mesa/drivers/dri/i965/intel_batchbuffer.c @@ -311,11 +311,6 @@ throttle(struct brw_context *brw) } } -/* Drop when RS headers get pulled to libdrm */ -#ifndef I915_EXEC_RESOURCE_STREAMER -#define I915_EXEC_RESOURCE_STREAMER (1<<15) -#endif - /* TODO: Push this whole function into bufmgr. */ static int diff --git a/src/mesa/drivers/dri/i965/intel_screen.c b/src/mesa/drivers/dri/i965/intel_screen.c index f98431f8669..991fb5b620c 100644 --- a/src/mesa/drivers/dri/i965/intel_screen.c +++ b/src/mesa/drivers/dri/i965/intel_screen.c @@ -1597,11 +1597,6 @@ brw_get_revision(int fd) return revision; } -/* Drop when RS headers get pulled to libdrm */ -#ifndef I915_PARAM_HAS_RESOURCE_STREAMER -#define I915_PARAM_HAS_RESOURCE_STREAMER 36 -#endif - static void shader_debug_log_mesa(void *data, const char *fmt, ...) { @@ -1695,9 +1690,6 @@ __DRIconfig **intelInitScreen2(__DRIscreen *dri_screen) if (INTEL_DEBUG & DEBUG_AUB) drm_intel_bufmgr_gem_set_aub_dump(screen->bufmgr, true); -#ifndef I915_PARAM_MMAP_GTT_VERSION -#define I915_PARAM_MMAP_GTT_VERSION 40 /* XXX delete me with new libdrm */ -#endif if (intel_get_integer(screen, I915_PARAM_MMAP_GTT_VERSION) >= 1) { /* Theorectically unlimited! At least for individual objects... * -- cgit v1.2.3