thr3ads.net - Nouveau - [Nouveau] [PATCH v1 0/4] drm/nouveau: drop use of drmP.h [May 2019]

If this information is useful, please help other people find it:
Share via:

Sam Ravnborg

2019-May-19 14:00 UTC

[Nouveau] [PATCH v1 0/4] drm/nouveau: drop use of drmP.h

The following patchset remove use of the deprecated drmP.h
header file in the nouveau driver(s).
As preparation a dependency on drm_os_linux.h is dropped.
The list of include files are sorted and are in some cases
divided up in blocks of linux/* drm/* etc.

The removal is divided up in a few patches that was the logical
steps to remove the use of drmP.h.

Build tested with allmodconfig and allyesconfig for x86, arm, alpha and more.

Patchset made on top of drm-misc-next.

        Sam

Sam Ravnborg (4):
      drm/nouveau: drop use of DRM_UDELAY
      drm/nouveau: drop drmP.h from nouveau_drv.h
      drm/nouveau: drop drmP.h from all header files
      drm/nouveau: drop use of drmp.h

 drivers/gpu/drm/nouveau/dispnv04/arb.c         | 2 --
 drivers/gpu/drm/nouveau/dispnv04/crtc.c        | 3 ++-
 drivers/gpu/drm/nouveau/dispnv04/cursor.c      | 1 -
 drivers/gpu/drm/nouveau/dispnv04/dac.c         | 1 -
 drivers/gpu/drm/nouveau/dispnv04/dfp.c         | 2 +-
 drivers/gpu/drm/nouveau/dispnv04/disp.c        | 1 -
 drivers/gpu/drm/nouveau/dispnv04/hw.c          | 1 -
 drivers/gpu/drm/nouveau/dispnv04/hw.h          | 1 -
 drivers/gpu/drm/nouveau/dispnv04/overlay.c     | 1 -
 drivers/gpu/drm/nouveau/dispnv04/tvmodesnv17.c | 1 -
 drivers/gpu/drm/nouveau/dispnv04/tvnv04.c      | 1 -
 drivers/gpu/drm/nouveau/dispnv04/tvnv17.c      | 1 -
 drivers/gpu/drm/nouveau/dispnv50/base507c.c    | 2 ++
 drivers/gpu/drm/nouveau/dispnv50/disp.c        | 4 ++--
 drivers/gpu/drm/nouveau/dispnv50/ovly507e.c    | 1 +
 drivers/gpu/drm/nouveau/dispnv50/wndw.c        | 2 ++
 drivers/gpu/drm/nouveau/nouveau_bios.c         | 2 --
 drivers/gpu/drm/nouveau/nouveau_connector.c    | 1 -
 drivers/gpu/drm/nouveau/nouveau_crtc.h         | 2 ++
 drivers/gpu/drm/nouveau/nouveau_debugfs.h      | 2 +-
 drivers/gpu/drm/nouveau/nouveau_display.c      | 4 +++-
 drivers/gpu/drm/nouveau/nouveau_display.h      | 4 ++++
 drivers/gpu/drm/nouveau/nouveau_dma.c          | 2 +-
 drivers/gpu/drm/nouveau/nouveau_dp.c           | 1 -
 drivers/gpu/drm/nouveau/nouveau_drm.c          | 3 ++-
 drivers/gpu/drm/nouveau/nouveau_drv.h          | 5 ++++-
 drivers/gpu/drm/nouveau/nouveau_fbcon.c        | 2 +-
 drivers/gpu/drm/nouveau/nouveau_fence.c        | 3 +--
 drivers/gpu/drm/nouveau/nouveau_gem.h          | 2 --
 drivers/gpu/drm/nouveau/nouveau_hwmon.c        | 2 --
 drivers/gpu/drm/nouveau/nouveau_ioc32.c        | 3 ++-
 drivers/gpu/drm/nouveau/nouveau_prime.c        | 1 -
 drivers/gpu/drm/nouveau/nouveau_vga.c          | 1 -
 33 files changed, 31 insertions(+), 34 deletions(-)

Sam Ravnborg

2019-May-19 14:00 UTC

head link

[Nouveau] [PATCH v1 1/4] drm/nouveau: drop use of DRM_UDELAY

The DRM_UDELAY is a simple wrapper for udealy() and to be consistent
call udelay() direct like in may other places.
This avoids the need to pull in drm_os_linux.h when we later
drop drmP.h uses in nouveau.

Signed-off-by: Sam Ravnborg <sam at ravnborg.org>
Cc: Ben Skeggs <bskeggs at redhat.com>
Cc: nouveau at lists.freedesktop.org
---
 drivers/gpu/drm/nouveau/nouveau_dma.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/nouveau/nouveau_dma.c
b/drivers/gpu/drm/nouveau/nouveau_dma.c
index 078f65d849ce..3c430a550a51 100644
--- a/drivers/gpu/drm/nouveau/nouveau_dma.c
+++ b/drivers/gpu/drm/nouveau/nouveau_dma.c
@@ -118,7 +118,7 @@ nv50_dma_push_wait(struct nouveau_channel *chan, int count)
 		}
 
 		if ((++cnt & 0xff) == 0) {
-			DRM_UDELAY(1);
+			udelay(1);
 			if (cnt > 100000)
 				return -EBUSY;
 		}
-- 
2.20.1

Sam Ravnborg

2019-May-19 14:00 UTC

head link

[Nouveau] [PATCH v1 2/4] drm/nouveau: drop drmP.h from nouveau_drv.h

Drop the deprecated drmP.h header from nouveau_drv.h.
Fix fallout in other parts of the driver.

Build tested using allmodconfig and allyesconfig.

Signed-off-by: Sam Ravnborg <sam at ravnborg.org>
Cc: Ben Skeggs <bskeggs at redhat.com>
Cc: nouveau at lists.freedesktop.org
---
 drivers/gpu/drm/nouveau/dispnv50/base507c.c | 2 ++
 drivers/gpu/drm/nouveau/dispnv50/ovly507e.c | 1 +
 drivers/gpu/drm/nouveau/dispnv50/wndw.c     | 2 ++
 drivers/gpu/drm/nouveau/nouveau_display.h   | 4 ++++
 drivers/gpu/drm/nouveau/nouveau_drv.h       | 5 ++++-
 5 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/nouveau/dispnv50/base507c.c
b/drivers/gpu/drm/nouveau/dispnv50/base507c.c
index d5e295ca2caa..80e020611bcb 100644
--- a/drivers/gpu/drm/nouveau/dispnv50/base507c.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/base507c.c
@@ -25,7 +25,9 @@
 #include <nvif/event.h>
 
 #include <drm/drm_atomic_helper.h>
+#include <drm/drm_fourcc.h>
 #include <drm/drm_plane_helper.h>
+
 #include "nouveau_bo.h"
 
 void
diff --git a/drivers/gpu/drm/nouveau/dispnv50/ovly507e.c
b/drivers/gpu/drm/nouveau/dispnv50/ovly507e.c
index cc417664f823..7354aaf79158 100644
--- a/drivers/gpu/drm/nouveau/dispnv50/ovly507e.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/ovly507e.c
@@ -23,6 +23,7 @@
 #include "atom.h"
 
 #include <drm/drm_atomic_helper.h>
+#include <drm/drm_fourcc.h>
 #include <drm/drm_plane_helper.h>
 
 #include <nvif/cl507e.h>
diff --git a/drivers/gpu/drm/nouveau/dispnv50/wndw.c
b/drivers/gpu/drm/nouveau/dispnv50/wndw.c
index b95181027b31..a501bb62034b 100644
--- a/drivers/gpu/drm/nouveau/dispnv50/wndw.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/wndw.c
@@ -26,6 +26,8 @@
 #include <nvif/cl0002.h>
 
 #include <drm/drm_atomic_helper.h>
+#include <drm/drm_fourcc.h>
+
 #include "nouveau_bo.h"
 
 static void
diff --git a/drivers/gpu/drm/nouveau/nouveau_display.h
b/drivers/gpu/drm/nouveau/nouveau_display.h
index 311e175f0513..31eb85f223b2 100644
--- a/drivers/gpu/drm/nouveau/nouveau_display.h
+++ b/drivers/gpu/drm/nouveau/nouveau_display.h
@@ -1,9 +1,13 @@
 /* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NOUVEAU_DISPLAY_H__
 #define __NOUVEAU_DISPLAY_H__
+
 #include "nouveau_drv.h"
+
 #include <nvif/disp.h>
 
+#include <drm/drm_framebuffer.h>
+
 struct nouveau_framebuffer {
 	struct drm_framebuffer base;
 	struct nouveau_bo *nvbo;
diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h
b/drivers/gpu/drm/nouveau/nouveau_drv.h
index 35ff0ca01a3b..81f823df1989 100644
--- a/drivers/gpu/drm/nouveau/nouveau_drv.h
+++ b/drivers/gpu/drm/nouveau/nouveau_drv.h
@@ -46,7 +46,10 @@
 #include <nvif/mmu.h>
 #include <nvif/vmm.h>
 
-#include <drm/drmP.h>
+#include <drm/drm_connector.h>
+#include <drm/drm_device.h>
+#include <drm/drm_drv.h>
+#include <drm/drm_file.h>
 
 #include <drm/ttm/ttm_bo_api.h>
 #include <drm/ttm/ttm_bo_driver.h>
-- 
2.20.1

Sam Ravnborg

2019-May-19 14:00 UTC

head link

[Nouveau] [PATCH v1 3/4] drm/nouveau: drop drmP.h from all header files

Drop include of the deprecated drmP.h from all nouveau heder files.
This allows us to remove drmP.h from all .c files without any
side-effects in a follow-up commit.

Build tested using allyeyconfig and allmodconfig

Signed-off-by: Sam Ravnborg <sam at ravnborg.org>
Cc: Ben Skeggs <bskeggs at redhat.com>
Cc: nouveau at lists.freedesktop.org
---
 drivers/gpu/drm/nouveau/dispnv04/hw.h     | 1 -
 drivers/gpu/drm/nouveau/nouveau_crtc.h    | 2 ++
 drivers/gpu/drm/nouveau/nouveau_debugfs.h | 2 +-
 drivers/gpu/drm/nouveau/nouveau_gem.h     | 2 --
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/nouveau/dispnv04/hw.h
b/drivers/gpu/drm/nouveau/dispnv04/hw.h
index 3a2be47fb4f1..6987e1766cd2 100644
--- a/drivers/gpu/drm/nouveau/dispnv04/hw.h
+++ b/drivers/gpu/drm/nouveau/dispnv04/hw.h
@@ -23,7 +23,6 @@
 #ifndef __NOUVEAU_HW_H__
 #define __NOUVEAU_HW_H__
 
-#include <drm/drmP.h>
 #include "disp.h"
 #include "nvreg.h"
 
diff --git a/drivers/gpu/drm/nouveau/nouveau_crtc.h
b/drivers/gpu/drm/nouveau/nouveau_crtc.h
index 366acb928f57..7f63be2ec35d 100644
--- a/drivers/gpu/drm/nouveau/nouveau_crtc.h
+++ b/drivers/gpu/drm/nouveau/nouveau_crtc.h
@@ -27,6 +27,8 @@
 #ifndef __NOUVEAU_CRTC_H__
 #define __NOUVEAU_CRTC_H__
 
+#include <drm/drm_crtc.h>
+
 #include <nvif/notify.h>
 
 struct nouveau_crtc {
diff --git a/drivers/gpu/drm/nouveau/nouveau_debugfs.h
b/drivers/gpu/drm/nouveau/nouveau_debugfs.h
index 1d01a82d4b6f..1f2d97b7211c 100644
--- a/drivers/gpu/drm/nouveau/nouveau_debugfs.h
+++ b/drivers/gpu/drm/nouveau/nouveau_debugfs.h
@@ -2,7 +2,7 @@
 #ifndef __NOUVEAU_DEBUGFS_H__
 #define __NOUVEAU_DEBUGFS_H__
 
-#include <drm/drmP.h>
+#include <drm/drm_debugfs.h>
 
 #if defined(CONFIG_DEBUG_FS)
 
diff --git a/drivers/gpu/drm/nouveau/nouveau_gem.h
b/drivers/gpu/drm/nouveau/nouveau_gem.h
index fe39998f65cc..615156fefcbc 100644
--- a/drivers/gpu/drm/nouveau/nouveau_gem.h
+++ b/drivers/gpu/drm/nouveau/nouveau_gem.h
@@ -2,8 +2,6 @@
 #ifndef __NOUVEAU_GEM_H__
 #define __NOUVEAU_GEM_H__
 
-#include <drm/drmP.h>
-
 #include "nouveau_drv.h"
 #include "nouveau_bo.h"
 
-- 
2.20.1

Sam Ravnborg

2019-May-19 14:00 UTC

head link

[Nouveau] [PATCH v1 4/4] drm/nouveau: drop use of drmp.h

Drop use of the deprecated drmP.h file from drm/nouveau.

Build tested using allyesconfig and allmodconfig.

Signed-off-by: Sam Ravnborg <sam at ravnborg.org>
Cc: Ben Skeggs <bskeggs at redhat.com>
Cc: nouveau at lists.freedesktop.org
---
 drivers/gpu/drm/nouveau/dispnv04/arb.c         | 2 --
 drivers/gpu/drm/nouveau/dispnv04/crtc.c        | 3 ++-
 drivers/gpu/drm/nouveau/dispnv04/cursor.c      | 1 -
 drivers/gpu/drm/nouveau/dispnv04/dac.c         | 1 -
 drivers/gpu/drm/nouveau/dispnv04/dfp.c         | 2 +-
 drivers/gpu/drm/nouveau/dispnv04/disp.c        | 1 -
 drivers/gpu/drm/nouveau/dispnv04/hw.c          | 1 -
 drivers/gpu/drm/nouveau/dispnv04/overlay.c     | 1 -
 drivers/gpu/drm/nouveau/dispnv04/tvmodesnv17.c | 1 -
 drivers/gpu/drm/nouveau/dispnv04/tvnv04.c      | 1 -
 drivers/gpu/drm/nouveau/dispnv04/tvnv17.c      | 1 -
 drivers/gpu/drm/nouveau/dispnv50/disp.c        | 4 ++--
 drivers/gpu/drm/nouveau/nouveau_bios.c         | 2 --
 drivers/gpu/drm/nouveau/nouveau_connector.c    | 1 -
 drivers/gpu/drm/nouveau/nouveau_display.c      | 4 +++-
 drivers/gpu/drm/nouveau/nouveau_dp.c           | 1 -
 drivers/gpu/drm/nouveau/nouveau_drm.c          | 3 ++-
 drivers/gpu/drm/nouveau/nouveau_fbcon.c        | 2 +-
 drivers/gpu/drm/nouveau/nouveau_fence.c        | 3 +--
 drivers/gpu/drm/nouveau/nouveau_hwmon.c        | 2 --
 drivers/gpu/drm/nouveau/nouveau_ioc32.c        | 3 ++-
 drivers/gpu/drm/nouveau/nouveau_prime.c        | 1 -
 drivers/gpu/drm/nouveau/nouveau_vga.c          | 1 -
 23 files changed, 14 insertions(+), 28 deletions(-)

diff --git a/drivers/gpu/drm/nouveau/dispnv04/arb.c
b/drivers/gpu/drm/nouveau/dispnv04/arb.c
index c79160c37f84..362495535e69 100644
--- a/drivers/gpu/drm/nouveau/dispnv04/arb.c
+++ b/drivers/gpu/drm/nouveau/dispnv04/arb.c
@@ -21,8 +21,6 @@
  * SOFTWARE.
  */
 
