dri-devel Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Sam Ravnborg <sam@ravnborg.org>
To: dri-devel@lists.freedesktop.org
Cc: David Airlie <airlied@linux.ie>, Sam Ravnborg <sam@ravnborg.org>,
	Dan Carpenter <dan.carpenter@oracle.com>,
	Emil Velikov <emil.velikov@collabora.com>
Subject: [PATCH v2 13/19] drm/i810: drop use of drmP.h
Date: Tue, 16 Jul 2019 08:42:14 +0200	[thread overview]
Message-ID: <20190716064220.18157-14-sam@ravnborg.org> (raw)
In-Reply-To: <20190716064220.18157-1-sam@ravnborg.org>

Drop use of the deprecated drmP.h header.
Replace with necessary includes.

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: Dan Carpenter <dan.carpenter@oracle.com>
---
 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:
  */
-- 
2.20.1

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

  parent reply	other threads:[~2019-07-16  6:45 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-07-16  6:42 [PATCH v2 0/19] drm: drop use of drmp.h in drm-misc Sam Ravnborg
2019-07-16  6:42 ` [PATCH v2 01/19] drm/meson: drop use of drmP.h Sam Ravnborg
2019-07-16 14:03   ` Alex Deucher
2019-07-16  6:42 ` [PATCH v2 02/19] drm/v3d: " Sam Ravnborg
2019-07-16 14:06   ` Alex Deucher
2019-07-16  6:42 ` [PATCH v2 03/19] drm/pl111: " Sam Ravnborg
2019-07-16 14:06   ` Alex Deucher
2019-07-16  6:42 ` [PATCH v2 07/19] drm/r128: " Sam Ravnborg
2019-07-16 14:01   ` Alex Deucher
2019-07-16  6:42 ` [PATCH v2 09/19] drm/omapdrm: " Sam Ravnborg
2019-07-16  6:42 ` [PATCH v2 10/19] drm/selftests: " Sam Ravnborg
2019-07-16 14:02   ` Alex Deucher
2019-07-16  6:42 ` [PATCH v2 11/19] drm/tdfx: " Sam Ravnborg
2019-07-16  6:42 ` Sam Ravnborg [this message]
2019-07-16  6:42 ` [PATCH v2 14/19] drm/tilcdc: " Sam Ravnborg
2019-07-30  6:03   ` Jyri Sarha
2019-07-30  6:39     ` Sam Ravnborg
2019-07-16  6:42 ` [PATCH v2 15/19] drm/i2c/ch7006: " Sam Ravnborg
2019-07-16  6:42 ` [PATCH v2 18/19] drm/rockchip: " Sam Ravnborg
2019-07-16  6:42 ` [PATCH v2 19/19] drm/mediatek: " Sam Ravnborg
2019-07-16  7:44   ` CK Hu
2019-07-16 14:02   ` Alex Deucher
2019-07-16  6:50 ` [PATCH v2 0/19] drm: drop use of drmp.h in drm-misc Sam Ravnborg
2019-07-17 10:59   ` Sam Ravnborg
     [not found] ` <20190716064220.18157-6-sam@ravnborg.org>
2019-07-16  8:28   ` [PATCH v2 05/19] drm/sun4i: drop use of drmP.h Maxime Ripard
     [not found] ` <20190716064220.18157-5-sam@ravnborg.org>
2019-07-16 14:06   ` [PATCH v2 04/19] drm/zte: " Alex Deucher
     [not found] ` <20190716064220.18157-7-sam@ravnborg.org>
2019-07-16 14:07   ` [PATCH v2 06/19] drm/vc4: " Alex Deucher
     [not found] ` <20190716064220.18157-9-sam@ravnborg.org>
2019-07-16 14:07   ` [PATCH v2 08/19] drm/udl: " Alex Deucher
2019-07-16 16:36     ` Sam Ravnborg
2019-07-16 17:03 ` [PATCH v2 0/19] drm: drop use of drmp.h in drm-misc Eric Anholt

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190716064220.18157-14-sam@ravnborg.org \
    --to=sam@ravnborg.org \
    --cc=airlied@linux.ie \
    --cc=dan.carpenter@oracle.com \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=emil.velikov@collabora.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox