Skip to contentSkip to conversation

drm/arm: drop use of drmP.h

PATCH In review Sidong Yang 2 participants 3 messages Aug 17, 2019 – Aug 18, 2019

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/arm: drop use of drmP.h

Drop use of deprecated drmP.h header file.
Remove drmP.h includes and add some include headers for function or struct that used in code.

---
 drivers/gpu/drm/arm/hdlcd_crtc.c    | 2 +-
 drivers/gpu/drm/arm/hdlcd_drv.c     | 6 +++++-
 drivers/gpu/drm/arm/malidp_crtc.c   | 4 +++-
 drivers/gpu/drm/arm/malidp_drv.c    | 4 +++-
 drivers/gpu/drm/arm/malidp_drv.h    | 1 -
 drivers/gpu/drm/arm/malidp_hw.c     | 7 ++++++-
 drivers/gpu/drm/arm/malidp_mw.c     | 2 +-
 drivers/gpu/drm/arm/malidp_planes.c | 4 +++-
 8 files changed, 22 insertions(+), 8 deletions(-)
drivers/gpu/drm/arm/hdlcd_crtc.c +1 -1
index a3efa28436ea..8285ff3e9991 100644
@@ -9,7 +9,6 @@
  *  Implementation of a CRTC class for the HDLCD driver.
  */
 
-#include <drm/drmP.h>
 #include <drm/drm_atomic.h>
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_crtc.h>
@@ -19,6 +18,7 @@
 #include <drm/drm_of.h>
 #include <drm/drm_plane_helper.h>
 #include <drm/drm_probe_helper.h>
+#include <drm/drm_vblank.h>
 #include <linux/clk.h>
 #include <linux/of_graph.h>
 #include <linux/platform_data/simplefb.h>
drivers/gpu/drm/arm/hdlcd_drv.c +5 -1
index 27c46a2838c5..c2a59712cf46 100644
@@ -9,6 +9,7 @@
  *  ARM HDLCD Driver
  */
 
+#include <linux/dma-mapping.h>
 #include <linux/module.h>
 #include <linux/spinlock.h>
 #include <linux/clk.h>
@@ -17,18 +18,21 @@
 #include <linux/list.h>
 #include <linux/of_graph.h>
 #include <linux/of_reserved_mem.h>
+#include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
 
-#include <drm/drmP.h>
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_crtc.h>
+#include <drm/drm_drv.h>
 #include <drm/drm_fb_cma_helper.h>
 #include <drm/drm_fb_helper.h>
 #include <drm/drm_gem_cma_helper.h>
 #include <drm/drm_gem_framebuffer_helper.h>
+#include <drm/drm_irq.h>
 #include <drm/drm_modeset_helper.h>
 #include <drm/drm_of.h>
 #include <drm/drm_probe_helper.h>
+#include <drm/drm_vblank.h>
 
 #include "hdlcd_drv.h"
 #include "hdlcd_regs.h"
drivers/gpu/drm/arm/malidp_crtc.c +3 -1
index db4451260fff..3735554f61bf 100644
@@ -6,11 +6,13 @@
  * ARM Mali DP500/DP550/DP650 driver (crtc operations)
  */
 
-#include <drm/drmP.h>
 #include <drm/drm_atomic.h>
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_crtc.h>
+#include <drm/drm_print.h>
 #include <drm/drm_probe_helper.h>
+#include <drm/drm_vblank.h>
+
 #include <linux/clk.h>
 #include <linux/pm_runtime.h>
 #include <video/videomode.h>
drivers/gpu/drm/arm/malidp_drv.c +3 -1
index c27ff456eddc..2a13490e5dbb 100644
@@ -15,17 +15,19 @@
 #include <linux/pm_runtime.h>
 #include <linux/debugfs.h>
 
-#include <drm/drmP.h>
 #include <drm/drm_atomic.h>
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_crtc.h>
+#include <drm/drm_drv.h>
 #include <drm/drm_probe_helper.h>
 #include <drm/drm_fb_helper.h>
 #include <drm/drm_fb_cma_helper.h>
+#include <drm/drm_fourcc.h>
 #include <drm/drm_gem_cma_helper.h>
 #include <drm/drm_gem_framebuffer_helper.h>
 #include <drm/drm_modeset_helper.h>
 #include <drm/drm_of.h>
+#include <drm/drm_vblank.h>
 
 #include "malidp_drv.h"
 #include "malidp_mw.h"
drivers/gpu/drm/arm/malidp_drv.h +0 -1
index 0a639af8337e..a57edff55f2c 100644
@@ -14,7 +14,6 @@
 #include <linux/mutex.h>
 #include <linux/wait.h>
 #include <linux/spinlock.h>
-#include <drm/drmP.h>
 #include "malidp_hw.h"
 
 #define MALIDP_CONFIG_VALID_INIT	0
drivers/gpu/drm/arm/malidp_hw.c +6 -1
index 380be66d4c6e..f66d6b4bdaab 100644
@@ -9,9 +9,14 @@
  */
 
 #include <linux/clk.h>
+#include <linux/delay.h>
 #include <linux/types.h>
 #include <linux/io.h>
-#include <drm/drmP.h>
+
+#include <drm/drm_fourcc.h>
+#include <drm/drm_print.h>
+#include <drm/drm_vblank.h>
+
 #include <video/videomode.h>
 #include <video/display_timing.h>
 
drivers/gpu/drm/arm/malidp_mw.c +1 -1
index 2e812525025d..c2f5ba52c8aa 100644
@@ -10,8 +10,8 @@
 #include <drm/drm_crtc.h>
 #include <drm/drm_probe_helper.h>
 #include <drm/drm_fb_cma_helper.h>
+#include <drm/drm_fourcc.h>
 #include <drm/drm_gem_cma_helper.h>
-#include <drm/drmP.h>
 #include <drm/drm_writeback.h>
 
 #include "malidp_drv.h"
drivers/gpu/drm/arm/malidp_planes.c +3 -1
index 488375bd133d..3c70a53813bf 100644
@@ -7,11 +7,13 @@
  */
 
 #include <linux/iommu.h>
+#include <linux/platform_device.h>
 
-#include <drm/drmP.h>
 #include <drm/drm_atomic.h>
 #include <drm/drm_atomic_helper.h>
+#include <drm/drm_drv.h>
 #include <drm/drm_fb_cma_helper.h>
+#include <drm/drm_fourcc.h>
 #include <drm/drm_gem_cma_helper.h>
 #include <drm/drm_gem_framebuffer_helper.h>
 #include <drm/drm_plane_helper.h>
Signature · 1 line
2.20.1
#1 lore raw

Hi Sidong

Quoted 3 lines · Sidong Yang

Drop use of deprecated drmP.h header file.
Remove drmP.h includes and add some include headers for function or struct that used in code.

Thanks for your patch.
We already have a similiar patch in drm-misc-next, that drop the use of drmP.h from arm so this patch is obsoleted.

But keep up the spirit and send us other good stuff.

Sam
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

#2 lore raw
Quoted 7 lines · Sam Ravnborg

Hi Sidong

Quoted 3 lines · Sidong Yang

Drop use of deprecated drmP.h header file.
Remove drmP.h includes and add some include headers for function or struct that used in code.

Quoted 7 lines

Thanks for your patch.
We already have a similiar patch in drm-misc-next, that drop the use of drmP.h from arm so this patch is obsoleted.

But keep up the spirit and send us other good stuff.

Sam

Hi Sam.

Thanks for reply. I found the patch that you said. I'll keep up and try to find other good one.

Sincerely,
Sidong.