-#include <drm/drmP.h>
-
 #include "nouveau_drv.h"
 #include "nouveau_reg.h"
 #include "hw.h"
diff --git a/drivers/gpu/drm/nouveau/dispnv04/crtc.c
b/drivers/gpu/drm/nouveau/dispnv04/crtc.c
index f22f01020625..210f13b145c1 100644
--- a/drivers/gpu/drm/nouveau/dispnv04/crtc.c
+++ b/drivers/gpu/drm/nouveau/dispnv04/crtc.c
@@ -24,9 +24,10 @@
  */
 #include <linux/pm_runtime.h>
 
-#include <drm/drmP.h>
 #include <drm/drm_crtc_helper.h>
+#include <drm/drm_fourcc.h>
 #include <drm/drm_plane_helper.h>
+#include <drm/drm_vblank.h>
 
 #include "nouveau_drv.h"
 #include "nouveau_reg.h"
diff --git a/drivers/gpu/drm/nouveau/dispnv04/cursor.c
b/drivers/gpu/drm/nouveau/dispnv04/cursor.c
index ebf860bd59af..25e16fa8a428 100644
--- a/drivers/gpu/drm/nouveau/dispnv04/cursor.c
+++ b/drivers/gpu/drm/nouveau/dispnv04/cursor.c
@@ -1,5 +1,4 @@
 // SPDX-License-Identifier: GPL-2.0
