From: Maxime Ripard <maxime.ripard@bootlin.com>
Date: Mon, 7 Jan 2019 15:43:24 +0000 (+0100)
Subject: Merge tag 'topic/drmp-cleanup-2019-01-02' of git://anongit.freedesktop.org/drm/drm...
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=1c95f662fcee;p=linux.git
Merge tag 'topic/drmp-cleanup-2019-01-02' of git://anongit.freedesktop.org/drm/drm-intel into drm-misc-next
Make some drm headers self-contained with includes and forward declarations
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
# gpg: Signature made Wed 02 Jan 2019 10:47:51 AM CET
# gpg: using RSA key 1565A65B77B0632E1124E59CD398079D26ABEE6F
# gpg: Can't check signature: No public key
From: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/87pntfl6pa.fsf@intel.com
---
1c95f662fceeb8ae2f34e3de9478e21fd31f09dd
diff --cc include/drm/drm_syncobj.h
index 7c6ed845c70dc,ef57215126328..0311c9fdbd2f2
--- a/include/drm/drm_syncobj.h
+++ b/include/drm/drm_syncobj.h
@@@ -26,8 -26,17 +26,10 @@@
#ifndef __DRM_SYNCOBJ_H__
#define __DRM_SYNCOBJ_H__
- #include "linux/dma-fence.h"
+ #include <linux/dma-fence.h>
+
+ struct drm_file;
-struct drm_syncobj_cb;
-
-enum drm_syncobj_type {
- DRM_SYNCOBJ_TYPE_BINARY,
- DRM_SYNCOBJ_TYPE_TIMELINE
-};
-
/**
* struct drm_syncobj - sync object.
*