aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSam Ravnborg <sam@ravnborg.org>2019-07-16 02:42:13 -0400
committerSam Ravnborg <sam@ravnborg.org>2019-07-17 06:52:55 -0400
commit7b42a2f4e4b850ba9069a3927c50754da8aceb51 (patch)
tree82801eef2be700860e5244fb5dde02a621415226
parent53fa84b2fabfeb67bbc2f8f21b137ded0ae0bc43 (diff)
drm/vgem: drop use of drmP.h
Drop use of the deprecated header drmP.h. Replace with necessary includes in the individual .c files. Signed-off-by: Sam Ravnborg <sam@ravnborg.org> Acked-by: Emil Velikov <emil.velikov@collabora.com> Cc: David Airlie <airlied@linux.ie> Cc: Daniel Vetter <daniel@ffwll.ch> Cc: Deepak Sharma <deepak.sharma@amd.com> Cc: Thomas Zimmermann <tzimmermann@suse.de> Link: https://patchwork.freedesktop.org/patch/msgid/20190716064220.18157-13-sam@ravnborg.org
-rw-r--r--drivers/gpu/drm/vgem/vgem_drv.c11
-rw-r--r--drivers/gpu/drm/vgem/vgem_drv.h1
-rw-r--r--drivers/gpu/drm/vgem/vgem_fence.c2
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 76d95b5e289c..5bd60ded3d81 100644
--- a/drivers/gpu/drm/vgem/vgem_drv.c
+++ b/drivers/gpu/drm/vgem/vgem_drv.c
@@ -30,10 +30,17 @@
30 * software renderer and the X server for efficient buffer sharing. 30 * software renderer and the X server for efficient buffer sharing.
31 */ 31 */
32 32
33#include <linux/dma-buf.h>
33#include <linux/module.h> 34#include <linux/module.h>
34#include <linux/ramfs.h> 35#include <linux/platform_device.h>
35#include <linux/shmem_fs.h> 36#include <linux/shmem_fs.h>
36#include <linux/dma-buf.h> 37#include <linux/vmalloc.h>
38
39#include <drm/drm_drv.h>
40#include <drm/drm_file.h>
41#include <drm/drm_ioctl.h>
42#include <drm/drm_prime.h>
43
37#include "vgem_drv.h" 44#include "vgem_drv.h"
38 45
39#define DRIVER_NAME "vgem" 46#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 @@
29#ifndef _VGEM_DRV_H_ 29#ifndef _VGEM_DRV_H_
30#define _VGEM_DRV_H_ 30#define _VGEM_DRV_H_
31 31
32#include <drm/drmP.h>
33#include <drm/drm_gem.h> 32#include <drm/drm_gem.h>
34#include <drm/drm_cache.h> 33#include <drm/drm_cache.h>
35 34
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 @@
23#include <linux/dma-buf.h> 23#include <linux/dma-buf.h>
24#include <linux/reservation.h> 24#include <linux/reservation.h>
25 25
26#include <drm/drm_file.h>
27
26#include "vgem_drv.h" 28#include "vgem_drv.h"
27 29
28#define VGEM_FENCE_TIMEOUT (10*HZ) 30#define VGEM_FENCE_TIMEOUT (10*HZ)