Drop use of the deprecated drmP.h header. Replace with necessary includes.
Signed-off-by: Sam Ravnborg sam@ravnborg.org Cc: David Airlie airlied@linux.ie Cc: Daniel Vetter daniel@ffwll.ch Cc: Dan Carpenter dan.carpenter@oracle.com Cc: Sam Ravnborg sam@ravnborg.org --- 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/i810/i810_dma.c | 17 ++++++++++++----- drivers/gpu/drm/i810/i810_drv.c | 8 +++++--- drivers/gpu/drm/i810/i810_drv.h | 2 ++ 3 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/drivers/gpu/drm/i810/i810_dma.c b/drivers/gpu/drm/i810/i810_dma.c index 3b378936f575..2a77823b8e9a 100644 --- a/drivers/gpu/drm/i810/i810_dma.c +++ b/drivers/gpu/drm/i810/i810_dma.c @@ -30,13 +30,20 @@ * */
-#include <drm/drmP.h> +#include <linux/delay.h> +#include <linux/mman.h> + +#include <drm/drm_agpsupport.h> +#include <drm/drm_device.h> +#include <drm/drm_drv.h> +#include <drm/drm_file.h> +#include <drm/drm_ioctl.h> +#include <drm/drm_irq.h> +#include <drm/drm_pci.h> +#include <drm/drm_print.h> #include <drm/i810_drm.h> + #include "i810_drv.h" -#include <linux/interrupt.h> /* For task queue support */ -#include <linux/delay.h> -#include <linux/slab.h> -#include <linux/pagemap.h>
#define I810_BUF_FREE 2 #define I810_BUF_CLIENT 1 diff --git a/drivers/gpu/drm/i810/i810_drv.c b/drivers/gpu/drm/i810/i810_drv.c index c69d5c487f51..5dd26a06ee0e 100644 --- a/drivers/gpu/drm/i810/i810_drv.c +++ b/drivers/gpu/drm/i810/i810_drv.c @@ -30,13 +30,15 @@ * Gareth Hughes gareth@valinux.com */
+#include "i810_drv.h" #include <linux/module.h>
-#include <drm/drmP.h> +#include <drm/drm_drv.h> +#include <drm/drm_file.h> +#include <drm/drm_pci.h> +#include <drm/drm_pciids.h> #include <drm/i810_drm.h> -#include "i810_drv.h"
-#include <drm/drm_pciids.h>
static struct pci_device_id pciidlist[] = { i810_PCI_IDS diff --git a/drivers/gpu/drm/i810/i810_drv.h b/drivers/gpu/drm/i810/i810_drv.h index c73d2f2da57b..9df3981ffc66 100644 --- a/drivers/gpu/drm/i810/i810_drv.h +++ b/drivers/gpu/drm/i810/i810_drv.h @@ -32,7 +32,9 @@ #ifndef _I810_DRV_H_ #define _I810_DRV_H_
+#include <drm/drm_ioctl.h> #include <drm/drm_legacy.h> +#include <drm/i810_drm.h>
/* General customization: */