drm: drop drmP in tda998x, tegra, arm, armada
Subsystems (7)
v2 cover drm: drop drmP in tda998x, tegra, arm, armada
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(-)
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v2 1/4 drm/i2c/tda998x: drop use of drmP.h
Drop use of the deprecated drmP.h header file. Fix fallout.
--- drivers/gpu/drm/i2c/tda998x_drv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i2c/tda998x_drv.c +1 -1
@@ -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>
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v2 1/4] drm/i2c/tda998x: drop use of drmP.h
Quoted 10 lines · Sam Ravnborg
Drop use of the deprecated
drmP.hheader file. Fix fallout.Signed-off-by Sam Ravnborg <[email protected]>Cc Russell King <[email protected]>Cc David Airlie <[email protected]>Cc Daniel Vetter <[email protected]>--- drivers/gpu/drm/i2c/tda998x_drv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v2 2/4 drm/tegra: drop use of drmP.h
In reply to Sam RavnborgDrop 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.
--- 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(-)
drivers/gpu/drm/tegra/dc.c +9 -4
@@ -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);
drivers/gpu/drm/tegra/dpaux.c +3 -2
@@ -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>
drivers/gpu/drm/tegra/drm.c +8 -0
@@ -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>
drivers/gpu/drm/tegra/drm.h +1 -2
@@ -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"
drivers/gpu/drm/tegra/dsi.c +5 -3
@@ -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"
drivers/gpu/drm/tegra/fb.c +4 -2
@@ -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) {
drivers/gpu/drm/tegra/gem.c +3 -0
@@ -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"
drivers/gpu/drm/tegra/gem.h +0 -1
@@ -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)
drivers/gpu/drm/tegra/gr2d.c +1 -0
@@ -5,6 +5,7 @@#include <linux/clk.h> #include <linux/iommu.h> +#include <linux/module.h> #include <linux/of_device.h> #include "drm.h"
drivers/gpu/drm/tegra/hdmi.c +5 -0
@@ -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"
drivers/gpu/drm/tegra/hub.c +2 -1
@@ -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"
drivers/gpu/drm/tegra/hub.h +0 -1
@@ -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"
drivers/gpu/drm/tegra/plane.c +1 -0
@@ -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"
drivers/gpu/drm/tegra/sor.c +3 -0
@@ -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>
drivers/gpu/drm/tegra/vic.c +1 -0
@@ -4,6 +4,7 @@*/ #include <linux/clk.h> +#include <linux/delay.h> #include <linux/host1x.h> #include <linux/iommu.h> #include <linux/module.h>
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v2 2/4] drm/tegra: drop use of drmP.h
Quoted 19 lines · Sam Ravnborg
Drop use of the deprecated
drmP.hheader file.For all touched files divide include files into blocks, and sort them within the blocks.
Fix fallout.Signed-off-by Sam Ravnborg <[email protected]>Cc Thierry Reding <[email protected]>Cc Jonathan Hunter <[email protected]>--- 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 -
Quoted 8 lines
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(-)
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v2 3/4 drm/armada: drop use of drmP.h
In reply to Sam RavnborgDrop 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.
--- 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(-)
drivers/gpu/drm/armada/armada_crtc.c +7 -3
@@ -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"
drivers/gpu/drm/armada/armada_debugfs.c +6 -2
@@ -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"
drivers/gpu/drm/armada/armada_drm.h +4 -1
@@ -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
drivers/gpu/drm/armada/armada_drv.c +8 -0
@@ -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"
drivers/gpu/drm/armada/armada_fb.c +3 -0
@@ -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"
drivers/gpu/drm/armada/armada_fbdev.c +3 -0
@@ -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"
drivers/gpu/drm/armada/armada_gem.c +6 -1
@@ -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)
drivers/gpu/drm/armada/armada_overlay.c +5 -3
@@ -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"
drivers/gpu/drm/armada/armada_plane.c +3 -1
@@ -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"
drivers/gpu/drm/armada/armada_trace.h +4 -1
@@ -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
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v2 3/4] drm/armada: drop use of drmP.h
Quoted 8 lines · Sam Ravnborg
Drop use of the deprecated
drmP.hheader 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 <[email protected]>Cc Russell King <[email protected]>Cc David Airlie <[email protected]>Cc Daniel Vetter <[email protected]>
Quoted 12 lines
--- 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(-)
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v2 4/4 drm/arm: drop use of drmP.h
In reply to Sam RavnborgDrop 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.
--- 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(-)
drivers/gpu/drm/arm/hdlcd_crtc.c +7 -5
@@ -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"
drivers/gpu/drm/arm/hdlcd_drv.c +6 -1
@@ -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"
drivers/gpu/drm/arm/malidp_crtc.c +7 -4
@@ -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"
drivers/gpu/drm/arm/malidp_drv.c +5 -3
@@ -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"
drivers/gpu/drm/arm/malidp_drv.h +4 -3
@@ -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
drivers/gpu/drm/arm/malidp_hw.c +6 -1
@@ -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"
drivers/gpu/drm/arm/malidp_mw.c +3 -2
@@ -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"
drivers/gpu/drm/arm/malidp_planes.c +3 -1
@@ -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 · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v2 4/4] drm/arm: drop use of drmP.h
Quoted 12 lines · Sam Ravnborg
Drop use of the deprecated
drmP.hheader file.While touching the list of include files divide them into blocks and sort within each block.
Fix fallout.Signed-off-by Sam Ravnborg <[email protected]>Cc Liviu Dudau <[email protected]>Cc Brian Starkey <[email protected]>Cc David Airlie <[email protected]>Cc Daniel Vetter <[email protected]>
Quoted 10 lines
--- 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(-)
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Hi all.
Quoted 18 lines · Sam Ravnborg
This set of patches is one of the final steps before we have succeeded to stop using
drmP.hin 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.
Quoted 7 lines
v2:
- rebase on top of drm-misc-nextTo 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
Quoted 44 lines
Sam Ravnborg (4):
drm/i2c/tda998x: drop use ofdrmP.h
drm/tegra: drop use ofdrmP.h
drm/armada: drop use ofdrmP.h
drm/arm: drop use ofdrmP.hdrivers/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(-)
Quoted 4 lines
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Sam Ravnborg
AppliedQuoted 26 lines
Quoted 18 lines
This set of patches is one of the final steps before we have succeeded to stop using
drmP.hin 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.
Quoted 7 lines
v2:
- rebase on top of drm-misc-nextTo 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.
Quoted 7 lines
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 keepdrmP.haround new users will sneak in.
Thierry reviewed all patches - thanks!
Applied to drm-misc-next and pushed out.
Sam
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel