From: Eric Anholt Date: Wed, 28 Feb 2018 22:16:54 +0000 (-0800) Subject: broadcom: Remove our defines of DRM_FORMAT_MOD_INVALID. X-Git-Tag: android-x86-8.1-r1~4848 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=2725ab2b12385eccfbdafe6f158661aca6bf778e;p=android-x86%2Fexternal-mesa.git broadcom: Remove our defines of DRM_FORMAT_MOD_INVALID. The imported drm_fourcc.h handles it now. --- diff --git a/src/gallium/drivers/vc4/vc4_resource.c b/src/gallium/drivers/vc4/vc4_resource.c index b77f752eed0..a86bd814d20 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 e73058fef53..1f0ddb1a295 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) {