-#include <drm/drmP.h>
 #include <drm/drm_mode.h>
 #include "nouveau_drv.h"
 #include "nouveau_reg.h"
diff --git a/drivers/gpu/drm/nouveau/dispnv04/dac.c
b/drivers/gpu/drm/nouveau/dispnv04/dac.c
index e7af95d37ddb..e8eef88a8382 100644
--- a/drivers/gpu/drm/nouveau/dispnv04/dac.c
+++ b/drivers/gpu/drm/nouveau/dispnv04/dac.c
@@ -24,7 +24,6 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#include <drm/drmP.h>
 #include <drm/drm_crtc_helper.h>
 
 #include "nouveau_drv.h"
diff --git a/drivers/gpu/drm/nouveau/dispnv04/dfp.c
b/drivers/gpu/drm/nouveau/dispnv04/dfp.c
index 73d41abbb510..f9f4482c79b5 100644
--- a/drivers/gpu/drm/nouveau/dispnv04/dfp.c
+++ b/drivers/gpu/drm/nouveau/dispnv04/dfp.c
@@ -24,8 +24,8 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#include <drm/drmP.h>
 #include <drm/drm_crtc_helper.h>
+#include <drm/drm_fourcc.h>
 
 #include "nouveau_drv.h"
 #include "nouveau_reg.h"
