From: Jason Ekstrand <jason.ekstrand@intel.com>
Date: Mon, 14 Aug 2017 17:08:14 +0000 (-0700)
Subject: i965/screen: Stop redefining DRM_FORMAT_MOD_(INVALID|LINEAR)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=51eb40d4145024be59b50949009bcea97736646d;p=mesa.git

i965/screen: Stop redefining DRM_FORMAT_MOD_(INVALID|LINEAR)

Reviewed-by: Ben Widawsky <ben@bwidawsk.net>
---

diff --git a/src/mesa/drivers/dri/i965/intel_screen.c b/src/mesa/drivers/dri/i965/intel_screen.c
index 452f0d186cd..a22d63eea0e 100644
--- a/src/mesa/drivers/dri/i965/intel_screen.c
+++ b/src/mesa/drivers/dri/i965/intel_screen.c
@@ -43,14 +43,6 @@
 #include "utils.h"
 #include "util/xmlpool.h"
 
-#ifndef DRM_FORMAT_MOD_INVALID
-#define DRM_FORMAT_MOD_INVALID ((1ULL<<56) - 1)
-#endif
-
-#ifndef DRM_FORMAT_MOD_LINEAR
-#define DRM_FORMAT_MOD_LINEAR 0
-#endif
-
 static const __DRIconfigOptionsExtension brw_config_options = {
    .base = { __DRI_CONFIG_OPTIONS, 1 },
    .xml =