Mesa (master): broadcom: Remove our defines of DRM_FORMAT_MOD_INVALID.

Eric Anholt anholt at kemper.freedesktop.org
Fri Mar 9 18:24:59 UTC 2018


Module: Mesa
Branch: master
Commit: 2725ab2b12385eccfbdafe6f158661aca6bf778e
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=2725ab2b12385eccfbdafe6f158661aca6bf778e

Author: Eric Anholt <eric at anholt.net>
Date:   Wed Feb 28 14:16:54 2018 -0800

broadcom: Remove our defines of DRM_FORMAT_MOD_INVALID.

The imported drm_fourcc.h handles it now.

---

 src/gallium/drivers/vc4/vc4_resource.c | 4 ----
 src/gallium/drivers/vc5/vc5_resource.c | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/src/gallium/drivers/vc4/vc4_resource.c b/src/gallium/drivers/vc4/vc4_resource.c
index b77f752eed..a86bd814d2 100644
--- a/src/gallium/drivers/vc4/vc4_resource.c
+++ b/src/gallium/drivers/vc4/vc4_resource.c
@@ -37,10 +37,6 @@
 #include "vc4_resource.h"
 #include "vc4_tiling.h"
 
-#ifndef DRM_FORMAT_MOD_INVALID
-#define DRM_FORMAT_MOD_INVALID ((1ULL << 56) - 1)
-#endif
-
 static bool
 vc4_resource_bo_alloc(struct vc4_resource *rsc)
 {
diff --git a/src/gallium/drivers/vc5/vc5_resource.c b/src/gallium/drivers/vc5/vc5_resource.c
index e73058fef5..1f0ddb1a29 100644
--- a/src/gallium/drivers/vc5/vc5_resource.c
+++ b/src/gallium/drivers/vc5/vc5_resource.c
@@ -39,10 +39,6 @@
 #include "vc5_tiling.h"
 #include "broadcom/cle/v3d_packet_v33_pack.h"
 
-#ifndef DRM_FORMAT_MOD_INVALID
-#define DRM_FORMAT_MOD_INVALID ((1ULL << 56) - 1)
-#endif
-
 static void
 vc5_debug_resource_layout(struct vc5_resource *rsc, const char *caller)
 {




More information about the mesa-commit mailing list