diff --git a/drivers/gpu/drm/nouveau/dispnv04/disp.c
b/drivers/gpu/drm/nouveau/dispnv04/disp.c
index 5713bacaee80..0f8e186f3d07 100644
--- a/drivers/gpu/drm/nouveau/dispnv04/disp.c
+++ b/drivers/gpu/drm/nouveau/dispnv04/disp.c
@@ -22,7 +22,6 @@
  * Author: Ben Skeggs
  */
 
-#include <drm/drmP.h>
 #include <drm/drm_crtc_helper.h>
 
 #include "nouveau_drv.h"
diff --git a/drivers/gpu/drm/nouveau/dispnv04/hw.c
b/drivers/gpu/drm/nouveau/dispnv04/hw.c
index 0c9bdf023f5b..3fdfafa8b0ad 100644
--- a/drivers/gpu/drm/nouveau/dispnv04/hw.c
+++ b/drivers/gpu/drm/nouveau/dispnv04/hw.c
@@ -22,7 +22,6 @@
  * SOFTWARE.
  */
 
-#include <drm/drmP.h>
 #include "nouveau_drv.h"
 #include "hw.h"
 
diff --git a/drivers/gpu/drm/nouveau/dispnv04/overlay.c
b/drivers/gpu/drm/nouveau/dispnv04/overlay.c
index df4358e31075..a3a0a73ae8ab 100644
--- a/drivers/gpu/drm/nouveau/dispnv04/overlay.c
+++ b/drivers/gpu/drm/nouveau/dispnv04/overlay.c
@@ -23,7 +23,6 @@
  * written by Arthur Huillet.
  */
 
