[Intel-gfx] [PATCH v1 11/11] drm: drop uapi dependency from drm_file.h

[Sam Ravnborg]

drm_file used drm_magic_t from uapi/drm/drm.h.
This is a simple unsigned int.
Just opencode it as such to break the dependency from this header file
to uapi.

Signed-off-by: Sam Ravnborg <sam at ravnborg.org>
Suggested-by: Daniel Vetter <daniel.vetter at ffwll.ch>
Cc: Sean Paul <seanpaul at chromium.org>
Cc: Liviu Dudau <Liviu.Dudau at arm.com>
Cc: Chris Wilson <chris at chris-wilson.co.uk>
Cc: Maarten Lankhorst <maarten.lankhorst at linux.intel.com>
Cc: Maxime Ripard <maxime.ripard at bootlin.com>
Cc: David Airlie <airlied at linux.ie>
Cc: Daniel Vetter <daniel at ffwll.ch>
Cc: Jani Nikula <jani.nikula at intel.com>
Cc: Eric Anholt <eric at anholt.net>
---
 include/drm/drm_file.h | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/include/drm/drm_file.h b/include/drm/drm_file.h
index 67af60bb527a..046cd1bf91eb 100644
--- a/include/drm/drm_file.h
+++ b/include/drm/drm_file.h
@@ -34,8 +34,6 @@
 #include <linux/completion.h>
 #include <linux/idr.h>
 
-#include <uapi/drm/drm.h>
-
 #include <drm/drm_prime.h>
 
 struct dma_fence;
@@ -227,7 +225,7 @@ struct drm_file {
 	struct pid *pid;
 
 	/** @magic: Authentication magic, see @authenticated. */
-	drm_magic_t magic;
+	unsigned int magic;
 
 	/**
 	 * @lhead:
-- 
2.20.1