From b9ca8013248a57440a0fc8b0b318473a5b2fa5f6 Mon Sep 17 00:00:00 2001
From: Pekka Paalanen <pekka.paalanen@collabora.com>
Date: Thu, 4 Feb 2021 17:31:40 +0200
Subject: [PATCH] drop MOD_INVALID, MOD_LINEAR definitions

MOD_INVALID came with libdrm 2.4.83 and MOD_LINEAR came with libdrm
2.4.82. libweston unconditionally depends on libdrm >= 2.4.95, so the
fallback is not necessary.

Since linux-dmabuf.h itself has no use for these and also forgets to
include drm_fourcc.h, .c files including drm_fourcc.h after this header
would trigger compiler warnings.

linux-dmabuf.c does need these, so add the proper include.

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.com>
---
 clients/simple-dmabuf-egl.c | 4 ----
 libweston/backend-drm/kms.c | 4 ----
 libweston/linux-dmabuf.c    | 2 ++
 libweston/linux-dmabuf.h    | 6 ------
 4 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/clients/simple-dmabuf-egl.c b/clients/simple-dmabuf-egl.c
index 10e72a9bc..6d34942ae 100644
--- a/clients/simple-dmabuf-egl.c
+++ b/clients/simple-dmabuf-egl.c
@@ -60,10 +60,6 @@
 
 #include "shared/weston-egl-ext.h"
 
-#ifndef DRM_FORMAT_MOD_INVALID
-#define DRM_FORMAT_MOD_INVALID ((1ULL << 56) - 1)
-#endif
-
 /* Possible options that affect the displayed image */
 #define OPT_IMMEDIATE     (1 << 0)  /* create wl_buffer immediately */
 #define OPT_IMPLICIT_SYNC (1 << 1)  /* force implicit sync */
diff --git a/libweston/backend-drm/kms.c b/libweston/backend-drm/kms.c
index f28950697..64f23d861 100644
--- a/libweston/backend-drm/kms.c
+++ b/libweston/backend-drm/kms.c
@@ -42,10 +42,6 @@
 #include "pixel-formats.h"
 #include "presentation-time-server-protocol.h"
 
-#ifndef DRM_FORMAT_MOD_LINEAR
-#define DRM_FORMAT_MOD_LINEAR 0
-#endif
-
 struct drm_property_enum_info plane_type_enums[] = {
 	[WDRM_PLANE_TYPE_PRIMARY] = {
 		.name = "Primary",
diff --git a/libweston/linux-dmabuf.c b/libweston/linux-dmabuf.c
index 796e98266..fb41897b4 100644
--- a/libweston/linux-dmabuf.c
+++ b/libweston/linux-dmabuf.c
@@ -30,6 +30,8 @@
 #include <unistd.h>
 #include <sys/types.h>
 
+#include <drm_fourcc.h>
+
 #include <libweston/libweston.h>
 #include "linux-dmabuf.h"
 #include "linux-dmabuf-unstable-v1-server-protocol.h"
diff --git a/libweston/linux-dmabuf.h b/libweston/linux-dmabuf.h
index 926dd9e0b..b89f03f16 100644
--- a/libweston/linux-dmabuf.h
+++ b/libweston/linux-dmabuf.h
@@ -29,12 +29,6 @@
 #include <stdint.h>
 
 #define MAX_DMABUF_PLANES 4
-#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
 
 struct linux_dmabuf_buffer;
 typedef void (*dmabuf_user_data_destroy_func)(