-#include <drm/drmP.h>
 #include <drm/drm_crtc.h>
 #include <drm/drm_fourcc.h>
 
diff --git a/drivers/gpu/drm/nouveau/dispnv04/tvmodesnv17.c
b/drivers/gpu/drm/nouveau/dispnv04/tvmodesnv17.c
index 2b83b2c39d1d..2f6d2b6711ab 100644
--- a/drivers/gpu/drm/nouveau/dispnv04/tvmodesnv17.c
+++ b/drivers/gpu/drm/nouveau/dispnv04/tvmodesnv17.c
@@ -24,7 +24,6 @@
  *
  */
 
-#include <drm/drmP.h>
 #include <drm/drm_crtc_helper.h>
 #include "nouveau_drv.h"
 #include "nouveau_encoder.h"
diff --git a/drivers/gpu/drm/nouveau/dispnv04/tvnv04.c
b/drivers/gpu/drm/nouveau/dispnv04/tvnv04.c
index de4490b4ed30..b701a4d8fe76 100644
--- a/drivers/gpu/drm/nouveau/dispnv04/tvnv04.c
+++ b/drivers/gpu/drm/nouveau/dispnv04/tvnv04.c
@@ -24,7 +24,6 @@
  *
  */
 
-#include <drm/drmP.h>
 #include "nouveau_drv.h"
 #include "nouveau_reg.h"
 #include "nouveau_encoder.h"
diff --git a/drivers/gpu/drm/nouveau/dispnv04/tvnv17.c
b/drivers/gpu/drm/nouveau/dispnv04/tvnv17.c
index 26fd71c06626..03466f04c741 100644
--- a/drivers/gpu/drm/nouveau/dispnv04/tvnv17.c
+++ b/drivers/gpu/drm/nouveau/dispnv04/tvnv17.c
@@ -24,7 +24,6 @@
  *
  */
 
