winsys/radeon: remove fall-back defines

Provided by libdrm as of last commit.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>

diff --git a/src/gallium/winsys/radeon/drm/radeon_drm_bo.c b/src/gallium/winsys/radeon/drm/radeon_drm_bo.c
index 9872861525c52e7789bfb26f1b8bd672b40cf4f8..2524339c9ee8ae3cef1e8d73d142f2952fd72ef1 100644 (file)
--- a/src/gallium/winsys/radeon/drm/radeon_drm_bo.c
+++ b/src/gallium/winsys/radeon/drm/radeon_drm_bo.c
@@ -582,18 +582,6 @@ static const struct pb_vtbl radeon_bo_vtbl = {
     /* other functions are never called */
 };
 
-#ifndef RADEON_GEM_GTT_WC
-#define RADEON_GEM_GTT_WC              (1 << 2)
-#endif
-#ifndef RADEON_GEM_CPU_ACCESS
-/* BO is expected to be accessed by the CPU */
-#define RADEON_GEM_CPU_ACCESS          (1 << 3)
-#endif
-#ifndef RADEON_GEM_NO_CPU_ACCESS
-/* CPU access is not expected to work for this BO */
-#define RADEON_GEM_NO_CPU_ACCESS       (1 << 4)
-#endif
-
 static struct radeon_bo *radeon_create_bo(struct radeon_drm_winsys *rws,
                                           unsigned size, unsigned alignment,
                                           unsigned usage,

diff --git a/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c b/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c
index bdcf1946595d397534676883f59bcc82cc0b3d45..6c077ea0abc1a4cf674ad61a5807e01ed832b913 100644 (file)
--- a/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c
+++ b/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c
@@ -46,23 +46,6 @@
 #include <fcntl.h>
 #include <radeon_surface.h>
 
-#ifndef RADEON_INFO_ACTIVE_CU_COUNT
-#define RADEON_INFO_ACTIVE_CU_COUNT 0x20
-#endif
-
-#ifndef RADEON_INFO_CURRENT_GPU_TEMP
-#define RADEON_INFO_CURRENT_GPU_TEMP   0x21
-#define RADEON_INFO_CURRENT_GPU_SCLK   0x22
-#define RADEON_INFO_CURRENT_GPU_MCLK   0x23
-#define RADEON_INFO_READ_REG           0x24
-#endif
-
-#define RADEON_INFO_VA_UNMAP_WORKING   0x25
-
-#ifndef RADEON_INFO_GPU_RESET_COUNTER
-#define RADEON_INFO_GPU_RESET_COUNTER   0x26
-#endif
-
 static struct util_hash_table *fd_tab = NULL;
 pipe_static_mutex(fd_tab_mutex);
 

diff --git a/src/gallium/winsys/radeon/drm/radeon_drm_winsys.h b/src/gallium/winsys/radeon/drm/radeon_drm_winsys.h
index 7f2d99d372cb55b98a406d7b122ce57273fd9edb..04659e45ef73d1548c0d27de826bdf06a7f6f3dd 100644 (file)
--- a/src/gallium/winsys/radeon/drm/radeon_drm_winsys.h
+++ b/src/gallium/winsys/radeon/drm/radeon_drm_winsys.h
@@ -37,24 +37,6 @@
 #include "util/list.h"
 #include <radeon_drm.h>
 
-#ifndef DRM_RADEON_GEM_USERPTR
-
-#define DRM_RADEON_GEM_USERPTR         0x2d
-
-#define RADEON_GEM_USERPTR_READONLY    (1 << 0)
-#define RADEON_GEM_USERPTR_ANONONLY    (1 << 1)
-#define RADEON_GEM_USERPTR_VALIDATE    (1 << 2)
-#define RADEON_GEM_USERPTR_REGISTER    (1 << 3)
-
-struct drm_radeon_gem_userptr {
-       uint64_t                addr;
-       uint64_t                size;
-       uint32_t                flags;
-       uint32_t                handle;
-};
-
-#endif
-
 struct radeon_drm_cs;
 
 enum radeon_generation {