[PATCH v1 20/33] drm/vgem: drop use of drmP.h

[Sam Ravnborg]

Drop use of the deprecated header drmP.h.
Replace with necessary includes in the individual .c files.

Signed-off-by: Sam Ravnborg <sam at ravnborg.org>
Cc: David Airlie <airlied at linux.ie>
Cc: Daniel Vetter <daniel at ffwll.ch>
Cc: Emil Velikov <emil.velikov at collabora.com>
Cc: Eric Anholt <eric at anholt.net>
Cc: Chris Wilson <chris at chris-wilson.co.uk>
Cc: Rodrigo Siqueira <rodrigosiqueiramelo at gmail.com>
Cc: Eric Biggers <ebiggers at google.com>
Cc: Deepak Sharma <deepak.sharma at amd.com>
Cc: Thomas Zimmermann <tzimmermann at suse.de>
Cc: Dan Carpenter <dan.carpenter at oracle.com>
Cc: Imre Deak <imre.deak at intel.com>
Cc: "Christian König" <christian.koenig at amd.com>
Cc: "Michel Dänzer" <michel.daenzer at amd.com>
Cc: Sam Ravnborg <sam at ravnborg.org>
Cc: Thierry Reding <treding at nvidia.com>
---
The list of cc: was too large to add all recipients to the cover letter.
Please find cover letter here:
https://lists.freedesktop.org/archives/dri-devel/2019-June/thread.html
Search for "drm: drop use of drmp.h in drm-misc"

        Sam

 drivers/gpu/drm/vgem/vgem_drv.c   | 11 +++++++++--
 drivers/gpu/drm/vgem/vgem_drv.h   |  1 -
 drivers/gpu/drm/vgem/vgem_fence.c |  2 ++
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/vgem/vgem_drv.c b/drivers/gpu/drm/vgem/vgem_drv.c
index 386efc3b5843..27222631cbae 100644
--- a/drivers/gpu/drm/vgem/vgem_drv.c
+++ b/drivers/gpu/drm/vgem/vgem_drv.c
@@ -30,10 +30,17 @@
  * software renderer and the X server for efficient buffer sharing.
  */
 
+#include <linux/dma-buf.h>
 #include <linux/module.h>
-#include <linux/ramfs.h>
+#include <linux/platform_device.h>
 #include <linux/shmem_fs.h>
-#include <linux/dma-buf.h>
+#include <linux/vmalloc.h>
+
+#include <drm/drm_drv.h>
+#include <drm/drm_file.h>
+#include <drm/drm_ioctl.h>
+#include <drm/drm_prime.h>
+
 #include "vgem_drv.h"
 
 #define DRIVER_NAME	"vgem"
diff --git a/drivers/gpu/drm/vgem/vgem_drv.h b/drivers/gpu/drm/vgem/vgem_drv.h
index 5c8f6d619ff3..0ed300317f87 100644
--- a/drivers/gpu/drm/vgem/vgem_drv.h
+++ b/drivers/gpu/drm/vgem/vgem_drv.h
@@ -29,7 +29,6 @@
 #ifndef _VGEM_DRV_H_
 #define _VGEM_DRV_H_
 
-#include <drm/drmP.h>
 #include <drm/drm_gem.h>
 #include <drm/drm_cache.h>
 
diff --git a/drivers/gpu/drm/vgem/vgem_fence.c b/drivers/gpu/drm/vgem/vgem_fence.c
index 08997fdd3ccb..d8630467549c 100644
--- a/drivers/gpu/drm/vgem/vgem_fence.c
+++ b/drivers/gpu/drm/vgem/vgem_fence.c
@@ -23,6 +23,8 @@
 #include <linux/dma-buf.h>
 #include <linux/reservation.h>
 
+#include <drm/drm_file.h>
+
 #include "vgem_drv.h"
 
 #define VGEM_FENCE_TIMEOUT (10*HZ)
-- 
2.20.1