-#include <drm/drmP.h>
 #include <drm/drm_crtc_helper.h>
 #include <drm/drm_probe_helper.h>
 #include "nouveau_drv.h"
diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.c
b/drivers/gpu/drm/nouveau/dispnv50/disp.c
index 4b1650f51955..959af7c6258f 100644
--- a/drivers/gpu/drm/nouveau/dispnv50/disp.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c
@@ -30,14 +30,14 @@
 #include <linux/dma-mapping.h>
 #include <linux/hdmi.h>
 
-#include <drm/drmP.h>
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_dp_helper.h>
+#include <drm/drm_edid.h>
 #include <drm/drm_fb_helper.h>
 #include <drm/drm_plane_helper.h>
 #include <drm/drm_probe_helper.h>
 #include <drm/drm_scdc_helper.h>
-#include <drm/drm_edid.h>
+#include <drm/drm_vblank.h>
 
 #include <nvif/class.h>
 #include <nvif/cl0002.h>
diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c
b/drivers/gpu/drm/nouveau/nouveau_bios.c
index 66bf2aff4a3e..1e93f82c96fa 100644
--- a/drivers/gpu/drm/nouveau/nouveau_bios.c
+++ b/drivers/gpu/drm/nouveau/nouveau_bios.c
@@ -22,8 +22,6 @@
  * SOFTWARE.
  */
 
-#include <drm/drmP.h>
-
 #include "nouveau_drv.h"
 #include "nouveau_reg.h"
 #include "dispnv04/hw.h"
diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.c
b/drivers/gpu/drm/nouveau/nouveau_connector.c
index 4116ee62adaf..7386824b8ba9 100644
--- a/drivers/gpu/drm/nouveau/nouveau_connector.c
+++ b/drivers/gpu/drm/nouveau/nouveau_connector.c
@@ -29,7 +29,6 @@
 #include <linux/pm_runtime.h>
 #include <linux/vga_switcheroo.h>
 
-#include <drm/drmP.h>
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_edid.h>
 #include <drm/drm_crtc_helper.h>
diff --git a/drivers/gpu/drm/nouveau/nouveau_display.c
b/drivers/gpu/drm/nouveau/nouveau_display.c
index 832da8e0020d..586a2238f406 100644
--- a/drivers/gpu/drm/nouveau/nouveau_display.c
+++ b/drivers/gpu/drm/nouveau/nouveau_display.c
@@ -25,12 +25,14 @@
  */
 
 #include <acpi/video.h>
-#include <drm/drmP.h>
+
 #include <drm/drm_atomic.h>
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_crtc_helper.h>
 #include <drm/drm_fb_helper.h>
+#include <drm/drm_fourcc.h>
 #include <drm/drm_probe_helper.h>
+#include <drm/drm_vblank.h>
 
 #include "nouveau_fbcon.h"
 #include "nouveau_crtc.h"
diff --git a/drivers/gpu/drm/nouveau/nouveau_dp.c
b/drivers/gpu/drm/nouveau/nouveau_dp.c
index 0d052e1660f8..2674f1587457 100644
--- a/drivers/gpu/drm/nouveau/nouveau_dp.c
+++ b/drivers/gpu/drm/nouveau/nouveau_dp.c
@@ -22,7 +22,6 @@
  * Authors: Ben Skeggs
  */
 
-#include <drm/drmP.h>
 #include <drm/drm_dp_helper.h>
 
 #include "nouveau_drv.h"
diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c
b/drivers/gpu/drm/nouveau/nouveau_drm.c
index 22cd45845e07..07e5fd6e62d7 100644
--- a/drivers/gpu/drm/nouveau/nouveau_drm.c
+++ b/drivers/gpu/drm/nouveau/nouveau_drm.c
@@ -29,8 +29,9 @@
 #include <linux/pm_runtime.h>
 #include <linux/vga_switcheroo.h>
 
-#include <drm/drmP.h>
 #include <drm/drm_crtc_helper.h>
+#include <drm/drm_ioctl.h>
+#include <drm/drm_vblank.h>
 
 #include <core/gpuobj.h>
 #include <core/option.h>
