This set of patches is one of the final steps before we have succeeded to stop using drmP.h in all of drm/.
There is a few patches in flight through other trees and the plan is that all users shall be gone in the upstream kernel after next merge window.
The patches has seen build test with various configs with various architectures.
The patches has been sent before, but to my best knowledge they have not been applied anywhere. All four patches are based on drm-misc-next, but I checked that the tda998x patch can be applied to the tda998x tree.
There are no dependencies between the patches.
v2: - rebase on top of drm-misc-next
To maintainers: (Assuming the patch are OK) Please let me know if you take the patch, or request me to apply it to drm-misc-next. Or let me me know if the patch should be based on another tree.
Sam
Sam Ravnborg (4): drm/i2c/tda998x: drop use of drmP.h drm/tegra: drop use of drmP.h drm/armada: drop use of drmP.h drm/arm: drop use of drmP.h
drivers/gpu/drm/arm/hdlcd_crtc.c | 12 +++++++----- drivers/gpu/drm/arm/hdlcd_drv.c | 7 ++++++- drivers/gpu/drm/arm/malidp_crtc.c | 11 +++++++---- drivers/gpu/drm/arm/malidp_drv.c | 8 +++++--- drivers/gpu/drm/arm/malidp_drv.h | 7 ++++--- drivers/gpu/drm/arm/malidp_hw.c | 7 ++++++- drivers/gpu/drm/arm/malidp_mw.c | 5 +++-- drivers/gpu/drm/arm/malidp_planes.c | 4 +++- drivers/gpu/drm/armada/armada_crtc.c | 10 +++++++--- drivers/gpu/drm/armada/armada_debugfs.c | 8 ++++++-- drivers/gpu/drm/armada/armada_drm.h | 5 ++++- drivers/gpu/drm/armada/armada_drv.c | 8 ++++++++ drivers/gpu/drm/armada/armada_fb.c | 3 +++ drivers/gpu/drm/armada/armada_fbdev.c | 3 +++ drivers/gpu/drm/armada/armada_gem.c | 7 ++++++- drivers/gpu/drm/armada/armada_overlay.c | 8 +++++--- drivers/gpu/drm/armada/armada_plane.c | 4 +++- drivers/gpu/drm/armada/armada_trace.h | 5 ++++- drivers/gpu/drm/i2c/tda998x_drv.c | 2 +- drivers/gpu/drm/tegra/dc.c | 13 +++++++++---- drivers/gpu/drm/tegra/dpaux.c | 5 +++-- drivers/gpu/drm/tegra/drm.c | 8 ++++++++ drivers/gpu/drm/tegra/drm.h | 3 +-- drivers/gpu/drm/tegra/dsi.c | 8 +++++--- drivers/gpu/drm/tegra/fb.c | 6 ++++-- drivers/gpu/drm/tegra/gem.c | 3 +++ drivers/gpu/drm/tegra/gem.h | 1 - drivers/gpu/drm/tegra/gr2d.c | 1 + drivers/gpu/drm/tegra/hdmi.c | 5 +++++ drivers/gpu/drm/tegra/hub.c | 3 ++- drivers/gpu/drm/tegra/hub.h | 1 - drivers/gpu/drm/tegra/plane.c | 1 + drivers/gpu/drm/tegra/sor.c | 3 +++ drivers/gpu/drm/tegra/vic.c | 1 + 34 files changed, 137 insertions(+), 49 deletions(-)
Drop use of the deprecated drmP.h header file. Fix fallout.
Signed-off-by: Sam Ravnborg sam@ravnborg.org Cc: Russell King linux@armlinux.org.uk Cc: David Airlie airlied@linux.ie Cc: Daniel Vetter daniel@ffwll.ch --- drivers/gpu/drm/i2c/tda998x_drv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i2c/tda998x_drv.c b/drivers/gpu/drm/i2c/tda998x_drv.c index 61e042918a7f..84c6d4c91c65 100644 --- a/drivers/gpu/drm/i2c/tda998x_drv.c +++ b/drivers/gpu/drm/i2c/tda998x_drv.c @@ -13,10 +13,10 @@ #include <sound/asoundef.h> #include <sound/hdmi-codec.h>
-#include <drm/drmP.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_edid.h> #include <drm/drm_of.h> +#include <drm/drm_print.h> #include <drm/drm_probe_helper.h> #include <drm/i2c/tda998x.h>
On Sun, Aug 04, 2019 at 11:41:29AM +0200, Sam Ravnborg wrote:
Drop use of the deprecated drmP.h header file. Fix fallout.
Signed-off-by: Sam Ravnborg sam@ravnborg.org Cc: Russell King linux@armlinux.org.uk Cc: David Airlie airlied@linux.ie Cc: Daniel Vetter daniel@ffwll.ch
drivers/gpu/drm/i2c/tda998x_drv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Reviewed-by: Thierry Reding treding@nvidia.com
Drop use of the deprecated drmP.h header file.
For all touched files divide include files into blocks, and sort them within the blocks. Fix fallout.
Signed-off-by: Sam Ravnborg sam@ravnborg.org Cc: Thierry Reding thierry.reding@gmail.com Cc: Jonathan Hunter jonathanh@nvidia.com Cc: linux-tegra@vger.kernel.org --- drivers/gpu/drm/tegra/dc.c | 13 +++++++++---- drivers/gpu/drm/tegra/dpaux.c | 5 +++-- drivers/gpu/drm/tegra/drm.c | 8 ++++++++ drivers/gpu/drm/tegra/drm.h | 3 +-- drivers/gpu/drm/tegra/dsi.c | 8 +++++--- drivers/gpu/drm/tegra/fb.c | 6 ++++-- drivers/gpu/drm/tegra/gem.c | 3 +++ drivers/gpu/drm/tegra/gem.h | 1 - drivers/gpu/drm/tegra/gr2d.c | 1 + drivers/gpu/drm/tegra/hdmi.c | 5 +++++ drivers/gpu/drm/tegra/hub.c | 3 ++- drivers/gpu/drm/tegra/hub.h | 1 - drivers/gpu/drm/tegra/plane.c | 1 + drivers/gpu/drm/tegra/sor.c | 3 +++ drivers/gpu/drm/tegra/vic.c | 1 + 15 files changed, 46 insertions(+), 16 deletions(-)
diff --git a/drivers/gpu/drm/tegra/dc.c b/drivers/gpu/drm/tegra/dc.c index 4a75d149e368..fbf57bc3cdab 100644 --- a/drivers/gpu/drm/tegra/dc.c +++ b/drivers/gpu/drm/tegra/dc.c @@ -6,23 +6,28 @@
#include <linux/clk.h> #include <linux/debugfs.h> +#include <linux/delay.h> #include <linux/iommu.h> +#include <linux/module.h> #include <linux/of_device.h> #include <linux/pm_runtime.h> #include <linux/reset.h>
#include <soc/tegra/pmc.h>
+#include <drm/drm_atomic.h> +#include <drm/drm_atomic_helper.h> +#include <drm/drm_debugfs.h> +#include <drm/drm_fourcc.h> +#include <drm/drm_plane_helper.h> +#include <drm/drm_vblank.h> + #include "dc.h" #include "drm.h" #include "gem.h" #include "hub.h" #include "plane.h"
-#include <drm/drm_atomic.h> -#include <drm/drm_atomic_helper.h> -#include <drm/drm_plane_helper.h> - static void tegra_crtc_atomic_destroy_state(struct drm_crtc *crtc, struct drm_crtc_state *state);
diff --git a/drivers/gpu/drm/tegra/dpaux.c b/drivers/gpu/drm/tegra/dpaux.c index 2d94da225e51..a0f6f9b0d258 100644 --- a/drivers/gpu/drm/tegra/dpaux.c +++ b/drivers/gpu/drm/tegra/dpaux.c @@ -8,14 +8,15 @@ #include <linux/gpio.h> #include <linux/interrupt.h> #include <linux/io.h> +#include <linux/module.h> #include <linux/of_gpio.h> #include <linux/pinctrl/pinconf-generic.h> #include <linux/pinctrl/pinctrl.h> #include <linux/pinctrl/pinmux.h> -#include <linux/pm_runtime.h> #include <linux/platform_device.h> -#include <linux/reset.h> +#include <linux/pm_runtime.h> #include <linux/regulator/consumer.h> +#include <linux/reset.h> #include <linux/workqueue.h>
#include <drm/drm_dp_helper.h> diff --git a/drivers/gpu/drm/tegra/drm.c b/drivers/gpu/drm/tegra/drm.c index 870904bfad78..6fb7d74ff553 100644 --- a/drivers/gpu/drm/tegra/drm.c +++ b/drivers/gpu/drm/tegra/drm.c @@ -8,9 +8,17 @@ #include <linux/host1x.h> #include <linux/idr.h> #include <linux/iommu.h> +#include <linux/module.h> +#include <linux/platform_device.h>
#include <drm/drm_atomic.h> #include <drm/drm_atomic_helper.h> +#include <drm/drm_debugfs.h> +#include <drm/drm_drv.h> +#include <drm/drm_fourcc.h> +#include <drm/drm_ioctl.h> +#include <drm/drm_prime.h> +#include <drm/drm_vblank.h>
#if IS_ENABLED(CONFIG_ARM_DMA_USE_IOMMU) #include <asm/dma-iommu.h> diff --git a/drivers/gpu/drm/tegra/drm.h b/drivers/gpu/drm/tegra/drm.h index 86daa19fcf24..29911eff9ceb 100644 --- a/drivers/gpu/drm/tegra/drm.h +++ b/drivers/gpu/drm/tegra/drm.h @@ -7,18 +7,17 @@ #ifndef HOST1X_DRM_H #define HOST1X_DRM_H 1
-#include <uapi/drm/tegra_drm.h> #include <linux/host1x.h> #include <linux/iova.h> #include <linux/of_gpio.h>
-#include <drm/drmP.h> #include <drm/drm_atomic.h> #include <drm/drm_edid.h> #include <drm/drm_encoder.h> #include <drm/drm_fb_helper.h> #include <drm/drm_fixed.h> #include <drm/drm_probe_helper.h> +#include <uapi/drm/tegra_drm.h>
#include "gem.h" #include "hub.h" diff --git a/drivers/gpu/drm/tegra/dsi.c b/drivers/gpu/drm/tegra/dsi.c index 2fbfefe9cb42..a5d47e301c5f 100644 --- a/drivers/gpu/drm/tegra/dsi.c +++ b/drivers/gpu/drm/tegra/dsi.c @@ -5,22 +5,24 @@
#include <linux/clk.h> #include <linux/debugfs.h> +#include <linux/delay.h> #include <linux/host1x.h> #include <linux/module.h> #include <linux/of.h> #include <linux/of_platform.h> #include <linux/platform_device.h> #include <linux/pm_runtime.h> +#include <linux/regulator/consumer.h> #include <linux/reset.h>
-#include <linux/regulator/consumer.h> +#include <video/mipi_display.h>
#include <drm/drm_atomic_helper.h> +#include <drm/drm_debugfs.h> +#include <drm/drm_file.h> #include <drm/drm_mipi_dsi.h> #include <drm/drm_panel.h>
-#include <video/mipi_display.h> - #include "dc.h" #include "drm.h" #include "dsi.h" diff --git a/drivers/gpu/drm/tegra/fb.c b/drivers/gpu/drm/tegra/fb.c index 888ed0d74ccd..e34325c83d28 100644 --- a/drivers/gpu/drm/tegra/fb.c +++ b/drivers/gpu/drm/tegra/fb.c @@ -9,11 +9,13 @@
#include <linux/console.h>
-#include "drm.h" -#include "gem.h" +#include <drm/drm_fourcc.h> #include <drm/drm_gem_framebuffer_helper.h> #include <drm/drm_modeset_helper.h>
+#include "drm.h" +#include "gem.h" + #ifdef CONFIG_DRM_FBDEV_EMULATION static inline struct tegra_fbdev *to_tegra_fbdev(struct drm_fb_helper *helper) { diff --git a/drivers/gpu/drm/tegra/gem.c b/drivers/gpu/drm/tegra/gem.c index 0a3d925d5284..fb7667c8dd4c 100644 --- a/drivers/gpu/drm/tegra/gem.c +++ b/drivers/gpu/drm/tegra/gem.c @@ -12,6 +12,9 @@
#include <linux/dma-buf.h> #include <linux/iommu.h> + +#include <drm/drm_drv.h> +#include <drm/drm_prime.h> #include <drm/tegra_drm.h>
#include "drm.h" diff --git a/drivers/gpu/drm/tegra/gem.h b/drivers/gpu/drm/tegra/gem.h index f1f758b25886..83ffb1e14ca3 100644 --- a/drivers/gpu/drm/tegra/gem.h +++ b/drivers/gpu/drm/tegra/gem.h @@ -11,7 +11,6 @@ #include <linux/host1x.h>
#include <drm/drm.h> -#include <drm/drmP.h> #include <drm/drm_gem.h>
#define TEGRA_BO_BOTTOM_UP (1 << 0) diff --git a/drivers/gpu/drm/tegra/gr2d.c b/drivers/gpu/drm/tegra/gr2d.c index 8dbfb30344e7..641299cc85b8 100644 --- a/drivers/gpu/drm/tegra/gr2d.c +++ b/drivers/gpu/drm/tegra/gr2d.c @@ -5,6 +5,7 @@
#include <linux/clk.h> #include <linux/iommu.h> +#include <linux/module.h> #include <linux/of_device.h>
#include "drm.h" diff --git a/drivers/gpu/drm/tegra/hdmi.c b/drivers/gpu/drm/tegra/hdmi.c index 334c4d7d238b..50269ffbcb6b 100644 --- a/drivers/gpu/drm/tegra/hdmi.c +++ b/drivers/gpu/drm/tegra/hdmi.c @@ -6,9 +6,11 @@
#include <linux/clk.h> #include <linux/debugfs.h> +#include <linux/delay.h> #include <linux/gpio.h> #include <linux/hdmi.h> #include <linux/math64.h> +#include <linux/module.h> #include <linux/of_device.h> #include <linux/pm_runtime.h> #include <linux/regulator/consumer.h> @@ -16,6 +18,9 @@
#include <drm/drm_atomic_helper.h> #include <drm/drm_crtc.h> +#include <drm/drm_debugfs.h> +#include <drm/drm_file.h> +#include <drm/drm_fourcc.h> #include <drm/drm_probe_helper.h>
#include "hda.h" diff --git a/drivers/gpu/drm/tegra/hub.c b/drivers/gpu/drm/tegra/hub.c index 92f202ec0577..839b49c40e51 100644 --- a/drivers/gpu/drm/tegra/hub.c +++ b/drivers/gpu/drm/tegra/hub.c @@ -4,6 +4,7 @@ */
#include <linux/clk.h> +#include <linux/delay.h> #include <linux/host1x.h> #include <linux/module.h> #include <linux/of.h> @@ -13,9 +14,9 @@ #include <linux/pm_runtime.h> #include <linux/reset.h>
-#include <drm/drmP.h> #include <drm/drm_atomic.h> #include <drm/drm_atomic_helper.h> +#include <drm/drm_fourcc.h> #include <drm/drm_probe_helper.h>
#include "drm.h" diff --git a/drivers/gpu/drm/tegra/hub.h b/drivers/gpu/drm/tegra/hub.h index 41541e261c91..767a60d9313c 100644 --- a/drivers/gpu/drm/tegra/hub.h +++ b/drivers/gpu/drm/tegra/hub.h @@ -6,7 +6,6 @@ #ifndef TEGRA_HUB_H #define TEGRA_HUB_H 1
-#include <drm/drmP.h> #include <drm/drm_plane.h>
#include "plane.h" diff --git a/drivers/gpu/drm/tegra/plane.c b/drivers/gpu/drm/tegra/plane.c index df80ca07e46e..6bab71d6e81d 100644 --- a/drivers/gpu/drm/tegra/plane.c +++ b/drivers/gpu/drm/tegra/plane.c @@ -5,6 +5,7 @@
#include <drm/drm_atomic.h> #include <drm/drm_atomic_helper.h> +#include <drm/drm_fourcc.h> #include <drm/drm_plane_helper.h>
#include "dc.h" diff --git a/drivers/gpu/drm/tegra/sor.c b/drivers/gpu/drm/tegra/sor.c index 4ffe3794e6d3..e1669ada0a40 100644 --- a/drivers/gpu/drm/tegra/sor.c +++ b/drivers/gpu/drm/tegra/sor.c @@ -8,6 +8,7 @@ #include <linux/debugfs.h> #include <linux/gpio.h> #include <linux/io.h> +#include <linux/module.h> #include <linux/of_device.h> #include <linux/platform_device.h> #include <linux/pm_runtime.h> @@ -17,7 +18,9 @@ #include <soc/tegra/pmc.h>
#include <drm/drm_atomic_helper.h> +#include <drm/drm_debugfs.h> #include <drm/drm_dp_helper.h> +#include <drm/drm_file.h> #include <drm/drm_panel.h> #include <drm/drm_scdc_helper.h>
diff --git a/drivers/gpu/drm/tegra/vic.c b/drivers/gpu/drm/tegra/vic.c index 958548ef69e7..cd0399fd8c63 100644 --- a/drivers/gpu/drm/tegra/vic.c +++ b/drivers/gpu/drm/tegra/vic.c @@ -4,6 +4,7 @@ */
#include <linux/clk.h> +#include <linux/delay.h> #include <linux/host1x.h> #include <linux/iommu.h> #include <linux/module.h>
On Sun, Aug 04, 2019 at 11:41:30AM +0200, Sam Ravnborg wrote:
Drop use of the deprecated drmP.h header file.
For all touched files divide include files into blocks, and sort them within the blocks. Fix fallout.
Signed-off-by: Sam Ravnborg sam@ravnborg.org Cc: Thierry Reding thierry.reding@gmail.com Cc: Jonathan Hunter jonathanh@nvidia.com Cc: linux-tegra@vger.kernel.org
drivers/gpu/drm/tegra/dc.c | 13 +++++++++---- drivers/gpu/drm/tegra/dpaux.c | 5 +++-- drivers/gpu/drm/tegra/drm.c | 8 ++++++++ drivers/gpu/drm/tegra/drm.h | 3 +-- drivers/gpu/drm/tegra/dsi.c | 8 +++++--- drivers/gpu/drm/tegra/fb.c | 6 ++++-- drivers/gpu/drm/tegra/gem.c | 3 +++ drivers/gpu/drm/tegra/gem.h | 1 - drivers/gpu/drm/tegra/gr2d.c | 1 + drivers/gpu/drm/tegra/hdmi.c | 5 +++++ drivers/gpu/drm/tegra/hub.c | 3 ++- drivers/gpu/drm/tegra/hub.h | 1 - drivers/gpu/drm/tegra/plane.c | 1 + drivers/gpu/drm/tegra/sor.c | 3 +++ drivers/gpu/drm/tegra/vic.c | 1 + 15 files changed, 46 insertions(+), 16 deletions(-)
Reviewed-by: Thierry Reding treding@nvidia.com
Drop use of the deprecated drmP.h header file. While touching the list of include files group them and sort them. Fix fallout from the header file removal.
Signed-off-by: Sam Ravnborg sam@ravnborg.org Cc: Russell King linux@armlinux.org.uk Cc: David Airlie airlied@linux.ie Cc: Daniel Vetter daniel@ffwll.ch --- drivers/gpu/drm/armada/armada_crtc.c | 10 +++++++--- drivers/gpu/drm/armada/armada_debugfs.c | 8 ++++++-- drivers/gpu/drm/armada/armada_drm.h | 5 ++++- drivers/gpu/drm/armada/armada_drv.c | 8 ++++++++ drivers/gpu/drm/armada/armada_fb.c | 3 +++ drivers/gpu/drm/armada/armada_fbdev.c | 3 +++ drivers/gpu/drm/armada/armada_gem.c | 7 ++++++- drivers/gpu/drm/armada/armada_overlay.c | 8 +++++--- drivers/gpu/drm/armada/armada_plane.c | 4 +++- drivers/gpu/drm/armada/armada_trace.h | 5 ++++- 10 files changed, 49 insertions(+), 12 deletions(-)
diff --git a/drivers/gpu/drm/armada/armada_crtc.c b/drivers/gpu/drm/armada/armada_crtc.c index d44fca4e1655..c2b92acd1e9a 100644 --- a/drivers/gpu/drm/armada/armada_crtc.c +++ b/drivers/gpu/drm/armada/armada_crtc.c @@ -3,15 +3,19 @@ * Copyright (C) 2012 Russell King * Rewritten from the dovefb driver, and Armada510 manuals. */ + #include <linux/clk.h> #include <linux/component.h> +#include <linux/module.h> #include <linux/of_device.h> #include <linux/platform_device.h> -#include <drm/drmP.h> + #include <drm/drm_atomic.h> -#include <drm/drm_probe_helper.h> -#include <drm/drm_plane_helper.h> #include <drm/drm_atomic_helper.h> +#include <drm/drm_plane_helper.h> +#include <drm/drm_probe_helper.h> +#include <drm/drm_vblank.h> + #include "armada_crtc.h" #include "armada_drm.h" #include "armada_fb.h" diff --git a/drivers/gpu/drm/armada/armada_debugfs.c b/drivers/gpu/drm/armada/armada_debugfs.c index dc3716dbb2c0..c6fc2f1d58e9 100644 --- a/drivers/gpu/drm/armada/armada_debugfs.c +++ b/drivers/gpu/drm/armada/armada_debugfs.c @@ -3,11 +3,15 @@ * Copyright (C) 2012 Russell King * Rewritten from the dovefb driver, and Armada510 manuals. */ + #include <linux/ctype.h> -#include <linux/debugfs.h> #include <linux/module.h> #include <linux/seq_file.h> -#include <drm/drmP.h> +#include <linux/uaccess.h> + +#include <drm/drm_debugfs.h> +#include <drm/drm_file.h> + #include "armada_crtc.h" #include "armada_drm.h"
diff --git a/drivers/gpu/drm/armada/armada_drm.h b/drivers/gpu/drm/armada/armada_drm.h index c7794c8bdd90..a11bdaccbb33 100644 --- a/drivers/gpu/drm/armada/armada_drm.h +++ b/drivers/gpu/drm/armada/armada_drm.h @@ -8,11 +8,14 @@ #include <linux/kfifo.h> #include <linux/io.h> #include <linux/workqueue.h> -#include <drm/drmP.h> + +#include <drm/drm_device.h> +#include <drm/drm_mm.h>
struct armada_crtc; struct armada_gem_object; struct clk; +struct drm_display_mode; struct drm_fb_helper;
static inline void diff --git a/drivers/gpu/drm/armada/armada_drv.c b/drivers/gpu/drm/armada/armada_drv.c index 055c92bc88bf..197dca3fc84c 100644 --- a/drivers/gpu/drm/armada/armada_drv.c +++ b/drivers/gpu/drm/armada/armada_drv.c @@ -2,14 +2,22 @@ /* * Copyright (C) 2012 Russell King */ + #include <linux/clk.h> #include <linux/component.h> #include <linux/module.h> #include <linux/of_graph.h> +#include <linux/platform_device.h> + #include <drm/drm_atomic_helper.h> +#include <drm/drm_drv.h> +#include <drm/drm_ioctl.h> +#include <drm/drm_prime.h> #include <drm/drm_probe_helper.h> #include <drm/drm_fb_helper.h> #include <drm/drm_of.h> +#include <drm/drm_vblank.h> + #include "armada_crtc.h" #include "armada_drm.h" #include "armada_gem.h" diff --git a/drivers/gpu/drm/armada/armada_fb.c b/drivers/gpu/drm/armada/armada_fb.c index de030cb0aa90..426ca383d696 100644 --- a/drivers/gpu/drm/armada/armada_fb.c +++ b/drivers/gpu/drm/armada/armada_fb.c @@ -2,9 +2,12 @@ /* * Copyright (C) 2012 Russell King */ + #include <drm/drm_modeset_helper.h> #include <drm/drm_fb_helper.h> +#include <drm/drm_fourcc.h> #include <drm/drm_gem_framebuffer_helper.h> + #include "armada_drm.h" #include "armada_fb.h" #include "armada_gem.h" diff --git a/drivers/gpu/drm/armada/armada_fbdev.c b/drivers/gpu/drm/armada/armada_fbdev.c index 096aff530b01..090cc0d699ae 100644 --- a/drivers/gpu/drm/armada/armada_fbdev.c +++ b/drivers/gpu/drm/armada/armada_fbdev.c @@ -3,11 +3,14 @@ * Copyright (C) 2012 Russell King * Written from the i915 driver. */ + #include <linux/errno.h> #include <linux/kernel.h> #include <linux/module.h>
#include <drm/drm_fb_helper.h> +#include <drm/drm_fourcc.h> + #include "armada_crtc.h" #include "armada_drm.h" #include "armada_fb.h" diff --git a/drivers/gpu/drm/armada/armada_gem.c b/drivers/gpu/drm/armada/armada_gem.c index 60c509784fa3..93cf8b8bfcff 100644 --- a/drivers/gpu/drm/armada/armada_gem.c +++ b/drivers/gpu/drm/armada/armada_gem.c @@ -2,12 +2,17 @@ /* * Copyright (C) 2012 Russell King */ + #include <linux/dma-buf.h> #include <linux/dma-mapping.h> +#include <linux/mman.h> #include <linux/shmem_fs.h> + +#include <drm/armada_drm.h> +#include <drm/drm_prime.h> + #include "armada_drm.h" #include "armada_gem.h" -#include <drm/armada_drm.h> #include "armada_ioctlP.h"
static vm_fault_t armada_gem_vm_fault(struct vm_fault *vmf) diff --git a/drivers/gpu/drm/armada/armada_overlay.c b/drivers/gpu/drm/armada/armada_overlay.c index e8060216b389..07f0da4d9ba1 100644 --- a/drivers/gpu/drm/armada/armada_overlay.c +++ b/drivers/gpu/drm/armada/armada_overlay.c @@ -3,12 +3,14 @@ * Copyright (C) 2012 Russell King * Rewritten from the dovefb driver, and Armada510 manuals. */ -#include <drm/drmP.h> + +#include <drm/armada_drm.h> #include <drm/drm_atomic.h> -#include <drm/drm_atomic_uapi.h> #include <drm/drm_atomic_helper.h> +#include <drm/drm_atomic_uapi.h> +#include <drm/drm_fourcc.h> #include <drm/drm_plane_helper.h> -#include <drm/armada_drm.h> + #include "armada_crtc.h" #include "armada_drm.h" #include "armada_fb.h" diff --git a/drivers/gpu/drm/armada/armada_plane.c b/drivers/gpu/drm/armada/armada_plane.c index f08b4f37816d..e7cc2b343bcb 100644 --- a/drivers/gpu/drm/armada/armada_plane.c +++ b/drivers/gpu/drm/armada/armada_plane.c @@ -3,10 +3,12 @@ * Copyright (C) 2012 Russell King * Rewritten from the dovefb driver, and Armada510 manuals. */ -#include <drm/drmP.h> + #include <drm/drm_atomic.h> #include <drm/drm_atomic_helper.h> +#include <drm/drm_fourcc.h> #include <drm/drm_plane_helper.h> + #include "armada_crtc.h" #include "armada_drm.h" #include "armada_fb.h" diff --git a/drivers/gpu/drm/armada/armada_trace.h b/drivers/gpu/drm/armada/armada_trace.h index f03a56bda596..528f20fe3147 100644 --- a/drivers/gpu/drm/armada/armada_trace.h +++ b/drivers/gpu/drm/armada/armada_trace.h @@ -3,7 +3,10 @@ #define ARMADA_TRACE_H
#include <linux/tracepoint.h> -#include <drm/drmP.h> + +struct drm_crtc; +struct drm_framebuffer; +struct drm_plane;
#undef TRACE_SYSTEM #define TRACE_SYSTEM armada
On Sun, Aug 04, 2019 at 11:41:31AM +0200, Sam Ravnborg wrote:
Drop use of the deprecated drmP.h header file. While touching the list of include files group them and sort them. Fix fallout from the header file removal.
Signed-off-by: Sam Ravnborg sam@ravnborg.org Cc: Russell King linux@armlinux.org.uk Cc: David Airlie airlied@linux.ie Cc: Daniel Vetter daniel@ffwll.ch
drivers/gpu/drm/armada/armada_crtc.c | 10 +++++++--- drivers/gpu/drm/armada/armada_debugfs.c | 8 ++++++-- drivers/gpu/drm/armada/armada_drm.h | 5 ++++- drivers/gpu/drm/armada/armada_drv.c | 8 ++++++++ drivers/gpu/drm/armada/armada_fb.c | 3 +++ drivers/gpu/drm/armada/armada_fbdev.c | 3 +++ drivers/gpu/drm/armada/armada_gem.c | 7 ++++++- drivers/gpu/drm/armada/armada_overlay.c | 8 +++++--- drivers/gpu/drm/armada/armada_plane.c | 4 +++- drivers/gpu/drm/armada/armada_trace.h | 5 ++++- 10 files changed, 49 insertions(+), 12 deletions(-)
Reviewed-by: Thierry Reding treding@nvidia.com
Drop use of the deprecated drmP.h header file.
While touching the list of include files divide them into blocks and sort within each block. Fix fallout.
Signed-off-by: Sam Ravnborg sam@ravnborg.org Cc: Liviu Dudau liviu.dudau@arm.com Cc: Brian Starkey brian.starkey@arm.com Cc: David Airlie airlied@linux.ie Cc: Daniel Vetter daniel@ffwll.ch Cc: malidp@foss.arm.com --- drivers/gpu/drm/arm/hdlcd_crtc.c | 12 +++++++----- drivers/gpu/drm/arm/hdlcd_drv.c | 7 ++++++- drivers/gpu/drm/arm/malidp_crtc.c | 11 +++++++---- drivers/gpu/drm/arm/malidp_drv.c | 8 +++++--- drivers/gpu/drm/arm/malidp_drv.h | 7 ++++--- drivers/gpu/drm/arm/malidp_hw.c | 7 ++++++- drivers/gpu/drm/arm/malidp_mw.c | 5 +++-- drivers/gpu/drm/arm/malidp_planes.c | 4 +++- 8 files changed, 41 insertions(+), 20 deletions(-)
diff --git a/drivers/gpu/drm/arm/hdlcd_crtc.c b/drivers/gpu/drm/arm/hdlcd_crtc.c index a3efa28436ea..af67fefed38d 100644 --- a/drivers/gpu/drm/arm/hdlcd_crtc.c +++ b/drivers/gpu/drm/arm/hdlcd_crtc.c @@ -9,7 +9,12 @@ * Implementation of a CRTC class for the HDLCD driver. */
-#include <drm/drmP.h> +#include <linux/clk.h> +#include <linux/of_graph.h> +#include <linux/platform_data/simplefb.h> + +#include <video/videomode.h> + #include <drm/drm_atomic.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_crtc.h> @@ -19,10 +24,7 @@ #include <drm/drm_of.h> #include <drm/drm_plane_helper.h> #include <drm/drm_probe_helper.h> -#include <linux/clk.h> -#include <linux/of_graph.h> -#include <linux/platform_data/simplefb.h> -#include <video/videomode.h> +#include <drm/drm_vblank.h>
#include "hdlcd_drv.h" #include "hdlcd_regs.h" diff --git a/drivers/gpu/drm/arm/hdlcd_drv.c b/drivers/gpu/drm/arm/hdlcd_drv.c index 27c46a2838c5..2e053815b54a 100644 --- a/drivers/gpu/drm/arm/hdlcd_drv.c +++ b/drivers/gpu/drm/arm/hdlcd_drv.c @@ -14,21 +14,26 @@ #include <linux/clk.h> #include <linux/component.h> #include <linux/console.h> +#include <linux/dma-mapping.h> #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_debugfs.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" diff --git a/drivers/gpu/drm/arm/malidp_crtc.c b/drivers/gpu/drm/arm/malidp_crtc.c index db4451260fff..587d94798f5c 100644 --- a/drivers/gpu/drm/arm/malidp_crtc.c +++ b/drivers/gpu/drm/arm/malidp_crtc.c @@ -6,14 +6,17 @@ * ARM Mali DP500/DP550/DP650 driver (crtc operations) */
-#include <drm/drmP.h> +#include <linux/clk.h> +#include <linux/pm_runtime.h> + +#include <video/videomode.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 <linux/clk.h> -#include <linux/pm_runtime.h> -#include <video/videomode.h> +#include <drm/drm_vblank.h>
#include "malidp_drv.h" #include "malidp_hw.h" diff --git a/drivers/gpu/drm/arm/malidp_drv.c b/drivers/gpu/drm/arm/malidp_drv.c index c27ff456eddc..333b88a5efb0 100644 --- a/drivers/gpu/drm/arm/malidp_drv.c +++ b/drivers/gpu/drm/arm/malidp_drv.c @@ -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_probe_helper.h> -#include <drm/drm_fb_helper.h> +#include <drm/drm_drv.h> #include <drm/drm_fb_cma_helper.h> +#include <drm/drm_fb_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_probe_helper.h> +#include <drm/drm_vblank.h>
#include "malidp_drv.h" #include "malidp_mw.h" diff --git a/drivers/gpu/drm/arm/malidp_drv.h b/drivers/gpu/drm/arm/malidp_drv.h index 0a639af8337e..cdfddfabf2d1 100644 --- a/drivers/gpu/drm/arm/malidp_drv.h +++ b/drivers/gpu/drm/arm/malidp_drv.h @@ -9,12 +9,13 @@ #ifndef __MALIDP_DRV_H__ #define __MALIDP_DRV_H__
-#include <drm/drm_writeback.h> -#include <drm/drm_encoder.h> #include <linux/mutex.h> #include <linux/wait.h> #include <linux/spinlock.h> -#include <drm/drmP.h> + +#include <drm/drm_writeback.h> +#include <drm/drm_encoder.h> + #include "malidp_hw.h"
#define MALIDP_CONFIG_VALID_INIT 0 diff --git a/drivers/gpu/drm/arm/malidp_hw.c b/drivers/gpu/drm/arm/malidp_hw.c index 380be66d4c6e..bd8265f02e0b 100644 --- a/drivers/gpu/drm/arm/malidp_hw.c +++ b/drivers/gpu/drm/arm/malidp_hw.c @@ -9,12 +9,17 @@ */
#include <linux/clk.h> +#include <linux/delay.h> #include <linux/types.h> #include <linux/io.h> -#include <drm/drmP.h> + #include <video/videomode.h> #include <video/display_timing.h>
+#include <drm/drm_fourcc.h> +#include <drm/drm_vblank.h> +#include <drm/drm_print.h> + #include "malidp_drv.h" #include "malidp_hw.h" #include "malidp_mw.h" diff --git a/drivers/gpu/drm/arm/malidp_mw.c b/drivers/gpu/drm/arm/malidp_mw.c index 2e812525025d..22c0847986df 100644 --- a/drivers/gpu/drm/arm/malidp_mw.c +++ b/drivers/gpu/drm/arm/malidp_mw.c @@ -5,13 +5,14 @@ * * ARM Mali DP Writeback connector implementation */ + #include <drm/drm_atomic.h> #include <drm/drm_atomic_helper.h> #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_probe_helper.h> #include <drm/drm_writeback.h>
#include "malidp_drv.h" diff --git a/drivers/gpu/drm/arm/malidp_planes.c b/drivers/gpu/drm/arm/malidp_planes.c index 488375bd133d..3c70a53813bf 100644 --- a/drivers/gpu/drm/arm/malidp_planes.c +++ b/drivers/gpu/drm/arm/malidp_planes.c @@ -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>
On Sun, Aug 04, 2019 at 11:41:32AM +0200, Sam Ravnborg wrote:
Drop use of the deprecated drmP.h header file.
While touching the list of include files divide them into blocks and sort within each block. Fix fallout.
Signed-off-by: Sam Ravnborg sam@ravnborg.org Cc: Liviu Dudau liviu.dudau@arm.com Cc: Brian Starkey brian.starkey@arm.com Cc: David Airlie airlied@linux.ie Cc: Daniel Vetter daniel@ffwll.ch Cc: malidp@foss.arm.com
drivers/gpu/drm/arm/hdlcd_crtc.c | 12 +++++++----- drivers/gpu/drm/arm/hdlcd_drv.c | 7 ++++++- drivers/gpu/drm/arm/malidp_crtc.c | 11 +++++++---- drivers/gpu/drm/arm/malidp_drv.c | 8 +++++--- drivers/gpu/drm/arm/malidp_drv.h | 7 ++++--- drivers/gpu/drm/arm/malidp_hw.c | 7 ++++++- drivers/gpu/drm/arm/malidp_mw.c | 5 +++-- drivers/gpu/drm/arm/malidp_planes.c | 4 +++- 8 files changed, 41 insertions(+), 20 deletions(-)
Reviewed-by: Thierry Reding treding@nvidia.com
Hi all.
On Sun, Aug 04, 2019 at 11:41:28AM +0200, Sam Ravnborg wrote:
This set of patches is one of the final steps before we have succeeded to stop using drmP.h in all of drm/.
There is a few patches in flight through other trees and the plan is that all users shall be gone in the upstream kernel after next merge window.
The patches has seen build test with various configs with various architectures.
The patches has been sent before, but to my best knowledge they have not been applied anywhere. All four patches are based on drm-misc-next, but I checked that the tda998x patch can be applied to the tda998x tree.
There are no dependencies between the patches.
v2:
- rebase on top of drm-misc-next
To maintainers: (Assuming the patch are OK) Please let me know if you take the patch, or request me to apply it to drm-misc-next. Or let me me know if the patch should be based on another tree.
ping...
This patchset is one of the last steps to get rid of drmP.h. Other patches are applied to various sub-system trees.
The idea is that after next merge window can drop drmP.h. As long as we keep drmP.h around new users will sneak in.
Sam
Sam Ravnborg (4): drm/i2c/tda998x: drop use of drmP.h drm/tegra: drop use of drmP.h drm/armada: drop use of drmP.h drm/arm: drop use of drmP.h
drivers/gpu/drm/arm/hdlcd_crtc.c | 12 +++++++----- drivers/gpu/drm/arm/hdlcd_drv.c | 7 ++++++- drivers/gpu/drm/arm/malidp_crtc.c | 11 +++++++---- drivers/gpu/drm/arm/malidp_drv.c | 8 +++++--- drivers/gpu/drm/arm/malidp_drv.h | 7 ++++--- drivers/gpu/drm/arm/malidp_hw.c | 7 ++++++- drivers/gpu/drm/arm/malidp_mw.c | 5 +++-- drivers/gpu/drm/arm/malidp_planes.c | 4 +++- drivers/gpu/drm/armada/armada_crtc.c | 10 +++++++--- drivers/gpu/drm/armada/armada_debugfs.c | 8 ++++++-- drivers/gpu/drm/armada/armada_drm.h | 5 ++++- drivers/gpu/drm/armada/armada_drv.c | 8 ++++++++ drivers/gpu/drm/armada/armada_fb.c | 3 +++ drivers/gpu/drm/armada/armada_fbdev.c | 3 +++ drivers/gpu/drm/armada/armada_gem.c | 7 ++++++- drivers/gpu/drm/armada/armada_overlay.c | 8 +++++--- drivers/gpu/drm/armada/armada_plane.c | 4 +++- drivers/gpu/drm/armada/armada_trace.h | 5 ++++- drivers/gpu/drm/i2c/tda998x_drv.c | 2 +- drivers/gpu/drm/tegra/dc.c | 13 +++++++++---- drivers/gpu/drm/tegra/dpaux.c | 5 +++-- drivers/gpu/drm/tegra/drm.c | 8 ++++++++ drivers/gpu/drm/tegra/drm.h | 3 +-- drivers/gpu/drm/tegra/dsi.c | 8 +++++--- drivers/gpu/drm/tegra/fb.c | 6 ++++-- drivers/gpu/drm/tegra/gem.c | 3 +++ drivers/gpu/drm/tegra/gem.h | 1 - drivers/gpu/drm/tegra/gr2d.c | 1 + drivers/gpu/drm/tegra/hdmi.c | 5 +++++ drivers/gpu/drm/tegra/hub.c | 3 ++- drivers/gpu/drm/tegra/hub.h | 1 - drivers/gpu/drm/tegra/plane.c | 1 + drivers/gpu/drm/tegra/sor.c | 3 +++ drivers/gpu/drm/tegra/vic.c | 1 + 34 files changed, 137 insertions(+), 49 deletions(-)
dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
This set of patches is one of the final steps before we have succeeded to stop using drmP.h in all of drm/.
There is a few patches in flight through other trees and the plan is that all users shall be gone in the upstream kernel after next merge window.
The patches has seen build test with various configs with various architectures.
The patches has been sent before, but to my best knowledge they have not been applied anywhere. All four patches are based on drm-misc-next, but I checked that the tda998x patch can be applied to the tda998x tree.
There are no dependencies between the patches.
v2:
- rebase on top of drm-misc-next
To maintainers: (Assuming the patch are OK) Please let me know if you take the patch, or request me to apply it to drm-misc-next. Or let me me know if the patch should be based on another tree.
ping...
This patchset is one of the last steps to get rid of drmP.h. Other patches are applied to various sub-system trees.
The idea is that after next merge window can drop drmP.h. As long as we keep drmP.h around new users will sneak in.
Thierry reviewed all patches - thanks!
Applied to drm-misc-next and pushed out.
Sam
dri-devel@lists.freedesktop.org
-
Sam Ravnborg -
Thierry Reding