diff --git a/drivers/gpu/drm/nouveau/nouveau_fbcon.c
b/drivers/gpu/drm/nouveau/nouveau_fbcon.c
index 73cc3217068a..f439f0a5b43a 100644
--- a/drivers/gpu/drm/nouveau/nouveau_fbcon.c
+++ b/drivers/gpu/drm/nouveau/nouveau_fbcon.c
@@ -37,10 +37,10 @@
 #include <linux/vga_switcheroo.h>
 #include <linux/console.h>
 
-#include <drm/drmP.h>
 #include <drm/drm_crtc.h>
 #include <drm/drm_crtc_helper.h>
 #include <drm/drm_fb_helper.h>
+#include <drm/drm_fourcc.h>
 #include <drm/drm_atomic.h>
 
 #include "nouveau_drv.h"
diff --git a/drivers/gpu/drm/nouveau/nouveau_fence.c
b/drivers/gpu/drm/nouveau/nouveau_fence.c
index d4964f3397a1..7cd9d59b6b57 100644
--- a/drivers/gpu/drm/nouveau/nouveau_fence.c
+++ b/drivers/gpu/drm/nouveau/nouveau_fence.c
@@ -24,10 +24,9 @@
  *
  */
 
-#include <drm/drmP.h>
-
 #include <linux/ktime.h>
 #include <linux/hrtimer.h>
+#include <linux/sched/signal.h>
 #include <trace/events/dma_fence.h>
 
 #include <nvif/cl826e.h>
diff --git a/drivers/gpu/drm/nouveau/nouveau_hwmon.c
b/drivers/gpu/drm/nouveau/nouveau_hwmon.c
index 08a1ab6b150d..618d8b780761 100644
--- a/drivers/gpu/drm/nouveau/nouveau_hwmon.c
+++ b/drivers/gpu/drm/nouveau/nouveau_hwmon.c
@@ -29,8 +29,6 @@
 #include <linux/hwmon.h>
 #include <linux/hwmon-sysfs.h>
 
-#include <drm/drmP.h>
-
 #include "nouveau_drv.h"
 #include "nouveau_hwmon.h"
 
diff --git a/drivers/gpu/drm/nouveau/nouveau_ioc32.c
b/drivers/gpu/drm/nouveau/nouveau_ioc32.c
index 462679a8fec5..adf01ca9e035 100644
--- a/drivers/gpu/drm/nouveau/nouveau_ioc32.c
+++ b/drivers/gpu/drm/nouveau/nouveau_ioc32.c
@@ -33,7 +33,8 @@
 
 #include <linux/compat.h>
 
-#include <drm/drmP.h>
+#include <drm/drm.h>
+#include <drm/drm_ioctl.h>
 
 #include "nouveau_ioctl.h"
 
diff --git a/drivers/gpu/drm/nouveau/nouveau_prime.c
b/drivers/gpu/drm/nouveau/nouveau_prime.c
index 1fefc93af1d7..95d06dbbc185 100644
--- a/drivers/gpu/drm/nouveau/nouveau_prime.c
+++ b/drivers/gpu/drm/nouveau/nouveau_prime.c
@@ -22,7 +22,6 @@
  * Authors: Dave Airlie
  */
 
-#include <drm/drmP.h>
 #include <linux/dma-buf.h>
 
 #include "nouveau_drv.h"
diff --git a/drivers/gpu/drm/nouveau/nouveau_vga.c
b/drivers/gpu/drm/nouveau/nouveau_vga.c
index 8f1ce4833230..24e4fb80d6ea 100644
--- a/drivers/gpu/drm/nouveau/nouveau_vga.c
+++ b/drivers/gpu/drm/nouveau/nouveau_vga.c
@@ -2,7 +2,6 @@
 #include <linux/vgaarb.h>
 #include <linux/vga_switcheroo.h>
 
-#include <drm/drmP.h>
 #include <drm/drm_crtc_helper.h>
 #include <drm/drm_fb_helper.h>
 
-- 
2.20.1

Ben Skeggs

2019-May-20 07:34 UTC

head link

[Nouveau] [PATCH v1 0/4] drm/nouveau: drop use of drmP.h

On Mon, 20 May 2019 at 00:00, Sam Ravnborg <sam at ravnborg.org>
wrote:>
> The following patchset remove use of the deprecated drmP.h
> header file in the nouveau driver(s).
> As preparation a dependency on drm_os_linux.h is dropped.
> The list of include files are sorted and are in some cases
> divided up in blocks of linux/* drm/* etc.
>
> The removal is divided up in a few patches that was the logical
> steps to remove the use of drmP.h.
>
> Build tested with allmodconfig and allyesconfig for x86, arm, alpha and
more.
>
> Patchset made on top of drm-misc-next.Thank you, I've merged all of these in my tree.

Ben.
>
>         Sam
>
> Sam Ravnborg (4):
>       drm/nouveau: drop use of DRM_UDELAY
>       drm/nouveau: drop drmP.h from nouveau_drv.h
>       drm/nouveau: drop drmP.h from all header files
>       drm/nouveau: drop use of drmp.h
>
>  drivers/gpu/drm/nouveau/dispnv04/arb.c         | 2 --
>  drivers/gpu/drm/nouveau/dispnv04/crtc.c        | 3 ++-
>  drivers/gpu/drm/nouveau/dispnv04/cursor.c      | 1 -
>  drivers/gpu/drm/nouveau/dispnv04/dac.c         | 1 -
>  drivers/gpu/drm/nouveau/dispnv04/dfp.c         | 2 +-
>  drivers/gpu/drm/nouveau/dispnv04/disp.c        | 1 -
>  drivers/gpu/drm/nouveau/dispnv04/hw.c          | 1 -
>  drivers/gpu/drm/nouveau/dispnv04/hw.h          | 1 -
>  drivers/gpu/drm/nouveau/dispnv04/overlay.c     | 1 -
>  drivers/gpu/drm/nouveau/dispnv04/tvmodesnv17.c | 1 -
>  drivers/gpu/drm/nouveau/dispnv04/tvnv04.c      | 1 -
>  drivers/gpu/drm/nouveau/dispnv04/tvnv17.c      | 1 -
>  drivers/gpu/drm/nouveau/dispnv50/base507c.c    | 2 ++
>  drivers/gpu/drm/nouveau/dispnv50/disp.c        | 4 ++--
>  drivers/gpu/drm/nouveau/dispnv50/ovly507e.c    | 1 +
>  drivers/gpu/drm/nouveau/dispnv50/wndw.c        | 2 ++
>  drivers/gpu/drm/nouveau/nouveau_bios.c         | 2 --
>  drivers/gpu/drm/nouveau/nouveau_connector.c    | 1 -
>  drivers/gpu/drm/nouveau/nouveau_crtc.h         | 2 ++
>  drivers/gpu/drm/nouveau/nouveau_debugfs.h      | 2 +-
>  drivers/gpu/drm/nouveau/nouveau_display.c      | 4 +++-
>  drivers/gpu/drm/nouveau/nouveau_display.h      | 4 ++++
>  drivers/gpu/drm/nouveau/nouveau_dma.c          | 2 +-
>  drivers/gpu/drm/nouveau/nouveau_dp.c           | 1 -
>  drivers/gpu/drm/nouveau/nouveau_drm.c          | 3 ++-
>  drivers/gpu/drm/nouveau/nouveau_drv.h          | 5 ++++-
>  drivers/gpu/drm/nouveau/nouveau_fbcon.c        | 2 +-
>  drivers/gpu/drm/nouveau/nouveau_fence.c        | 3 +--
>  drivers/gpu/drm/nouveau/nouveau_gem.h          | 2 --
>  drivers/gpu/drm/nouveau/nouveau_hwmon.c        | 2 --
>  drivers/gpu/drm/nouveau/nouveau_ioc32.c        | 3 ++-
>  drivers/gpu/drm/nouveau/nouveau_prime.c        | 1 -
>  drivers/gpu/drm/nouveau/nouveau_vga.c          | 1 -
>  33 files changed, 31 insertions(+), 34 deletions(-)
>
> _______________________________________________
> Nouveau mailing list
> Nouveau at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/nouveau

Reasonably Related Threads

Search for more seemingly similar threads

Nouveau - May 2019 - [PATCH v1 0/4] drm/nouveau: drop use of drmP.h

[Nouveau] [PATCH v1 0/4] drm/nouveau: drop use of drmP.h

[Nouveau] [PATCH v1 1/4] drm/nouveau: drop use of DRM_UDELAY

[Nouveau] [PATCH v1 2/4] drm/nouveau: drop drmP.h from nouveau_drv.h

[Nouveau] [PATCH v1 3/4] drm/nouveau: drop drmP.h from all header files

[Nouveau] [PATCH v1 4/4] drm/nouveau: drop use of drmp.h

[Nouveau] [PATCH v1 0/4] drm/nouveau: drop use of drmP.h

Reasonably Related Threads