drm: drop use of drmp.h in drm-misc
Subsystems (16)
v2 cover drm: drop use of drmp.h in drm-misc
This patch set removes a far share of the remaining uses of drmP.h. Common for all patches are that the respective files are maintained in drm-misc.
All patches are independent.
Patches have all been build tested with various configs and various architectures.
There are likely introduced a few build issues that randconfig build will reveal, but for all configs I have used the build was OK.
This patchset does not conclude the quest to kill all uses of drmP.h, but it is a major step towards the goal.
Please review/ack.
I plan to apply the patches to drm-misc, but feel free to do it yourself.
There will be conflicts with the ongoing work on ttm, gem etc. But let's deal with the conflicts when they hit us - it is simple conflicts in the list of include files.
v2:
- Removed merged patches
- Added ack from Emil Velikov to the full series
- Rebased on top of drm-misc-next
- Hand-edited the list of Cc: as get_maintainer.pl in some cases looks up too much people, due to cross kernel commits
Sam
Sam Ravnborg (19):
drm/meson: drop use of drmP.h
drm/v3d: drop use of drmP.h
drm/pl111: drop use of drmP.h
drm/zte: drop use of drmP.h
drm/sun4i: drop use of drmP.h
drm/vc4: drop use of drmP.h
drm/r128: drop use of drmP.h
drm/udl: drop use of drmP.h
drm/omapdrm: drop use of drmP.h
drm/selftests: drop use of drmP.h
drm/tdfx: drop use of drmP.h
drm/vgem: drop use of drmP.h
drm/i810: drop use of drmP.h
drm/tilcdc: drop use of drmP.h
drm/i2c/ch7006: drop use of drmP.h
drm/i2c/sil164: drop use of drmP.h
drm/imx: drop use of drmP.h
drm/rockchip: drop use of drmP.h
drm/mediatek: drop use of drmP.h
drivers/gpu/drm/i2c/ch7006_priv.h | 1 - drivers/gpu/drm/i2c/sil164_drv.c | 3 ++- drivers/gpu/drm/i810/i810_dma.c | 17 +++++++++---- drivers/gpu/drm/i810/i810_drv.c | 8 +++--- drivers/gpu/drm/i810/i810_drv.h | 2 ++ drivers/gpu/drm/imx/dw_hdmi-imx.c | 14 ++++++----- drivers/gpu/drm/imx/imx-drm-core.c | 8 ++++-- drivers/gpu/drm/imx/imx-ldb.c | 22 +++++++++-------- drivers/gpu/drm/imx/imx-tve.c | 10 +++++--- drivers/gpu/drm/imx/ipuv3-crtc.c | 8 ++++-- drivers/gpu/drm/imx/ipuv3-plane.c | 5 ++-- drivers/gpu/drm/imx/parallel-display.c | 8 +++--- drivers/gpu/drm/mediatek/mtk_disp_color.c | 2 +- drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 2 +- drivers/gpu/drm/mediatek/mtk_disp_rdma.c | 2 +- drivers/gpu/drm/mediatek/mtk_dpi.c | 18 ++++++++------ drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 10 +++++--- drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c | 2 +- drivers/gpu/drm/mediatek/mtk_drm_drv.c | 16 +++++++----- drivers/gpu/drm/mediatek/mtk_drm_fb.c | 7 +++--- drivers/gpu/drm/mediatek/mtk_drm_gem.c | 6 +++-- drivers/gpu/drm/mediatek/mtk_drm_plane.c | 2 +- drivers/gpu/drm/mediatek/mtk_dsi.c | 14 ++++++----- drivers/gpu/drm/mediatek/mtk_hdmi.c | 14 +++++++---- drivers/gpu/drm/meson/meson_crtc.c | 16 ++++++------ drivers/gpu/drm/meson/meson_drv.c | 27 +++++++++------------ drivers/gpu/drm/meson/meson_drv.h | 11 ++++++--- drivers/gpu/drm/meson/meson_dw_hdmi.c | 19 ++++++++------- drivers/gpu/drm/meson/meson_overlay.c | 13 ++++------ drivers/gpu/drm/meson/meson_plane.c | 16 +++++------- drivers/gpu/drm/meson/meson_registers.h | 2 ++ drivers/gpu/drm/meson/meson_vclk.c | 7 +++--- drivers/gpu/drm/meson/meson_vclk.h | 4 +++ drivers/gpu/drm/meson/meson_venc.c | 10 ++++---- drivers/gpu/drm/meson/meson_venc.h | 2 ++ drivers/gpu/drm/meson/meson_venc_cvbs.c | 11 ++++----- drivers/gpu/drm/meson/meson_viu.c | 7 ++---- drivers/gpu/drm/meson/meson_vpp.c | 7 +++--- drivers/gpu/drm/meson/meson_vpp.h | 3 +++ drivers/gpu/drm/omapdrm/omap_crtc.c | 4 ++- drivers/gpu/drm/omapdrm/omap_debugfs.c | 2 ++ drivers/gpu/drm/omapdrm/omap_drv.c | 10 ++++++-- drivers/gpu/drm/omapdrm/omap_drv.h | 5 ++-- drivers/gpu/drm/omapdrm/omap_fb.c | 4 +-- drivers/gpu/drm/omapdrm/omap_fbdev.c | 2 ++ drivers/gpu/drm/omapdrm/omap_gem.c | 2 ++ drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c | 3 +++ drivers/gpu/drm/omapdrm/omap_irq.c | 2 ++ drivers/gpu/drm/pl111/pl111_debugfs.c | 4 ++- drivers/gpu/drm/pl111/pl111_display.c | 6 +++-- drivers/gpu/drm/pl111/pl111_drm.h | 11 +++++---- drivers/gpu/drm/pl111/pl111_drv.c | 9 ++++--- drivers/gpu/drm/pl111/pl111_nomadik.h | 3 ++- drivers/gpu/drm/pl111/pl111_versatile.c | 9 ++++--- drivers/gpu/drm/pl111/pl111_versatile.h | 3 +++ drivers/gpu/drm/r128/r128_ioc32.c | 3 ++- drivers/gpu/drm/r128/r128_irq.c | 5 +++- drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 10 +++----- drivers/gpu/drm/rockchip/cdn-dp-core.c | 17 ++++++------- drivers/gpu/drm/rockchip/cdn-dp-core.h | 2 +- drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c | 9 ++++--- drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 5 ++-- drivers/gpu/drm/rockchip/inno_hdmi.c | 3 +-- drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 12 +++++---- drivers/gpu/drm/rockchip/rockchip_drm_fb.c | 3 ++- drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c | 2 +- drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 8 +++--- drivers/gpu/drm/rockchip/rockchip_drm_psr.c | 1 - drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 31 ++++++++++++------------ drivers/gpu/drm/rockchip/rockchip_lvds.c | 16 ++++++------ drivers/gpu/drm/rockchip/rockchip_rgb.c | 9 +++---- drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 11 ++++++--- drivers/gpu/drm/selftests/test-drm_framebuffer.c | 7 +++++- drivers/gpu/drm/sun4i/sun4i_backend.c | 16 ++++++------ drivers/gpu/drm/sun4i/sun4i_crtc.c | 13 +++++----- drivers/gpu/drm/sun4i/sun4i_drv.c | 5 +++- drivers/gpu/drm/sun4i/sun4i_framebuffer.c | 1 - drivers/gpu/drm/sun4i/sun4i_frontend.c | 10 +++++--- drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 17 +++++++------ drivers/gpu/drm/sun4i/sun4i_layer.c | 3 +-- drivers/gpu/drm/sun4i/sun4i_lvds.c | 2 +- drivers/gpu/drm/sun4i/sun4i_rgb.c | 2 +- drivers/gpu/drm/sun4i/sun4i_tcon.c | 20 ++++++++------- drivers/gpu/drm/sun4i/sun4i_tv.c | 4 ++- drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c | 9 ++++--- drivers/gpu/drm/sun4i/sun8i_csc.c | 2 +- drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c | 3 +-- drivers/gpu/drm/sun4i/sun8i_mixer.c | 14 +++++------ drivers/gpu/drm/sun4i/sun8i_tcon_top.c | 6 ++--- drivers/gpu/drm/sun4i/sun8i_ui_layer.c | 2 +- drivers/gpu/drm/sun4i/sun8i_vi_layer.c | 1 - drivers/gpu/drm/tdfx/tdfx_drv.c | 11 ++++++--- drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 18 ++++++++------ drivers/gpu/drm/tilcdc/tilcdc_drv.c | 19 ++++++++++++--- drivers/gpu/drm/tilcdc/tilcdc_drv.h | 31 +++++++++++++----------- drivers/gpu/drm/tilcdc/tilcdc_external.c | 1 + drivers/gpu/drm/tilcdc/tilcdc_panel.c | 11 ++++++--- drivers/gpu/drm/tilcdc/tilcdc_plane.c | 4 +-- drivers/gpu/drm/tilcdc/tilcdc_tfp410.c | 8 +++--- drivers/gpu/drm/udl/udl_connector.c | 4 +-- drivers/gpu/drm/udl/udl_connector.h | 2 ++ drivers/gpu/drm/udl/udl_dmabuf.c | 6 +++-- drivers/gpu/drm/udl/udl_drv.c | 7 +++++- drivers/gpu/drm/udl/udl_drv.h | 8 +++++- drivers/gpu/drm/udl/udl_encoder.c | 6 ++--- drivers/gpu/drm/udl/udl_fb.c | 15 ++++++------ drivers/gpu/drm/udl/udl_gem.c | 9 ++++--- drivers/gpu/drm/udl/udl_main.c | 6 +++-- drivers/gpu/drm/udl/udl_modeset.c | 6 ++--- drivers/gpu/drm/udl/udl_transfer.c | 4 --- drivers/gpu/drm/v3d/v3d_debugfs.c | 3 ++- drivers/gpu/drm/v3d/v3d_drv.c | 5 +++- drivers/gpu/drm/v3d/v3d_drv.h | 13 ++++++++-- drivers/gpu/drm/v3d/v3d_gem.c | 12 +++++---- drivers/gpu/drm/v3d/v3d_irq.c | 2 ++ drivers/gpu/drm/vc4/vc4_crtc.c | 11 ++++++--- drivers/gpu/drm/vc4/vc4_debugfs.c | 1 - drivers/gpu/drm/vc4/vc4_drv.c | 7 +++++- drivers/gpu/drm/vc4/vc4_drv.h | 17 +++++++++---- drivers/gpu/drm/vc4/vc4_dsi.c | 17 +++++++------ drivers/gpu/drm/vc4/vc4_gem.c | 2 ++ drivers/gpu/drm/vc4/vc4_hvs.c | 5 +++- drivers/gpu/drm/vc4/vc4_kms.c | 4 ++- drivers/gpu/drm/vc4/vc4_plane.c | 6 +++-- drivers/gpu/drm/vc4/vc4_txp.c | 14 ++++++----- drivers/gpu/drm/vc4/vc4_v3d.c | 4 +++ drivers/gpu/drm/vgem/vgem_drv.c | 11 +++++++-- drivers/gpu/drm/vgem/vgem_drv.h | 1 - drivers/gpu/drm/vgem/vgem_fence.c | 2 ++ drivers/gpu/drm/zte/zx_drm_drv.c | 3 ++- drivers/gpu/drm/zte/zx_hdmi.c | 2 +- drivers/gpu/drm/zte/zx_plane.c | 2 +- drivers/gpu/drm/zte/zx_tvenc.c | 4 ++- drivers/gpu/drm/zte/zx_vga.c | 4 ++- drivers/gpu/drm/zte/zx_vou.c | 5 +++- include/linux/soc/amlogic/meson-canvas.h | 1 + 136 files changed, 626 insertions(+), 427 deletions(-)
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v2 1/19 drm/meson: drop use of drmP.h
Drop use of the deprecated drmP.h header. While doing so used the opportunity
to clean up a little so includes are now sorted and removed unused include files. In a few cases added some forwards to allow header files to built in different include order.
--- drivers/gpu/drm/meson/meson_crtc.c | 16 ++++++-------- drivers/gpu/drm/meson/meson_drv.c | 27 ++++++++++-------------- drivers/gpu/drm/meson/meson_drv.h | 11 ++++++---- drivers/gpu/drm/meson/meson_dw_hdmi.c | 19 +++++++++-------- drivers/gpu/drm/meson/meson_overlay.c | 13 +++++------- drivers/gpu/drm/meson/meson_plane.c | 16 ++++++-------- drivers/gpu/drm/meson/meson_registers.h | 2 ++ drivers/gpu/drm/meson/meson_vclk.c | 7 +++--- drivers/gpu/drm/meson/meson_vclk.h | 4 ++++ drivers/gpu/drm/meson/meson_venc.c | 10 ++++----- drivers/gpu/drm/meson/meson_venc.h | 2 ++ drivers/gpu/drm/meson/meson_venc_cvbs.c | 11 +++++----- drivers/gpu/drm/meson/meson_viu.c | 7 ++---- drivers/gpu/drm/meson/meson_vpp.c | 7 +++--- drivers/gpu/drm/meson/meson_vpp.h | 3 +++ include/linux/soc/amlogic/meson-canvas.h | 1 + 16 files changed, 77 insertions(+), 79 deletions(-)
drivers/gpu/drm/meson/meson_crtc.c +7 -9
@@ -9,23 +9,21 @@* Jasper St. Pierre <[email protected]> */ -#include <linux/kernel.h> -#include <linux/module.h> -#include <linux/mutex.h> -#include <linux/platform_device.h> #include <linux/bitfield.h> -#include <drm/drmP.h> -#include <drm/drm_atomic.h> +#include <linux/soc/amlogic/meson-canvas.h> +#include <drm/drm_atomic_helper.h> -#include <drm/drm_flip_work.h> +#include <drm/drm_device.h> +#include <drm/drm_print.h> #include <drm/drm_probe_helper.h> +#include <drm/drm_vblank.h> #include "meson_crtc.h" #include "meson_plane.h" +#include "meson_registers.h" #include "meson_venc.h" -#include "meson_vpp.h" #include "meson_viu.h" -#include "meson_registers.h" +#include "meson_vpp.h" #define MESON_G12A_VIU_OFFSET 0x5ec0
drivers/gpu/drm/meson/meson_drv.c +11 -16
@@ -8,35 +8,30 @@* Jasper St. Pierre <[email protected]> */ -#include <linux/kernel.h> -#include <linux/module.h> -#include <linux/mutex.h> -#include <linux/platform_device.h> #include <linux/component.h> +#include <linux/module.h> #include <linux/of_graph.h> +#include <linux/platform_device.h> +#include <linux/soc/amlogic/meson-canvas.h> -#include <drm/drmP.h> -#include <drm/drm_atomic.h> #include <drm/drm_atomic_helper.h> -#include <drm/drm_fb_cma_helper.h> +#include <drm/drm_drv.h> #include <drm/drm_fb_helper.h> -#include <drm/drm_flip_work.h> #include <drm/drm_gem_cma_helper.h> #include <drm/drm_gem_framebuffer_helper.h> -#include <drm/drm_plane_helper.h> +#include <drm/drm_irq.h> +#include <drm/drm_modeset_helper_vtables.h> #include <drm/drm_probe_helper.h> -#include <drm/drm_rect.h> +#include <drm/drm_vblank.h> +#include "meson_crtc.h" #include "meson_drv.h" -#include "meson_plane.h" #include "meson_overlay.h" -#include "meson_crtc.h" +#include "meson_plane.h" +#include "meson_registers.h" #include "meson_venc_cvbs.h" - -#include "meson_vpp.h" #include "meson_viu.h" -#include "meson_venc.h" -#include "meson_registers.h" +#include "meson_vpp.h" #define DRIVER_NAME "meson"#define DRIVER_DESC "Amlogic Meson DRM driver"
drivers/gpu/drm/meson/meson_drv.h +7 -4
@@ -7,11 +7,14 @@ #ifndef __MESON_DRV_H #define __MESON_DRV_H -#include <linux/platform_device.h> -#include <linux/regmap.h> +#include <linux/device.h> #include <linux/of.h> -#include <linux/soc/amlogic/meson-canvas.h> -#include <drm/drmP.h> +#include <linux/regmap.h> + +struct drm_crtc; +struct drm_device; +struct drm_plane; +struct meson_drm; struct meson_drm { struct device *dev;
drivers/gpu/drm/meson/meson_dw_hdmi.c +10 -9
@@ -5,29 +5,30 @@* Copyright (C) 2015 Amlogic, Inc. All rights reserved. */ +#include <linux/clk.h> +#include <linux/component.h> #include <linux/kernel.h> #include <linux/module.h> -#include <linux/component.h> #include <linux/of_device.h> #include <linux/of_graph.h> -#include <linux/reset.h> -#include <linux/clk.h> #include <linux/regulator/consumer.h> +#include <linux/reset.h> -#include <drm/drmP.h> +#include <drm/bridge/dw_hdmi.h> #include <drm/drm_atomic_helper.h> +#include <drm/drm_device.h> #include <drm/drm_edid.h> #include <drm/drm_probe_helper.h> -#include <drm/bridge/dw_hdmi.h> +#include <drm/drm_print.h> -#include <uapi/linux/media-bus-format.h> -#include <uapi/linux/videodev2.h> +#include <linux/media-bus-format.h> +#include <linux/videodev2.h> #include "meson_drv.h" -#include "meson_venc.h" -#include "meson_vclk.h" #include "meson_dw_hdmi.h" #include "meson_registers.h" +#include "meson_vclk.h" +#include "meson_venc.h" #define DRIVER_NAME "meson-dw-hdmi"#define DRIVER_DESC "Amlogic Meson HDMI-TX DRM driver"
drivers/gpu/drm/meson/meson_overlay.c +5 -8
@@ -5,24 +5,21 @@* Copyright (C) 2015 Amlogic, Inc. All rights reserved. */ -#include <linux/kernel.h> -#include <linux/module.h> -#include <linux/mutex.h> #include <linux/bitfield.h> -#include <linux/platform_device.h> -#include <drm/drmP.h> +#include <drm/drm_atomic.h> #include <drm/drm_atomic_helper.h> +#include <drm/drm_device.h> +#include <drm/drm_fourcc.h> #include <drm/drm_plane_helper.h> #include <drm/drm_gem_cma_helper.h> #include <drm/drm_fb_cma_helper.h> #include <drm/drm_gem_framebuffer_helper.h> -#include <drm/drm_rect.h> #include "meson_overlay.h" -#include "meson_vpp.h" -#include "meson_viu.h" #include "meson_registers.h" +#include "meson_viu.h" +#include "meson_vpp.h" /* VD1_IF0_GEN_REG */ #define VD_URGENT_CHROMA BIT(28)
drivers/gpu/drm/meson/meson_plane.c +6 -10
@@ -9,24 +9,20 @@* Jasper St. Pierre <[email protected]> */ -#include <linux/kernel.h> -#include <linux/module.h> -#include <linux/mutex.h> #include <linux/bitfield.h> -#include <linux/platform_device.h> -#include <drm/drmP.h> +#include <drm/drm_atomic.h> #include <drm/drm_atomic_helper.h> -#include <drm/drm_plane_helper.h> -#include <drm/drm_gem_cma_helper.h> +#include <drm/drm_device.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_rect.h> +#include <drm/drm_plane_helper.h> #include "meson_plane.h" -#include "meson_vpp.h" -#include "meson_viu.h" #include "meson_registers.h" +#include "meson_viu.h" /* OSD_SCI_WH_M1 */ #define SCI_WH_M1_W (w) FIELD_PREP(GENMASK(28, 16), w)
drivers/gpu/drm/meson/meson_registers.h +2 -0
@@ -6,6 +6,8 @@#ifndef __MESON_REGISTERS_H#define __MESON_REGISTERS_H +#include <linux/io.h> +/* Shift all registers by 2 */ #define _REG (reg) ((reg) << 2)
drivers/gpu/drm/meson/meson_vclk.c +4 -3
@@ -5,9 +5,10 @@* Copyright (C) 2015 Amlogic, Inc. All rights reserved. */ -#include <linux/kernel.h> -#include <linux/module.h> -#include <drm/drmP.h> +#include <linux/export.h> + +#include <drm/drm_print.h> +#include "meson_drv.h" #include "meson_vclk.h"
drivers/gpu/drm/meson/meson_vclk.h +4 -0
@@ -9,6 +9,10 @@#ifndef __MESON_VCLK_H#define __MESON_VCLK_H +#include <drm/drm_modes.h> + +struct meson_drm ; +enum {MESON_VCLK_TARGET_CVBS =0 , MESON_VCLK_TARGET_HDMI = 1,
drivers/gpu/drm/meson/meson_venc.c +5 -5
@@ -5,14 +5,14 @@* Copyright (C) 2015 Amlogic, Inc. All rights reserved. */ -#include <linux/kernel.h> -#include <linux/module.h> -#include <drm/drmP.h> +#include <linux/export.h> + +#include <drm/drm_modes.h> +#include "meson_drv.h" +#include "meson_registers.h" #include "meson_venc.h" #include "meson_vpp.h" -#include "meson_vclk.h" -#include "meson_registers.h" /** * DOC: Video Encoder
drivers/gpu/drm/meson/meson_venc.h +2 -0
@@ -14,6 +14,8 @@#ifndef __MESON_VENC_H#define __MESON_VENC_H +struct drm_display_mode ; +enum {MESON_VENC_MODE_NONE =0 , MESON_VENC_MODE_CVBS_PAL,
drivers/gpu/drm/meson/meson_venc_cvbs.c +5 -6
@@ -9,19 +9,18 @@* Jasper St. Pierre <[email protected]> */ -#include <linux/kernel.h> -#include <linux/module.h> +#include <linux/export.h> #include <linux/of_graph.h> -#include <drm/drmP.h> #include <drm/drm_atomic_helper.h> +#include <drm/drm_device.h> #include <drm/drm_edid.h> #include <drm/drm_probe_helper.h> +#include <drm/drm_print.h> -#include "meson_venc_cvbs.h" -#include "meson_venc.h" -#include "meson_vclk.h" #include "meson_registers.h" +#include "meson_vclk.h" +#include "meson_venc_cvbs.h" /* HHI VDAC Registers */ #define HHI_VDAC_CNTL0 0x2F4/* 0xbd offset in data sheet */
drivers/gpu/drm/meson/meson_viu.c +2 -5
@@ -6,13 +6,10 @@* Copyright (C) 2014 Endless Mobile */ -#include <linux/kernel.h> -#include <linux/module.h> -#include <drm/drmP.h> +#include <linux/export.h> +#include "meson_drv.h" #include "meson_viu.h" -#include "meson_vpp.h" -#include "meson_venc.h" #include "meson_registers.h" /**
drivers/gpu/drm/meson/meson_vpp.c +3 -4
@@ -6,12 +6,11 @@* Copyright (C) 2014 Endless Mobile */ -#include <linux/kernel.h> -#include <linux/module.h> -#include <drm/drmP.h> +#include <linux/export.h> +#include "meson_drv.h" -#include "meson_vpp.h" #include "meson_registers.h" +#include "meson_vpp.h" /** * DOC: Video Post Processing
drivers/gpu/drm/meson/meson_vpp.h +3 -0
@@ -9,6 +9,9 @@#ifndef __MESON_VPP_H#define __MESON_VPP_H +struct drm_rect ; +struct meson_drm ; +/* Mux VIU/VPP to ENCI */ #define MESON_VIU_VPP_MUX_ENCI 0x5/* Mux VIU/VPP to ENCP */
include/linux/soc/amlogic/meson-canvas.h +1 -0
@@ -20,6 +20,7 @@#define MESON_CANVAS_ENDIAN_SWAP64 0x7#define MESON_CANVAS_ENDIAN_SWAP128 0xf +struct device ;struct meson_canvas ;/**
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v2 01/19] drm/meson: drop use of drmP.h
Quoted 8 lines · Sam Ravnborg
Drop use of the deprecated
drmP.hheader. While doing so used the opportunity
to clean up a little so includes are now sorted and removed unused include files. In a few cases added some forwards to allow header files to built in different include order.
Quoted 8 lines
Signed-off-by Sam Ravnborg <[email protected]>Acked-by Emil Velikov <[email protected]>Cc Neil Armstrong <[email protected]>Cc Kevin Hilman <[email protected]>Cc Maxime Jourdan <[email protected]>Cc Jerome Brunet <[email protected]>
Quoted 422 lines
--- drivers/gpu/drm/meson/meson_crtc.c | 16 ++++++-------- drivers/gpu/drm/meson/meson_drv.c | 27 ++++++++++-------------- drivers/gpu/drm/meson/meson_drv.h | 11 ++++++---- drivers/gpu/drm/meson/meson_dw_hdmi.c | 19 +++++++++-------- drivers/gpu/drm/meson/meson_overlay.c | 13 +++++------- drivers/gpu/drm/meson/meson_plane.c | 16 ++++++-------- drivers/gpu/drm/meson/meson_registers.h | 2 ++ drivers/gpu/drm/meson/meson_vclk.c | 7 +++--- drivers/gpu/drm/meson/meson_vclk.h | 4 ++++ drivers/gpu/drm/meson/meson_venc.c | 10 ++++----- drivers/gpu/drm/meson/meson_venc.h | 2 ++ drivers/gpu/drm/meson/meson_venc_cvbs.c | 11 +++++----- drivers/gpu/drm/meson/meson_viu.c | 7 ++---- drivers/gpu/drm/meson/meson_vpp.c | 7 +++--- drivers/gpu/drm/meson/meson_vpp.h | 3 +++ include/linux/soc/amlogic/meson-canvas.h | 1 + 16 files changed, 77 insertions(+), 79 deletions(-)drivers/gpu/drm/meson/meson_crtc.c +7
-9@@ -9,23 +9,21 @@* Jasper St. Pierre <[email protected]> */ -#include <linux/kernel.h> -#include <linux/module.h> -#include <linux/mutex.h> -#include <linux/platform_device.h> #include <linux/bitfield.h> -#include <drm/drmP.h> -#include <drm/drm_atomic.h> +#include <linux/soc/amlogic/meson-canvas.h> +#include <drm/drm_atomic_helper.h> -#include <drm/drm_flip_work.h> +#include <drm/drm_device.h> +#include <drm/drm_print.h> #include <drm/drm_probe_helper.h> +#include <drm/drm_vblank.h> #include "meson_crtc.h" #include "meson_plane.h" +#include "meson_registers.h" #include "meson_venc.h" -#include "meson_vpp.h" #include "meson_viu.h" -#include "meson_registers.h" +#include "meson_vpp.h" #define MESON_G12A_VIU_OFFSET 0x5ec0drivers/gpu/drm/meson/meson_drv.c +11
-16@@ -8,35 +8,30 @@* Jasper St. Pierre <[email protected]> */ -#include <linux/kernel.h> -#include <linux/module.h> -#include <linux/mutex.h> -#include <linux/platform_device.h> #include <linux/component.h> +#include <linux/module.h> #include <linux/of_graph.h> +#include <linux/platform_device.h> +#include <linux/soc/amlogic/meson-canvas.h> -#include <drm/drmP.h> -#include <drm/drm_atomic.h> #include <drm/drm_atomic_helper.h> -#include <drm/drm_fb_cma_helper.h> +#include <drm/drm_drv.h> #include <drm/drm_fb_helper.h> -#include <drm/drm_flip_work.h> #include <drm/drm_gem_cma_helper.h> #include <drm/drm_gem_framebuffer_helper.h> -#include <drm/drm_plane_helper.h> +#include <drm/drm_irq.h> +#include <drm/drm_modeset_helper_vtables.h> #include <drm/drm_probe_helper.h> -#include <drm/drm_rect.h> +#include <drm/drm_vblank.h> +#include "meson_crtc.h" #include "meson_drv.h" -#include "meson_plane.h" #include "meson_overlay.h" -#include "meson_crtc.h" +#include "meson_plane.h" +#include "meson_registers.h" #include "meson_venc_cvbs.h" - -#include "meson_vpp.h" #include "meson_viu.h" -#include "meson_venc.h" -#include "meson_registers.h" +#include "meson_vpp.h" #define DRIVER_NAME "meson"#define DRIVER_DESC "Amlogic Meson DRM driver"drivers/gpu/drm/meson/meson_drv.h +7
-4@@ -7,11 +7,14 @@ #ifndef __MESON_DRV_H #define __MESON_DRV_H -#include <linux/platform_device.h> -#include <linux/regmap.h> +#include <linux/device.h> #include <linux/of.h> -#include <linux/soc/amlogic/meson-canvas.h> -#include <drm/drmP.h> +#include <linux/regmap.h> + +struct drm_crtc; +struct drm_device; +struct drm_plane; +struct meson_drm; struct meson_drm { struct device *dev;drivers/gpu/drm/meson/meson_dw_hdmi.c +10
-9@@ -5,29 +5,30 @@* Copyright (C) 2015 Amlogic, Inc. All rights reserved. */ +#include <linux/clk.h> +#include <linux/component.h> #include <linux/kernel.h> #include <linux/module.h> -#include <linux/component.h> #include <linux/of_device.h> #include <linux/of_graph.h> -#include <linux/reset.h> -#include <linux/clk.h> #include <linux/regulator/consumer.h> +#include <linux/reset.h> -#include <drm/drmP.h> +#include <drm/bridge/dw_hdmi.h> #include <drm/drm_atomic_helper.h> +#include <drm/drm_device.h> #include <drm/drm_edid.h> #include <drm/drm_probe_helper.h> -#include <drm/bridge/dw_hdmi.h> +#include <drm/drm_print.h> -#include <uapi/linux/media-bus-format.h> -#include <uapi/linux/videodev2.h> +#include <linux/media-bus-format.h> +#include <linux/videodev2.h> #include "meson_drv.h" -#include "meson_venc.h" -#include "meson_vclk.h" #include "meson_dw_hdmi.h" #include "meson_registers.h" +#include "meson_vclk.h" +#include "meson_venc.h" #define DRIVER_NAME "meson-dw-hdmi"#define DRIVER_DESC "Amlogic Meson HDMI-TX DRM driver"drivers/gpu/drm/meson/meson_overlay.c +5
-8@@ -5,24 +5,21 @@* Copyright (C) 2015 Amlogic, Inc. All rights reserved. */ -#include <linux/kernel.h> -#include <linux/module.h> -#include <linux/mutex.h> #include <linux/bitfield.h> -#include <linux/platform_device.h> -#include <drm/drmP.h> +#include <drm/drm_atomic.h> #include <drm/drm_atomic_helper.h> +#include <drm/drm_device.h> +#include <drm/drm_fourcc.h> #include <drm/drm_plane_helper.h> #include <drm/drm_gem_cma_helper.h> #include <drm/drm_fb_cma_helper.h> #include <drm/drm_gem_framebuffer_helper.h> -#include <drm/drm_rect.h> #include "meson_overlay.h" -#include "meson_vpp.h" -#include "meson_viu.h" #include "meson_registers.h" +#include "meson_viu.h" +#include "meson_vpp.h" /* VD1_IF0_GEN_REG */ #define VD_URGENT_CHROMA BIT(28)drivers/gpu/drm/meson/meson_plane.c +6
-10@@ -9,24 +9,20 @@* Jasper St. Pierre <[email protected]> */ -#include <linux/kernel.h> -#include <linux/module.h> -#include <linux/mutex.h> #include <linux/bitfield.h> -#include <linux/platform_device.h> -#include <drm/drmP.h> +#include <drm/drm_atomic.h> #include <drm/drm_atomic_helper.h> -#include <drm/drm_plane_helper.h> -#include <drm/drm_gem_cma_helper.h> +#include <drm/drm_device.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_rect.h> +#include <drm/drm_plane_helper.h> #include "meson_plane.h" -#include "meson_vpp.h" -#include "meson_viu.h" #include "meson_registers.h" +#include "meson_viu.h" /* OSD_SCI_WH_M1 */ #define SCI_WH_M1_W (w) FIELD_PREP(GENMASK(28, 16), w)drivers/gpu/drm/meson/meson_registers.h +2
-0@@ -6,6 +6,8 @@#ifndef __MESON_REGISTERS_H#define __MESON_REGISTERS_H +#include <linux/io.h> +/* Shift all registers by 2 */ #define _REG (reg) ((reg) << 2)drivers/gpu/drm/meson/meson_vclk.c +4
-3@@ -5,9 +5,10 @@* Copyright (C) 2015 Amlogic, Inc. All rights reserved. */ -#include <linux/kernel.h> -#include <linux/module.h> -#include <drm/drmP.h> +#include <linux/export.h> + +#include <drm/drm_print.h> +#include "meson_drv.h" #include "meson_vclk.h" drivers/gpu/drm/meson/meson_vclk.h +4
-0@@ -9,6 +9,10 @@#ifndef __MESON_VCLK_H#define __MESON_VCLK_H +#include <drm/drm_modes.h> + +struct meson_drm ; +enum {MESON_VCLK_TARGET_CVBS =0 , MESON_VCLK_TARGET_HDMI = 1,drivers/gpu/drm/meson/meson_venc.c +5
-5@@ -5,14 +5,14 @@* Copyright (C) 2015 Amlogic, Inc. All rights reserved. */ -#include <linux/kernel.h> -#include <linux/module.h> -#include <drm/drmP.h> +#include <linux/export.h> + +#include <drm/drm_modes.h> +#include "meson_drv.h" +#include "meson_registers.h" #include "meson_venc.h" #include "meson_vpp.h" -#include "meson_vclk.h" -#include "meson_registers.h" /** * DOC: Video Encoder drivers/gpu/drm/meson/meson_venc.h +2
-0@@ -14,6 +14,8 @@#ifndef __MESON_VENC_H#define __MESON_VENC_H +struct drm_display_mode ; +enum {MESON_VENC_MODE_NONE =0 , MESON_VENC_MODE_CVBS_PAL,drivers/gpu/drm/meson/meson_venc_cvbs.c +5
-6@@ -9,19 +9,18 @@* Jasper St. Pierre <[email protected]> */ -#include <linux/kernel.h> -#include <linux/module.h> +#include <linux/export.h> #include <linux/of_graph.h> -#include <drm/drmP.h> #include <drm/drm_atomic_helper.h> +#include <drm/drm_device.h> #include <drm/drm_edid.h> #include <drm/drm_probe_helper.h> +#include <drm/drm_print.h> -#include "meson_venc_cvbs.h" -#include "meson_venc.h" -#include "meson_vclk.h" #include "meson_registers.h" +#include "meson_vclk.h" +#include "meson_venc_cvbs.h" /* HHI VDAC Registers */ #define HHI_VDAC_CNTL0 0x2F4/* 0xbd offset in data sheet */ drivers/gpu/drm/meson/meson_viu.c +2
-5@@ -6,13 +6,10 @@* Copyright (C) 2014 Endless Mobile */ -#include <linux/kernel.h> -#include <linux/module.h> -#include <drm/drmP.h> +#include <linux/export.h> +#include "meson_drv.h" #include "meson_viu.h" -#include "meson_vpp.h" -#include "meson_venc.h" #include "meson_registers.h" /** drivers/gpu/drm/meson/meson_vpp.c +3
-4@@ -6,12 +6,11 @@* Copyright (C) 2014 Endless Mobile */ -#include <linux/kernel.h> -#include <linux/module.h> -#include <drm/drmP.h> +#include <linux/export.h> +#include "meson_drv.h" -#include "meson_vpp.h" #include "meson_registers.h" +#include "meson_vpp.h" /** * DOC: Video Post Processing drivers/gpu/drm/meson/meson_vpp.h +3
-0@@ -9,6 +9,9 @@#ifndef __MESON_VPP_H#define __MESON_VPP_H +struct drm_rect ; +struct meson_drm ; +/* Mux VIU/VPP to ENCI */ #define MESON_VIU_VPP_MUX_ENCI 0x5/* Mux VIU/VPP to ENCP */ include/linux/soc/amlogic/meson-canvas.h +1
-1@@ -20,6 +20,7 @@#define MESON_CANVAS_ENDIAN_SWAP64 0x7#define MESON_CANVAS_ENDIAN_SWAP128 0xf +struct device ;struct meson_canvas ;/** -- 2.20.1
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
PATCH v2 2/19 drm/v3d: drop use of drmP.h
In reply to Sam RavnborgDrop use of the deprecated drmP.h header file. Made v3d_drv.h self-contained with only sufficient include files.
Fixed fallout in remaining files.
--- drivers/gpu/drm/v3d/v3d_debugfs.c | 3 ++- drivers/gpu/drm/v3d/v3d_drv.c | 5 ++++- drivers/gpu/drm/v3d/v3d_drv.h | 13 +++++++++++-- drivers/gpu/drm/v3d/v3d_gem.c | 12 +++++++----- drivers/gpu/drm/v3d/v3d_irq.c | 2 ++ 5 files changed, 26 insertions(+), 9 deletions(-)
drivers/gpu/drm/v3d/v3d_debugfs.c +2 -1
@@ -6,7 +6,8 @@#include <linux/debugfs.h> #include <linux/pm_runtime.h> #include <linux/seq_file.h> -#include <drm/drmP.h> + +#include <drm/drm_debugfs.h> #include "v3d_drv.h" #include "v3d_regs.h"
drivers/gpu/drm/v3d/v3d_drv.c +4 -1
@@ -14,16 +14,19 @@#include <linux/clk.h> #include <linux/device.h> +#include <linux/dma-mapping.h> #include <linux/io.h> #include <linux/module.h> #include <linux/of_platform.h> #include <linux/platform_device.h> #include <linux/pm_runtime.h> #include <linux/reset.h> + +#include <drm/drm_drv.h> #include <drm/drm_fb_cma_helper.h> #include <drm/drm_fb_helper.h> +#include <uapi/drm/v3d_drm.h> -#include "uapi/drm/v3d_drm.h" #include "v3d_drv.h" #include "v3d_regs.h"
drivers/gpu/drm/v3d/v3d_drv.h +11 -2
@@ -1,14 +1,23 @@// SPDX-License-Identifier: GPL-2.0+ /* Copyright (C) 2015-2018 Broadcom */ -#include <linux/mm_types.h> -#include <drm/drmP.h> +#include <linux/delay.h> +#include <linux/mutex.h> +#include <linux/spinlock_types.h> +#include <linux/workqueue.h> +#include <drm/drm_encoder.h> #include <drm/drm_gem.h> #include <drm/drm_gem_shmem_helper.h> #include <drm/gpu_scheduler.h> +#include "uapi/drm/v3d_drm.h" +struct clk ; +struct device ; +struct platform_device ; +struct reset_control ; +#define GMP_GRANULARITY (128 * 1024)/* Enum for each of the V3D queues. */
drivers/gpu/drm/v3d/v3d_gem.c +7 -5
@@ -1,17 +1,19 @@// SPDX-License-Identifier: GPL-2.0+ /* Copyright (C) 2014-2018 Broadcom */ -#include <drm/drmP.h> -#include <drm/drm_syncobj.h> +#include <linux/device.h> +#include <linux/dma-mapping.h> +#include <linux/io.h> #include <linux/module.h> #include <linux/platform_device.h> #include <linux/pm_runtime.h> #include <linux/reset.h> -#include <linux/device.h> -#include <linux/io.h> #include <linux/sched/signal.h> +#include <linux/uaccess.h> + +#include <drm/drm_syncobj.h> +#include <uapi/drm/v3d_drm.h> -#include "uapi/drm/v3d_drm.h" #include "v3d_drv.h" #include "v3d_regs.h" #include "v3d_trace.h"
drivers/gpu/drm/v3d/v3d_irq.c +2 -0
@@ -13,6 +13,8 @@* current job can make progress. */ +#include <linux/platform_device.h> +#include "v3d_drv.h" #include "v3d_regs.h" #include "v3d_trace.h"
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v2 02/19] drm/v3d: drop use of drmP.h
Quoted 11 lines · Sam Ravnborg
Drop use of the deprecated
drmP.hheader file. Madev3d_drv.hself-contained with only sufficient include files.
Fixed fallout in remaining files.Signed-off-by Sam Ravnborg <[email protected]>Acked-by Emil Velikov <[email protected]>Cc Eric Anholt <[email protected]>Cc David Airlie <[email protected]>Cc Daniel Vetter <[email protected]>
Quoted 122 lines
--- drivers/gpu/drm/v3d/v3d_debugfs.c | 3 ++- drivers/gpu/drm/v3d/v3d_drv.c | 5 ++++- drivers/gpu/drm/v3d/v3d_drv.h | 13 +++++++++++-- drivers/gpu/drm/v3d/v3d_gem.c | 12 +++++++----- drivers/gpu/drm/v3d/v3d_irq.c | 2 ++ 5 files changed, 26 insertions(+), 9 deletions(-)drivers/gpu/drm/v3d/v3d_debugfs.c +2
-1@@ -6,7 +6,8 @@#include <linux/debugfs.h> #include <linux/pm_runtime.h> #include <linux/seq_file.h> -#include <drm/drmP.h> + +#include <drm/drm_debugfs.h> #include "v3d_drv.h" #include "v3d_regs.h" drivers/gpu/drm/v3d/v3d_drv.c +4
-1@@ -14,16 +14,19 @@#include <linux/clk.h> #include <linux/device.h> +#include <linux/dma-mapping.h> #include <linux/io.h> #include <linux/module.h> #include <linux/of_platform.h> #include <linux/platform_device.h> #include <linux/pm_runtime.h> #include <linux/reset.h> + +#include <drm/drm_drv.h> #include <drm/drm_fb_cma_helper.h> #include <drm/drm_fb_helper.h> +#include <uapi/drm/v3d_drm.h> -#include "uapi/drm/v3d_drm.h" #include "v3d_drv.h" #include "v3d_regs.h" drivers/gpu/drm/v3d/v3d_drv.h +11
-2@@ -1,14 +1,23 @@// SPDX-License-Identifier: GPL-2.0+ /* Copyright (C) 2015-2018 Broadcom */ -#include <linux/mm_types.h> -#include <drm/drmP.h> +#include <linux/delay.h> +#include <linux/mutex.h> +#include <linux/spinlock_types.h> +#include <linux/workqueue.h> +#include <drm/drm_encoder.h> #include <drm/drm_gem.h> #include <drm/drm_gem_shmem_helper.h> #include <drm/gpu_scheduler.h> +#include "uapi/drm/v3d_drm.h" +struct clk ; +struct device ; +struct platform_device ; +struct reset_control ; +#define GMP_GRANULARITY (128 * 1024)/* Enum for each of the V3D queues. */ drivers/gpu/drm/v3d/v3d_gem.c +7
-5@@ -1,17 +1,19 @@// SPDX-License-Identifier: GPL-2.0+ /* Copyright (C) 2014-2018 Broadcom */ -#include <drm/drmP.h> -#include <drm/drm_syncobj.h> +#include <linux/device.h> +#include <linux/dma-mapping.h> +#include <linux/io.h> #include <linux/module.h> #include <linux/platform_device.h> #include <linux/pm_runtime.h> #include <linux/reset.h> -#include <linux/device.h> -#include <linux/io.h> #include <linux/sched/signal.h> +#include <linux/uaccess.h> + +#include <drm/drm_syncobj.h> +#include <uapi/drm/v3d_drm.h> -#include "uapi/drm/v3d_drm.h" #include "v3d_drv.h" #include "v3d_regs.h" #include "v3d_trace.h" drivers/gpu/drm/v3d/v3d_irq.c +2
-1@@ -13,6 +13,8 @@* current job can make progress. */ +#include <linux/platform_device.h> +#include "v3d_drv.h" #include "v3d_regs.h" #include "v3d_trace.h" --2.20.1
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
PATCH v2 3/19 drm/pl111: drop use of drmP.h
In reply to Sam RavnborgDrop use of the deprecated drmP.h header. Sort includes in blocks while touching the files.
--- drivers/gpu/drm/pl111/pl111_debugfs.c | 4 +++- drivers/gpu/drm/pl111/pl111_display.c | 6 ++++-- drivers/gpu/drm/pl111/pl111_drm.h | 11 ++++++----- drivers/gpu/drm/pl111/pl111_drv.c | 9 +++++---- drivers/gpu/drm/pl111/pl111_nomadik.h | 3 ++- drivers/gpu/drm/pl111/pl111_versatile.c | 9 +++++---- drivers/gpu/drm/pl111/pl111_versatile.h | 3 +++ 7 files changed, 28 insertions(+), 17 deletions(-)
drivers/gpu/drm/pl111/pl111_debugfs.c +3 -1
@@ -8,8 +8,10 @@#include <linux/amba/clcd-regs.h> #include <linux/seq_file.h> +#include <drm/drm_debugfs.h> -#include <drm/drmP.h> +#include <drm/drm_file.h> +#include "pl111_drm.h" #define REGDEF (reg) { reg, #reg }
drivers/gpu/drm/pl111/pl111_display.c +4 -2
@@ -11,14 +11,16 @@#include <linux/amba/clcd-regs.h> #include <linux/clk.h> +#include <linux/delay.h> #include <linux/version.h> #include <linux/dma-buf.h> #include <linux/of_graph.h> -#include <drm/drmP.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_fb_cma_helper.h> +#include <drm/drm_vblank.h> #include "pl111_drm.h"
drivers/gpu/drm/pl111/pl111_drm.h +6 -5
@@ -13,14 +13,15 @@#ifndef _PL111_DRM_H_#define _PL111_DRM_H_ -#include <drm/drm_gem.h> -#include <drm/drm_simple_kms_helper.h> +#include <linux/clk-provider.h> +#include <linux/interrupt.h> + +#include <drm/drm_bridge.h> #include <drm/drm_connector.h> #include <drm/drm_encoder.h> +#include <drm/drm_gem.h> #include <drm/drm_panel.h> -#include <drm/drm_bridge.h> -#include <linux/clk-provider.h> -#include <linux/interrupt.h> +#include <drm/drm_simple_kms_helper.h> #define CLCD_IRQ_NEXTBASE_UPDATE BIT(2)
drivers/gpu/drm/pl111/pl111_drv.c +5 -4
@@ -48,18 +48,18 @@#include <linux/amba/bus.h> #include <linux/amba/clcd-regs.h> -#include <linux/version.h> -#include <linux/shmem_fs.h> #include <linux/dma-buf.h> #include <linux/module.h> -#include <linux/slab.h> #include <linux/of.h> #include <linux/of_graph.h> #include <linux/of_reserved_mem.h> +#include <linux/shmem_fs.h> +#include <linux/slab.h> +#include <linux/version.h> -#include <drm/drmP.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_bridge.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>
@@ -67,6 +67,7 @@#include <drm/drm_of.h> #include <drm/drm_panel.h> #include <drm/drm_probe_helper.h> +#include <drm/drm_vblank.h> #include "pl111_drm.h" #include "pl111_versatile.h"
drivers/gpu/drm/pl111/pl111_nomadik.h +2 -1
@@ -1,10 +1,11 @@// SPDX-License-Identifier: GPL-2.0+ -#include <linux/device.h> #ifndef PL111_NOMADIK_H #define PL111_NOMADIK_H #endif +struct device ; +#ifdef CONFIG_ARCH_NOMADIK void pl111_nomadik_init (struct device *dev);
drivers/gpu/drm/pl111/pl111_versatile.c +5 -4
@@ -1,13 +1,14 @@// SPDX-License-Identifier: GPL-2.0-only +#include <linux/amba/clcd-regs.h> +#include <linux/bitops.h> #include <linux/device.h> +#include <linux/mfd/syscon.h> +#include <linux/module.h> #include <linux/of.h> #include <linux/of_platform.h> #include <linux/regmap.h> -#include <linux/mfd/syscon.h> -#include <linux/bitops.h> -#include <linux/module.h> -#include <drm/drmP.h> +#include "pl111_versatile.h" #include "pl111_vexpress.h" #include "pl111_drm.h"
drivers/gpu/drm/pl111/pl111_versatile.h +3 -0
@@ -4,6 +4,9 @@#ifndef PL111_VERSATILE_H #define PL111_VERSATILE_H +struct device ; +struct pl111_drm_dev_private ; +int pl111_versatile_init (struct device *dev,struct pl111_drm_dev_private *priv);#endif
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v2 03/19] drm/pl111: drop use of drmP.h
Quoted 9 lines · Sam Ravnborg
Drop use of the deprecated
drmP.hheader. Sort includes in blocks while touching the files.Signed-off-by Sam Ravnborg <[email protected]>Acked-by Emil Velikov <[email protected]>Cc Eric Anholt <[email protected]>Cc David Airlie <[email protected]>Cc Daniel Vetter <[email protected]>
Quoted 166 lines
--- drivers/gpu/drm/pl111/pl111_debugfs.c | 4 +++- drivers/gpu/drm/pl111/pl111_display.c | 6 ++++-- drivers/gpu/drm/pl111/pl111_drm.h | 11 ++++++----- drivers/gpu/drm/pl111/pl111_drv.c | 9 +++++---- drivers/gpu/drm/pl111/pl111_nomadik.h | 3 ++- drivers/gpu/drm/pl111/pl111_versatile.c | 9 +++++---- drivers/gpu/drm/pl111/pl111_versatile.h | 3 +++ 7 files changed, 28 insertions(+), 17 deletions(-)drivers/gpu/drm/pl111/pl111_debugfs.c +3
-1@@ -8,8 +8,10 @@#include <linux/amba/clcd-regs.h> #include <linux/seq_file.h> +#include <drm/drm_debugfs.h> -#include <drm/drmP.h> +#include <drm/drm_file.h> +#include "pl111_drm.h" #define REGDEF (reg) { reg, #reg }drivers/gpu/drm/pl111/pl111_display.c +4
-2@@ -11,14 +11,16 @@#include <linux/amba/clcd-regs.h> #include <linux/clk.h> +#include <linux/delay.h> #include <linux/version.h> #include <linux/dma-buf.h> #include <linux/of_graph.h> -#include <drm/drmP.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_fb_cma_helper.h> +#include <drm/drm_vblank.h> #include "pl111_drm.h" drivers/gpu/drm/pl111/pl111_drm.h +6
-5@@ -13,14 +13,15 @@#ifndef _PL111_DRM_H_#define _PL111_DRM_H_ -#include <drm/drm_gem.h> -#include <drm/drm_simple_kms_helper.h> +#include <linux/clk-provider.h> +#include <linux/interrupt.h> + +#include <drm/drm_bridge.h> #include <drm/drm_connector.h> #include <drm/drm_encoder.h> +#include <drm/drm_gem.h> #include <drm/drm_panel.h> -#include <drm/drm_bridge.h> -#include <linux/clk-provider.h> -#include <linux/interrupt.h> +#include <drm/drm_simple_kms_helper.h> #define CLCD_IRQ_NEXTBASE_UPDATE BIT(2)drivers/gpu/drm/pl111/pl111_drv.c +5
-4@@ -48,18 +48,18 @@#include <linux/amba/bus.h> #include <linux/amba/clcd-regs.h> -#include <linux/version.h> -#include <linux/shmem_fs.h> #include <linux/dma-buf.h> #include <linux/module.h> -#include <linux/slab.h> #include <linux/of.h> #include <linux/of_graph.h> #include <linux/of_reserved_mem.h> +#include <linux/shmem_fs.h> +#include <linux/slab.h> +#include <linux/version.h> -#include <drm/drmP.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_bridge.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> @@ -67,6 +67,7 @@#include <drm/drm_of.h> #include <drm/drm_panel.h> #include <drm/drm_probe_helper.h> +#include <drm/drm_vblank.h> #include "pl111_drm.h" #include "pl111_versatile.h" drivers/gpu/drm/pl111/pl111_nomadik.h +2
-1@@ -1,10 +1,11 @@// SPDX-License-Identifier: GPL-2.0+ -#include <linux/device.h> #ifndef PL111_NOMADIK_H #define PL111_NOMADIK_H #endif +struct device ; +#ifdef CONFIG_ARCH_NOMADIK void pl111_nomadik_init (struct device *dev);drivers/gpu/drm/pl111/pl111_versatile.c +5
-4@@ -1,13 +1,14 @@// SPDX-License-Identifier: GPL-2.0-only +#include <linux/amba/clcd-regs.h> +#include <linux/bitops.h> #include <linux/device.h> +#include <linux/mfd/syscon.h> +#include <linux/module.h> #include <linux/of.h> #include <linux/of_platform.h> #include <linux/regmap.h> -#include <linux/mfd/syscon.h> -#include <linux/bitops.h> -#include <linux/module.h> -#include <drm/drmP.h> +#include "pl111_versatile.h" #include "pl111_vexpress.h" #include "pl111_drm.h" drivers/gpu/drm/pl111/pl111_versatile.h +3
-1@@ -4,6 +4,9 @@#ifndef PL111_VERSATILE_H #define PL111_VERSATILE_H +struct device ; +struct pl111_drm_dev_private ; +int pl111_versatile_init (struct device *dev,struct pl111_drm_dev_private *priv);#endif --2.20.1
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
PATCH v2 5/19 drm/sun4i: drop use of drmP.h
In reply to Sam RavnborgDrop use of the deprecated drmP.h header file.
While touching the list of include file, use the typical order of the blocks:
\#include <linux/*>
\#include <video/*>
\#include <drm/*>
\#include ""
Within each block, sort the files.
Include necessary files to fix build after the drmP.h removal.
--- drivers/gpu/drm/sun4i/sun4i_backend.c | 16 +++++++++------- drivers/gpu/drm/sun4i/sun4i_crtc.c | 13 +++++++------ drivers/gpu/drm/sun4i/sun4i_drv.c | 5 ++++- drivers/gpu/drm/sun4i/sun4i_framebuffer.c | 1 - drivers/gpu/drm/sun4i/sun4i_frontend.c | 10 +++++++--- drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 17 +++++++++-------- drivers/gpu/drm/sun4i/sun4i_layer.c | 3 +-- drivers/gpu/drm/sun4i/sun4i_lvds.c | 2 +- drivers/gpu/drm/sun4i/sun4i_rgb.c | 2 +- drivers/gpu/drm/sun4i/sun4i_tcon.c | 20 +++++++++++--------- drivers/gpu/drm/sun4i/sun4i_tv.c | 4 +++- drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c | 9 +++++---- drivers/gpu/drm/sun4i/sun8i_csc.c | 2 +- drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c | 3 +-- drivers/gpu/drm/sun4i/sun8i_mixer.c | 14 +++++++------- drivers/gpu/drm/sun4i/sun8i_tcon_top.c | 6 +++--- drivers/gpu/drm/sun4i/sun8i_ui_layer.c | 2 +- drivers/gpu/drm/sun4i/sun8i_vi_layer.c | 1 - 18 files changed, 71 insertions(+), 59 deletions(-)
drivers/gpu/drm/sun4i/sun4i_backend.c +9 -7
@@ -6,21 +6,23 @@* Maxime Ripard <[email protected]> */ -#include <drm/drmP.h> +#include <linux/component.h> +#include <linux/list.h> +#include <linux/module.h> +#include <linux/of_device.h> +#include <linux/of_graph.h> +#include <linux/platform_device.h> +#include <linux/reset.h> +#include <drm/drm_atomic.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_crtc.h> #include <drm/drm_fb_cma_helper.h> +#include <drm/drm_fourcc.h> #include <drm/drm_gem_cma_helper.h> #include <drm/drm_plane_helper.h> #include <drm/drm_probe_helper.h> -#include <linux/component.h> -#include <linux/list.h> -#include <linux/of_device.h> -#include <linux/of_graph.h> -#include <linux/reset.h> -#include "sun4i_backend.h" #include "sun4i_drv.h" #include "sun4i_frontend.h"
drivers/gpu/drm/sun4i/sun4i_crtc.c +7 -6
@@ -6,12 +6,6 @@* Maxime Ripard <[email protected]> */ -#include <drm/drmP.h> -#include <drm/drm_atomic_helper.h> -#include <drm/drm_crtc.h> -#include <drm/drm_modes.h> -#include <drm/drm_probe_helper.h> -#include <linux/clk-provider.h> #include <linux/ioport.h> #include <linux/of_address.h>
@@ -21,6 +15,13 @@#include <video/videomode.h> +#include <drm/drm_atomic_helper.h> +#include <drm/drm_crtc.h> +#include <drm/drm_modes.h> +#include <drm/drm_print.h> +#include <drm/drm_probe_helper.h> +#include <drm/drm_vblank.h> +#include "sun4i_backend.h" #include "sun4i_crtc.h" #include "sun4i_drv.h"
drivers/gpu/drm/sun4i/sun4i_drv.c +4 -1
@@ -8,16 +8,19 @@#include <linux/component.h> #include <linux/kfifo.h> +#include <linux/module.h> #include <linux/of_graph.h> #include <linux/of_reserved_mem.h> +#include <linux/platform_device.h> -#include <drm/drmP.h> #include <drm/drm_atomic_helper.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_of.h> #include <drm/drm_probe_helper.h> +#include <drm/drm_vblank.h> #include "sun4i_drv.h" #include "sun4i_frontend.h"
drivers/gpu/drm/sun4i/sun4i_framebuffer.c +0 -1
@@ -9,7 +9,6 @@#include <drm/drm_atomic.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_gem_framebuffer_helper.h> -#include <drm/drmP.h> #include "sun4i_drv.h" #include "sun4i_framebuffer.h"
drivers/gpu/drm/sun4i/sun4i_frontend.c +7 -3
@@ -3,9 +3,6 @@* Copyright (C) 2017 Free Electrons * Maxime Ripard <[email protected]> */ -#include <drm/drmP.h> -#include <drm/drm_gem_cma_helper.h> -#include <drm/drm_fb_cma_helper.h> #include <linux/clk.h> #include <linux/component.h>
@@ -16,6 +13,13 @@#include <linux/regmap.h> #include <linux/reset.h> +#include <drm/drm_device.h> +#include <drm/drm_fb_cma_helper.h> +#include <drm/drm_fourcc.h> +#include <drm/drm_framebuffer.h> +#include <drm/drm_gem_cma_helper.h> +#include <drm/drm_plane.h> +#include "sun4i_drv.h" #include "sun4i_frontend.h"
drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c +9 -8
@@ -5,23 +5,24 @@* Maxime Ripard <[email protected]> */ -#include <drm/drmP.h> -#include <drm/drm_atomic_helper.h> -#include <drm/drm_probe_helper.h> -#include <drm/drm_edid.h> -#include <drm/drm_encoder.h> -#include <drm/drm_of.h> -#include <drm/drm_panel.h> -#include <linux/clk.h> #include <linux/component.h> #include <linux/iopoll.h> +#include <linux/module.h> #include <linux/of_device.h> #include <linux/platform_device.h> #include <linux/pm_runtime.h> #include <linux/regmap.h> #include <linux/reset.h> +#include <drm/drm_atomic_helper.h> +#include <drm/drm_edid.h> +#include <drm/drm_encoder.h> +#include <drm/drm_of.h> +#include <drm/drm_panel.h> +#include <drm/drm_print.h> +#include <drm/drm_probe_helper.h> +#include "sun4i_backend.h" #include "sun4i_crtc.h" #include "sun4i_drv.h"
drivers/gpu/drm/sun4i/sun4i_layer.c +1 -2
@@ -7,9 +7,8 @@*/ #include <drm/drm_atomic_helper.h> -#include <drm/drm_plane_helper.h> #include <drm/drm_gem_framebuffer_helper.h> -#include <drm/drmP.h> +#include <drm/drm_plane_helper.h> #include "sun4i_backend.h" #include "sun4i_frontend.h"
drivers/gpu/drm/sun4i/sun4i_lvds.c +1 -1
@@ -6,10 +6,10 @@#include <linux/clk.h> -#include <drm/drmP.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_of.h> #include <drm/drm_panel.h> +#include <drm/drm_print.h> #include <drm/drm_probe_helper.h> #include "sun4i_crtc.h"
drivers/gpu/drm/sun4i/sun4i_rgb.c +1 -1
@@ -8,10 +8,10 @@#include <linux/clk.h> -#include <drm/drmP.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_of.h> #include <drm/drm_panel.h> +#include <drm/drm_print.h> #include <drm/drm_probe_helper.h> #include "sun4i_crtc.h"
drivers/gpu/drm/sun4i/sun4i_tcon.c +11 -9
@@ -6,7 +6,15 @@* Maxime Ripard <[email protected]> */ -#include <drm/drmP.h> +#include <linux/component.h> +#include <linux/ioport.h> +#include <linux/module.h> +#include <linux/of_address.h> +#include <linux/of_device.h> +#include <linux/of_irq.h> +#include <linux/regmap.h> +#include <linux/reset.h> +#include <drm/drm_atomic_helper.h> #include <drm/drm_connector.h> #include <drm/drm_crtc.h>
@@ -14,18 +22,12 @@#include <drm/drm_modes.h> #include <drm/drm_of.h> #include <drm/drm_panel.h> +#include <drm/drm_print.h> #include <drm/drm_probe_helper.h> +#include <drm/drm_vblank.h> #include <uapi/drm/drm_mode.h> -#include <linux/component.h> -#include <linux/ioport.h> -#include <linux/of_address.h> -#include <linux/of_device.h> -#include <linux/of_irq.h> -#include <linux/regmap.h> -#include <linux/reset.h> -#include "sun4i_crtc.h" #include "sun4i_dotclock.h" #include "sun4i_drv.h"
drivers/gpu/drm/sun4i/sun4i_tv.c +3 -1
@@ -8,14 +8,16 @@#include <linux/clk.h> #include <linux/component.h> +#include <linux/module.h> #include <linux/of_address.h> +#include <linux/platform_device.h> #include <linux/regmap.h> #include <linux/reset.h> -#include <drm/drmP.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_of.h> #include <drm/drm_panel.h> +#include <drm/drm_print.h> #include <drm/drm_probe_helper.h> #include "sun4i_crtc.h"
drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c +5 -4
@@ -9,19 +9,20 @@#include <linux/clk.h> #include <linux/component.h> #include <linux/crc-ccitt.h> +#include <linux/module.h> #include <linux/of_address.h> +#include <linux/phy/phy-mipi-dphy.h> +#include <linux/phy/phy.h> +#include <linux/platform_device.h> #include <linux/pm_runtime.h> #include <linux/regmap.h> #include <linux/reset.h> #include <linux/slab.h> -#include <linux/phy/phy.h> -#include <linux/phy/phy-mipi-dphy.h> - -#include <drm/drmP.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_mipi_dsi.h> #include <drm/drm_panel.h> +#include <drm/drm_print.h> #include <drm/drm_probe_helper.h> #include "sun4i_crtc.h"
drivers/gpu/drm/sun4i/sun8i_csc.c +1 -1
@@ -3,7 +3,7 @@* Copyright (C) Jernej Skrabec <[email protected]> */ -#include <drm/drmP.h> +#include <drm/drm_print.h> #include "sun8i_csc.h" #include "sun8i_mixer.h"
drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c +1 -2
@@ -8,9 +8,8 @@#include <linux/of_device.h> #include <linux/platform_device.h> -#include <drm/drm_of.h> -#include <drm/drmP.h> #include <drm/drm_crtc_helper.h> +#include <drm/drm_of.h> #include "sun8i_dw_hdmi.h" #include "sun8i_tcon_top.h"
drivers/gpu/drm/sun4i/sun8i_mixer.c +7 -7
@@ -7,7 +7,13 @@* Copyright (C) 2015 NextThing Co */ -#include <drm/drmP.h> +#include <linux/component.h> +#include <linux/dma-mapping.h> +#include <linux/module.h> +#include <linux/of_device.h> +#include <linux/of_graph.h> +#include <linux/reset.h> +#include <drm/drm_atomic_helper.h> #include <drm/drm_crtc.h> #include <drm/drm_fb_cma_helper.h>
@@ -15,12 +21,6 @@#include <drm/drm_plane_helper.h> #include <drm/drm_probe_helper.h> -#include <linux/component.h> -#include <linux/dma-mapping.h> -#include <linux/of_device.h> -#include <linux/of_graph.h> -#include <linux/reset.h> -#include "sun4i_drv.h" #include "sun8i_mixer.h" #include "sun8i_ui_layer.h"
drivers/gpu/drm/sun4i/sun8i_tcon_top.c +3 -3
@@ -1,18 +1,18 @@// SPDX-License-Identifier: GPL-2.0+ /* Copyright (c) 2018 Jernej Skrabec <[email protected]> */ -#include <drm/drmP.h> - -#include <dt-bindings/clock/sun8i-tcon-top.h> #include <linux/bitfield.h> #include <linux/component.h> #include <linux/device.h> +#include <linux/io.h> #include <linux/module.h> #include <linux/of_device.h> #include <linux/of_graph.h> #include <linux/platform_device.h> +#include <dt-bindings/clock/sun8i-tcon-top.h> +#include "sun8i_tcon_top.h" struct sun8i_tcon_top_quirks {
drivers/gpu/drm/sun4i/sun8i_ui_layer.c +1 -1
@@ -13,11 +13,11 @@#include <drm/drm_atomic_helper.h> #include <drm/drm_crtc.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> #include <drm/drm_probe_helper.h> -#include <drm/drmP.h> #include "sun8i_ui_layer.h" #include "sun8i_mixer.h"
drivers/gpu/drm/sun4i/sun8i_vi_layer.c +0 -1
@@ -11,7 +11,6 @@#include <drm/drm_gem_framebuffer_helper.h> #include <drm/drm_plane_helper.h> #include <drm/drm_probe_helper.h> -#include <drm/drmP.h> #include "sun8i_vi_layer.h" #include "sun8i_mixer.h"
Signature · 7 lines
2.20.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH v2 05/19] drm/sun4i: drop use of drmP.h
Quoted 15 lines · Sam Ravnborg
Drop use of the deprecated
drmP.hheader file.While touching the list of include file, use the typical order of the blocks:
\#include <linux/*>\#include <video/*>
\#include <drm/*>
\#include ""
Within each block, sort the files.
Include necessary files to fix build after thedrmP.hremoval.
Quoted 7 lines
Signed-off-by Sam Ravnborg <[email protected]>Acked-by Emil Velikov <[email protected]>Cc Maxime Ripard <[email protected]>Cc David Airlie <[email protected]>Cc Daniel Vetter <[email protected]>Cc Chen-Yu Tsai <[email protected]>
Maxime
--
Maxime Ripard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v2 7/19 drm/r128: drop use of drmP.h
In reply to Sam RavnborgReplace use of the deprecated drmP.h header file with relevant includes.
--- drivers/gpu/drm/r128/r128_ioc32.c | 3 ++- drivers/gpu/drm/r128/r128_irq.c | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-)
drivers/gpu/drm/r128/r128_ioc32.c +2 -1
@@ -29,10 +29,11 @@* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS * IN THE SOFTWARE. */ +#include <linux/compat.h> -#include <drm/drmP.h> #include <drm/r128_drm.h> +#include "r128_drv.h" typedef struct drm_r128_init32 {
drivers/gpu/drm/r128/r128_irq.c +4 -1
@@ -30,8 +30,11 @@* Eric Anholt <[email protected]> */ -#include <drm/drmP.h> +#include <drm/drm_device.h> +#include <drm/drm_print.h> +#include <drm/drm_vblank.h> #include <drm/r128_drm.h> +#include "r128_drv.h" u32 r128_get_vblank_counter (struct drm_device *dev,unsigned int pipe)
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v2 07/19] drm/r128: drop use of drmP.h
Quoted 8 lines · Sam Ravnborg
Replace use of the deprecated
drmP.hheader file with relevant includes.Signed-off-by Sam Ravnborg <[email protected]>Acked-by Emil Velikov <[email protected]>Cc David Airlie <[email protected]>Cc Daniel Vetter <[email protected]>
Quoted 42 lines
--- drivers/gpu/drm/r128/r128_ioc32.c | 3 ++- drivers/gpu/drm/r128/r128_irq.c | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-)drivers/gpu/drm/r128/r128_ioc32.c +2
-1@@ -29,10 +29,11 @@* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS * IN THE SOFTWARE. */ +#include <linux/compat.h> -#include <drm/drmP.h> #include <drm/r128_drm.h> +#include "r128_drv.h" typedef struct drm_r128_init32 {drivers/gpu/drm/r128/r128_irq.c +4
-2@@ -30,8 +30,11 @@* Eric Anholt <[email protected]> */ -#include <drm/drmP.h> +#include <drm/drm_device.h> +#include <drm/drm_print.h> +#include <drm/drm_vblank.h> #include <drm/r128_drm.h> +#include "r128_drv.h" u32 r128_get_vblank_counter (struct drm_device *dev,unsigned int pipe) --2.20.1
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
PATCH v2 9/19 drm/omapdrm: drop use of drmP.h
In reply to Sam RavnborgDrop use of the deprecated header drmP.h.
Rearranged list of include files to match rest of
DRM too.
The drmP.h file was deleted from the header file, and the necessary includes was added to the .c files to fix build.
--- drivers/gpu/drm/omapdrm/omap_crtc.c | 4 +++- drivers/gpu/drm/omapdrm/omap_debugfs.c | 2 ++ drivers/gpu/drm/omapdrm/omap_drv.c | 10 ++++++++-- drivers/gpu/drm/omapdrm/omap_drv.h | 5 ++--- drivers/gpu/drm/omapdrm/omap_fb.c | 4 ++-- drivers/gpu/drm/omapdrm/omap_fbdev.c | 2 ++ drivers/gpu/drm/omapdrm/omap_gem.c | 2 ++ drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c | 3 +++ drivers/gpu/drm/omapdrm/omap_irq.c | 2 ++ 9 files changed, 26 insertions(+), 8 deletions(-)
drivers/gpu/drm/omapdrm/omap_crtc.c +3 -1
@@ -15,12 +15,14 @@* this program. If not, see <http://www.gnu.org/licenses/>. */ +#include <linux/math64.h> +#include <drm/drm_atomic.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_crtc.h> #include <drm/drm_mode.h> #include <drm/drm_plane_helper.h> -#include <linux/math64.h> +#include <drm/drm_vblank.h> #include "omap_drv.h"
drivers/gpu/drm/omapdrm/omap_debugfs.c +2 -0
@@ -18,6 +18,8 @@#include <linux/seq_file.h> #include <drm/drm_crtc.h> +#include <drm/drm_debugfs.h> +#include <drm/drm_file.h> #include <drm/drm_fb_helper.h> #include "omap_drv.h"
drivers/gpu/drm/omapdrm/omap_drv.c +8 -2
@@ -15,15 +15,21 @@* this program. If not, see <http://www.gnu.org/licenses/>. */ -#include <linux/of.h> +#include <linux/dma-mapping.h> +#include <linux/platform_device.h> #include <linux/sort.h> #include <linux/sys_soc.h> #include <drm/drm_atomic.h> #include <drm/drm_atomic_helper.h> +#include <drm/drm_drv.h> #include <drm/drm_fb_helper.h> -#include <drm/drm_probe_helper.h> +#include <drm/drm_file.h> +#include <drm/drm_ioctl.h> #include <drm/drm_panel.h> +#include <drm/drm_prime.h> +#include <drm/drm_probe_helper.h> +#include <drm/drm_vblank.h> #include "omap_dmm_tiler.h" #include "omap_drv.h"
drivers/gpu/drm/omapdrm/omap_drv.h +2 -3
@@ -22,12 +22,11 @@#include <linux/types.h> #include <linux/workqueue.h> -#include <drm/drmP.h> +#include "dss/omapdss.h" +#include <drm/drm_gem.h> #include <drm/omap_drm.h> -#include "dss/omapdss.h" -#include "omap_connector.h" #include "omap_crtc.h" #include "omap_encoder.h"
drivers/gpu/drm/omapdrm/omap_fb.c +2 -2
@@ -15,10 +15,10 @@* this program. If not, see <http://www.gnu.org/licenses/>. */ -#include <linux/seq_file.h> +#include <linux/dma-mapping.h> -#include <drm/drm_crtc.h> #include <drm/drm_modeset_helper.h> +#include <drm/drm_fourcc.h> #include <drm/drm_gem_framebuffer_helper.h> #include "omap_dmm_tiler.h"
drivers/gpu/drm/omapdrm/omap_fbdev.c +2 -0
@@ -18,6 +18,8 @@#include <drm/drm_crtc.h> #include <drm/drm_util.h> #include <drm/drm_fb_helper.h> +#include <drm/drm_file.h> +#include <drm/drm_fourcc.h> #include "omap_drv.h"
drivers/gpu/drm/omapdrm/omap_gem.c +2 -0
@@ -15,11 +15,13 @@* this program. If not, see <http://www.gnu.org/licenses/>. */ +#include <linux/dma-mapping.h> #include <linux/seq_file.h> #include <linux/shmem_fs.h> #include <linux/spinlock.h> #include <linux/pfn_t.h> +#include <drm/drm_prime.h> #include <drm/drm_vma_manager.h> #include "omap_drv.h"
drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c +3 -0
@@ -16,6 +16,9 @@*/ #include <linux/dma-buf.h> +#include <linux/highmem.h> + +#include <drm/drm_prime.h> #include "omap_drv.h"
drivers/gpu/drm/omapdrm/omap_irq.c +2 -0
@@ -15,6 +15,8 @@* this program. If not, see <http://www.gnu.org/licenses/>. */ +#include <drm/drm_vblank.h> +#include "omap_drv.h" struct omap_irq_wait {
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v2 10/19 drm/selftests: drop use of drmP.h
In reply to Sam RavnborgDrop the single user of drmP.h - replace it with relevant includes.
--- drivers/gpu/drm/selftests/test-drm_framebuffer.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/gpu/drm/selftests/test-drm_framebuffer.c +6 -1
@@ -3,7 +3,12 @@* Test cases for the drm_framebuffer functions */ -#include <drm/drmP.h> +#include <linux/kernel.h> + +#include <drm/drm_device.h> +#include <drm/drm_mode.h> +#include <drm/drm_fourcc.h> +#include "../drm_crtc_internal.h" #include "test-drm_modeset_common.h"
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v2 10/19] drm/selftests: drop use of drmP.h
Quoted 9 lines · Sam Ravnborg
Drop the single user of
drmP.h- replace it with relevant includes.Signed-off-by Sam Ravnborg <[email protected]>Acked-by Emil Velikov <[email protected]>Cc David Airlie <[email protected]>Cc Daniel Vetter <[email protected]>Cc Alexandru-Cosmin Gheorghe <[email protected]>Cc Maarten Lankhorst <[email protected]>
Quoted 25 lines
--- drivers/gpu/drm/selftests/test-drm_framebuffer.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)drivers/gpu/drm/selftests/test-drm_framebuffer.c +6
-2@@ -3,7 +3,12 @@* Test cases for the drm_framebuffer functions */ -#include <drm/drmP.h> +#include <linux/kernel.h> + +#include <drm/drm_device.h> +#include <drm/drm_mode.h> +#include <drm/drm_fourcc.h> +#include "../drm_crtc_internal.h" #include "test-drm_modeset_common.h" --2.20.1
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
PATCH v2 11/19 drm/tdfx: drop use of drmP.h
In reply to Sam RavnborgReplace drmP.h include with necessary include files.
--- drivers/gpu/drm/tdfx/tdfx_drv.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
drivers/gpu/drm/tdfx/tdfx_drv.c +7 -4
@@ -32,11 +32,14 @@#include <linux/module.h> -#include <drm/drmP.h> -#include "tdfx_drv.h" - -#include <drm/drm_pciids.h> +#include <drm/drm_drv.h> +#include <drm/drm_file.h> +#include <drm/drm_ioctl.h> #include <drm/drm_legacy.h> +#include <drm/drm_pci.h> +#include <drm/drm_pciids.h> + +#include "tdfx_drv.h" static struct pci_device_id pciidlist[] = { tdfx_PCI_IDS
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v2 13/19 drm/i810: drop use of drmP.h
In reply to Sam RavnborgDrop use of the deprecated drmP.h header. Replace with necessary includes.
--- 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(-)
drivers/gpu/drm/i810/i810_dma.c +12 -5
@@ -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
drivers/gpu/drm/i810/i810_drv.c +5 -3
@@ -30,13 +30,15 @@* Gareth Hughes <[email protected]> */ +#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
drivers/gpu/drm/i810/i810_drv.h +2 -0
@@ -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: */
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v2 14/19 drm/tilcdc: drop use of drmP.h
In reply to Sam RavnborgDropped drmP.h and all other header files not used by tilcdc_drv.h. Added the minimal includes and forwards to make the header file self-contained.
Then dropped the remaining uses of drmP.h and fixed all fall-out.
--- drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 18 ++++++++------ drivers/gpu/drm/tilcdc/tilcdc_drv.c | 19 ++++++++++++--- drivers/gpu/drm/tilcdc/tilcdc_drv.h | 31 +++++++++++++----------- drivers/gpu/drm/tilcdc/tilcdc_external.c | 1 + drivers/gpu/drm/tilcdc/tilcdc_panel.c | 11 ++++++--- drivers/gpu/drm/tilcdc/tilcdc_plane.c | 4 +-- drivers/gpu/drm/tilcdc/tilcdc_tfp410.c | 8 +++--- 7 files changed, 57 insertions(+), 35 deletions(-)
drivers/gpu/drm/tilcdc/tilcdc_crtc.c +11 -7
@@ -15,16 +15,20 @@* this program. If not, see <http://www.gnu.org/licenses/>. */ +#include <linux/delay.h> +#include <linux/dma-mapping.h> +#include <linux/of_graph.h> +#include <linux/pm_runtime.h> +#include <drm/drm_atomic.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_crtc.h> -#include <drm/drm_flip_work.h> -#include <drm/drm_plane_helper.h> -#include <linux/workqueue.h> -#include <linux/completion.h> -#include <linux/dma-mapping.h> -#include <linux/of_graph.h> -#include <linux/math64.h> +#include <drm/drm_fb_cma_helper.h> +#include <drm/drm_fourcc.h> +#include <drm/drm_gem_cma_helper.h> +#include <drm/drm_modeset_helper_vtables.h> +#include <drm/drm_print.h> +#include <drm/drm_vblank.h> #include "tilcdc_drv.h" #include "tilcdc_regs.h"
drivers/gpu/drm/tilcdc/tilcdc_drv.c +15 -4
@@ -18,19 +18,30 @@/* LCDC DRM driver, based on da8xx-fb */ #include <linux/component.h> +#include <linux/mod_devicetable.h> +#include <linux/module.h> #include <linux/pinctrl/consumer.h> -#include <linux/suspend.h> -#include <drm/drm_atomic.h> +#include <linux/platform_device.h> +#include <linux/pm_runtime.h> +#include <drm/drm_atomic_helper.h> +#include <drm/drm_debugfs.h> +#include <drm/drm_drv.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_irq.h> +#include <drm/drm_mm.h> #include <drm/drm_probe_helper.h> +#include <drm/drm_vblank.h> +#include "tilcdc_drv.h" +#include "tilcdc_external.h" +#include "tilcdc_panel.h" #include "tilcdc_regs.h" #include "tilcdc_tfp410.h" -#include "tilcdc_panel.h" -#include "tilcdc_external.h" static LIST_HEAD (module_list);
drivers/gpu/drm/tilcdc/tilcdc_drv.h +17 -14
@@ -18,21 +18,24 @@#ifndef __TILCDC_DRV_H__#define __TILCDC_DRV_H__ -#include <linux/clk.h> #include <linux/cpufreq.h> -#include <linux/module.h> -#include <linux/platform_device.h> -#include <linux/pm.h> -#include <linux/pm_runtime.h> -#include <linux/slab.h> -#include <linux/of.h> -#include <linux/of_device.h> -#include <linux/list.h> - -#include <drm/drmP.h> -#include <drm/drm_bridge.h> -#include <drm/drm_fb_cma_helper.h> -#include <drm/drm_gem_cma_helper.h> +#include <linux/irqreturn.h> + +#include <drm/drm_print.h> + +struct clk ; +struct workqueue_struct ; + +struct drm_connector ; +struct drm_connector_helper_funcs ; +struct drm_crtc ; +struct drm_device ; +struct drm_display_mode ; +struct drm_encoder ; +struct drm_framebuffer ; +struct drm_minor ; +struct drm_pending_vblank_event ; +struct drm_plane ;/* Defaulting to pixel clock defined on AM335x */ #define TILCDC_DEFAULT_MAX_PIXELCLOCK 126000
drivers/gpu/drm/tilcdc/tilcdc_external.c +1 -0
@@ -10,6 +10,7 @@#include <linux/component.h> #include <linux/of_graph.h> +#include <drm/drm_atomic_helper.h> #include <drm/drm_of.h>
drivers/gpu/drm/tilcdc/tilcdc_panel.c +7 -4
@@ -15,14 +15,17 @@* this program. If not, see <http://www.gnu.org/licenses/>. */ -#include <linux/pinctrl/pinmux.h> -#include <linux/pinctrl/consumer.h> -#include <linux/backlight.h> #include <linux/gpio/consumer.h> +#include <linux/pinctrl/consumer.h> +#include <linux/platform_device.h> +#include <video/display_timing.h> #include <video/of_display_timing.h> #include <video/videomode.h> -#include <drm/drm_atomic_helper.h> + +#include <drm/drm_atomic_state_helper.h> +#include <drm/drm_connector.h> +#include <drm/drm_modeset_helper_vtables.h> #include <drm/drm_probe_helper.h> #include "tilcdc_drv.h"
drivers/gpu/drm/tilcdc/tilcdc_plane.c +1 -3
@@ -15,12 +15,10 @@* this program. If not, see <http://www.gnu.org/licenses/>. */ -#include <drm/drmP.h> -#include <drm/drm_atomic.h> #include <drm/drm_plane_helper.h> #include <drm/drm_atomic_helper.h> -#include <uapi/drm/drm_fourcc.h> +#include <drm/drm_fourcc.h> #include "tilcdc_drv.h"
drivers/gpu/drm/tilcdc/tilcdc_tfp410.c +5 -3
@@ -15,12 +15,14 @@* this program. If not, see <http://www.gnu.org/licenses/>. */ -#include <linux/i2c.h> #include <linux/gpio.h> +#include <linux/mod_devicetable.h> #include <linux/of_gpio.h> -#include <linux/pinctrl/pinmux.h> -#include <linux/pinctrl/consumer.h> +#include <linux/platform_device.h> +#include <drm/drm_atomic_helper.h> +#include <drm/drm_encoder.h> +#include <drm/drm_modeset_helper_vtables.h> #include <drm/drm_probe_helper.h> #include "tilcdc_drv.h"
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v2 14/19] drm/tilcdc: drop use of drmP.h
Quoted 4 lines · Sam Ravnborg
Dropped
drmP.hand all other header files not used bytilcdc_drv.h. Added the minimal includes and forwards to make the header file self-contained.
Quoted 8 lines
Then dropped the remaining uses of
drmP.hand fixed all fall-out.Signed-off-by Sam Ravnborg <[email protected]>Acked-by Emil Velikov <[email protected]>Cc Jyri Sarha <[email protected]>Cc Tomi Valkeinen <[email protected]>Cc David Airlie <[email protected]>Cc Daniel Vetter <[email protected]>
Quoted 203 lines
--- drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 18 ++++++++------ drivers/gpu/drm/tilcdc/tilcdc_drv.c | 19 ++++++++++++--- drivers/gpu/drm/tilcdc/tilcdc_drv.h | 31 +++++++++++++----------- drivers/gpu/drm/tilcdc/tilcdc_external.c | 1 + drivers/gpu/drm/tilcdc/tilcdc_panel.c | 11 ++++++--- drivers/gpu/drm/tilcdc/tilcdc_plane.c | 4 +-- drivers/gpu/drm/tilcdc/tilcdc_tfp410.c | 8 +++--- 7 files changed, 57 insertions(+), 35 deletions(-)drivers/gpu/drm/tilcdc/tilcdc_crtc.c +11
-7@@ -15,16 +15,20 @@* this program. If not, see <http://www.gnu.org/licenses/>. */ +#include <linux/delay.h> +#include <linux/dma-mapping.h> +#include <linux/of_graph.h> +#include <linux/pm_runtime.h> +#include <drm/drm_atomic.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_crtc.h> -#include <drm/drm_flip_work.h> -#include <drm/drm_plane_helper.h> -#include <linux/workqueue.h> -#include <linux/completion.h> -#include <linux/dma-mapping.h> -#include <linux/of_graph.h> -#include <linux/math64.h> +#include <drm/drm_fb_cma_helper.h> +#include <drm/drm_fourcc.h> +#include <drm/drm_gem_cma_helper.h> +#include <drm/drm_modeset_helper_vtables.h> +#include <drm/drm_print.h> +#include <drm/drm_vblank.h> #include "tilcdc_drv.h" #include "tilcdc_regs.h" drivers/gpu/drm/tilcdc/tilcdc_drv.c +15
-4@@ -18,19 +18,30 @@/* LCDC DRM driver, based on da8xx-fb */ #include <linux/component.h> +#include <linux/mod_devicetable.h> +#include <linux/module.h> #include <linux/pinctrl/consumer.h> -#include <linux/suspend.h> -#include <drm/drm_atomic.h> +#include <linux/platform_device.h> +#include <linux/pm_runtime.h> +#include <drm/drm_atomic_helper.h> +#include <drm/drm_debugfs.h> +#include <drm/drm_drv.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_irq.h> +#include <drm/drm_mm.h> #include <drm/drm_probe_helper.h> +#include <drm/drm_vblank.h> +#include "tilcdc_drv.h" +#include "tilcdc_external.h" +#include "tilcdc_panel.h" #include "tilcdc_regs.h" #include "tilcdc_tfp410.h" -#include "tilcdc_panel.h" -#include "tilcdc_external.h" static LIST_HEAD (module_list);drivers/gpu/drm/tilcdc/tilcdc_drv.h +17
-14@@ -18,21 +18,24 @@#ifndef __TILCDC_DRV_H__#define __TILCDC_DRV_H__ -#include <linux/clk.h> #include <linux/cpufreq.h> -#include <linux/module.h> -#include <linux/platform_device.h> -#include <linux/pm.h> -#include <linux/pm_runtime.h> -#include <linux/slab.h> -#include <linux/of.h> -#include <linux/of_device.h> -#include <linux/list.h> - -#include <drm/drmP.h> -#include <drm/drm_bridge.h> -#include <drm/drm_fb_cma_helper.h> -#include <drm/drm_gem_cma_helper.h> +#include <linux/irqreturn.h> + +#include <drm/drm_print.h> + +struct clk ; +struct workqueue_struct ; + +struct drm_connector ; +struct drm_connector_helper_funcs ; +struct drm_crtc ; +struct drm_device ; +struct drm_display_mode ; +struct drm_encoder ; +struct drm_framebuffer ; +struct drm_minor ; +struct drm_pending_vblank_event ; +struct drm_plane ;/* Defaulting to pixel clock defined on AM335x */ #define TILCDC_DEFAULT_MAX_PIXELCLOCK 126000drivers/gpu/drm/tilcdc/tilcdc_external.c +1
-0@@ -10,6 +10,7 @@#include <linux/component.h> #include <linux/of_graph.h> +#include <drm/drm_atomic_helper.h> #include <drm/drm_of.h> drivers/gpu/drm/tilcdc/tilcdc_panel.c +7
-4@@ -15,14 +15,17 @@* this program. If not, see <http://www.gnu.org/licenses/>. */ -#include <linux/pinctrl/pinmux.h> -#include <linux/pinctrl/consumer.h> -#include <linux/backlight.h> #include <linux/gpio/consumer.h> +#include <linux/pinctrl/consumer.h> +#include <linux/platform_device.h> +#include <video/display_timing.h> #include <video/of_display_timing.h> #include <video/videomode.h> -#include <drm/drm_atomic_helper.h> + +#include <drm/drm_atomic_state_helper.h> +#include <drm/drm_connector.h> +#include <drm/drm_modeset_helper_vtables.h> #include <drm/drm_probe_helper.h> #include "tilcdc_drv.h" drivers/gpu/drm/tilcdc/tilcdc_plane.c +1
-3@@ -15,12 +15,10 @@* this program. If not, see <http://www.gnu.org/licenses/>. */ -#include <drm/drmP.h> -#include <drm/drm_atomic.h> #include <drm/drm_plane_helper.h> #include <drm/drm_atomic_helper.h> -#include <uapi/drm/drm_fourcc.h> +#include <drm/drm_fourcc.h> #include "tilcdc_drv.h" drivers/gpu/drm/tilcdc/tilcdc_tfp410.c +5
-3@@ -15,12 +15,14 @@* this program. If not, see <http://www.gnu.org/licenses/>. */ -#include <linux/i2c.h> #include <linux/gpio.h> +#include <linux/mod_devicetable.h> #include <linux/of_gpio.h> -#include <linux/pinctrl/pinmux.h> -#include <linux/pinctrl/consumer.h> +#include <linux/platform_device.h> +#include <drm/drm_atomic_helper.h> +#include <drm/drm_encoder.h> +#include <drm/drm_modeset_helper_vtables.h> #include <drm/drm_probe_helper.h> #include "tilcdc_drv.h"
Signature · 6 lines
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v2 14/19] drm/tilcdc: drop use of drmP.h
Hi Jyri.
Quoted 7 lines · Jyri Sarha
Quoted 6 lines · Sam Ravnborg
Dropped
drmP.hand all other header files not used bytilcdc_drv.h. Added the minimal includes and forwards to make the header file self-contained.Then dropped the remaining uses of
drmP.hand fixed all fall-out.
Quoted 8 lines
Quoted 6 lines
Signed-off-by Sam Ravnborg <[email protected]>Acked-by Emil Velikov <[email protected]>Cc Jyri Sarha <[email protected]>Cc Tomi Valkeinen <[email protected]>Cc David Airlie <[email protected]>Cc Daniel Vetter <[email protected]>Acked-by Jyri Sarha <[email protected]>
Thanks. Patch is already applied so too late to add your ack to the changelog.
Sam
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v2 15/19 drm/i2c/ch7006: drop use of drmP.h
In reply to Sam RavnborgDrop using the deprecated drmP.h header file. Fix fallout.
--- drivers/gpu/drm/i2c/ch7006_priv.h | 1 - 1 file changed, 1 deletion(-)
drivers/gpu/drm/i2c/ch7006_priv.h +0 -1
@@ -27,7 +27,6 @@#ifndef __DRM_I2C_CH7006_PRIV_H__#define __DRM_I2C_CH7006_PRIV_H__ -#include <drm/drmP.h> #include <drm/drm_crtc_helper.h> #include <drm/drm_encoder_slave.h> #include <drm/drm_probe_helper.h>
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v2 17/19 drm/imx: drop use of drmP.h
In reply to Sam RavnborgDrop use of the deprecated drmP.h header file.
While touching the include files divide them in blocks and sort the include files within each block.
--- drivers/gpu/drm/imx/dw_hdmi-imx.c | 14 ++++++++------ drivers/gpu/drm/imx/imx-drm-core.c | 8 ++++++-- drivers/gpu/drm/imx/imx-ldb.c | 22 ++++++++++++---------- drivers/gpu/drm/imx/imx-tve.c | 10 ++++++---- drivers/gpu/drm/imx/ipuv3-crtc.c | 8 ++++++-- drivers/gpu/drm/imx/ipuv3-plane.c | 5 +++-- drivers/gpu/drm/imx/parallel-display.c | 8 +++++--- 7 files changed, 46 insertions(+), 29 deletions(-)
drivers/gpu/drm/imx/dw_hdmi-imx.c +8 -6
@@ -3,19 +3,21 @@* * derived from imx-hdmi.c(renamed to bridge/dw_hdmi.c now) */ -#include <linux/module.h> -#include <linux/platform_device.h> +#include <linux/component.h> #include <linux/mfd/syscon.h> #include <linux/mfd/syscon/imx6q-iomuxc-gpr.h> -#include <drm/bridge/dw_hdmi.h> -#include <video/imx-ipu-v3.h> +#include <linux/module.h> +#include <linux/platform_device.h> #include <linux/regmap.h> -#include <drm/drm_of.h> -#include <drm/drmP.h> + +#include <video/imx-ipu-v3.h> + +#include <drm/bridge/dw_hdmi.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_edid.h> #include <drm/drm_encoder_slave.h> +#include <drm/drm_of.h> #include "imx-drm.h"
drivers/gpu/drm/imx/imx-drm-core.c +6 -2
@@ -4,14 +4,18 @@* * Copyright (C) 2011 Sascha Hauer, Pengutronix */ +#include <linux/component.h> #include <linux/device.h> #include <linux/dma-buf.h> #include <linux/module.h> #include <linux/platform_device.h> -#include <drm/drmP.h> + +#include <video/imx-ipu-v3.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_fb_helper.h> #include <drm/drm_gem_cma_helper.h>
@@ -19,7 +23,7 @@#include <drm/drm_of.h> #include <drm/drm_plane_helper.h> #include <drm/drm_probe_helper.h> -#include <video/imx-ipu-v3.h> +#include <drm/drm_vblank.h> #include "imx-drm.h" #include "ipuv3-plane.h"
drivers/gpu/drm/imx/imx-ldb.c +12 -10
@@ -5,25 +5,27 @@* Copyright (C) 2012 Sascha Hauer, Pengutronix */ -#include <linux/module.h> #include <linux/clk.h> #include <linux/component.h> -#include <drm/drmP.h> -#include <drm/drm_atomic.h> -#include <drm/drm_atomic_helper.h> -#include <drm/drm_fb_helper.h> -#include <drm/drm_of.h> -#include <drm/drm_panel.h> -#include <drm/drm_probe_helper.h> #include <linux/mfd/syscon.h> #include <linux/mfd/syscon/imx6q-iomuxc-gpr.h> +#include <linux/module.h> #include <linux/of_device.h> #include <linux/of_graph.h> -#include <video/of_display_timing.h> -#include <video/of_videomode.h> #include <linux/regmap.h> #include <linux/videodev2.h> +#include <video/of_display_timing.h> +#include <video/of_videomode.h> + +#include <drm/drm_atomic.h> +#include <drm/drm_atomic_helper.h> +#include <drm/drm_fb_helper.h> +#include <drm/drm_of.h> +#include <drm/drm_panel.h> +#include <drm/drm_print.h> +#include <drm/drm_probe_helper.h> +#include "imx-drm.h" #define DRIVER_NAME "imx-ldb"
drivers/gpu/drm/imx/imx-tve.c +6 -4
@@ -5,20 +5,22 @@* Copyright (C) 2013 Philipp Zabel, Pengutronix */ -#include <linux/clk.h> #include <linux/clk-provider.h> +#include <linux/clk.h> #include <linux/component.h> -#include <linux/module.h> #include <linux/i2c.h> +#include <linux/module.h> +#include <linux/platform_device.h> #include <linux/regmap.h> #include <linux/regulator/consumer.h> #include <linux/spinlock.h> #include <linux/videodev2.h> -#include <drm/drmP.h> + +#include <video/imx-ipu-v3.h> +#include <drm/drm_atomic_helper.h> #include <drm/drm_fb_helper.h> #include <drm/drm_probe_helper.h> -#include <video/imx-ipu-v3.h> #include "imx-drm.h"
drivers/gpu/drm/imx/ipuv3-crtc.c +6 -2
@@ -4,21 +4,25 @@* * Copyright (C) 2011 Sascha Hauer, Pengutronix */ +#include <linux/clk.h> #include <linux/component.h> #include <linux/device.h> +#include <linux/dma-mapping.h> #include <linux/errno.h> #include <linux/export.h> #include <linux/module.h> #include <linux/platform_device.h> -#include <drm/drmP.h> + +#include <video/imx-ipu-v3.h> +#include <drm/drm_atomic.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_fb_cma_helper.h> #include <drm/drm_gem_cma_helper.h> #include <drm/drm_probe_helper.h> +#include <drm/drm_vblank.h> -#include <video/imx-ipu-v3.h> #include "imx-drm.h" #include "ipuv3-plane.h"
drivers/gpu/drm/imx/ipuv3-plane.c +3 -2
@@ -5,15 +5,16 @@* Copyright (C) 2013 Philipp Zabel, Pengutronix */ -#include <drm/drmP.h> #include <drm/drm_atomic.h> #include <drm/drm_atomic_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_plane_helper.h> -#include "video/imx-ipu-v3.h" +#include <video/imx-ipu-v3.h> +#include "imx-drm.h" #include "ipuv3-plane.h"
drivers/gpu/drm/imx/parallel-display.c +5 -3
@@ -7,14 +7,16 @@#include <linux/component.h> #include <linux/module.h> -#include <drm/drmP.h> +#include <linux/platform_device.h> +#include <linux/videodev2.h> + +#include <video/of_display_timing.h> +#include <drm/drm_atomic_helper.h> #include <drm/drm_fb_helper.h> #include <drm/drm_of.h> #include <drm/drm_panel.h> #include <drm/drm_probe_helper.h> -#include <linux/videodev2.h> -#include <video/of_display_timing.h> #include "imx-drm.h"
Signature · 7 lines
2.20.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v2 18/19 drm/rockchip: 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 move the
blocks so they follow the common pattern:
\#include <linux/*>
\#include <video/*>
\#include <drm/*>
\#include ""
Within each block sort the include files.
Add the includes needed to fix build after the removal of drmP.h.
--- .../gpu/drm/rockchip/analogix_dp-rockchip.c | 10 +++--- drivers/gpu/drm/rockchip/cdn-dp-core.c | 17 +++++----- drivers/gpu/drm/rockchip/cdn-dp-core.h | 2 +- .../gpu/drm/rockchip/dw-mipi-dsi-rockchip.c | 9 +++--- drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 5 ++- drivers/gpu/drm/rockchip/inno_hdmi.c | 3 +- drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 12 ++++--- drivers/gpu/drm/rockchip/rockchip_drm_fb.c | 3 +- drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c | 2 +- drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 8 ++--- drivers/gpu/drm/rockchip/rockchip_drm_psr.c | 1 - drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 31 ++++++++++--------- drivers/gpu/drm/rockchip/rockchip_lvds.c | 16 +++++----- drivers/gpu/drm/rockchip/rockchip_rgb.c | 9 +++--- drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 11 +++++-- 15 files changed, 71 insertions(+), 68 deletions(-)
drivers/gpu/drm/rockchip/analogix_dp-rockchip.c +4 -6
@@ -16,16 +16,14 @@#include <linux/reset.h> #include <linux/clk.h> -#include <drm/drmP.h> -#include <drm/drm_dp_helper.h> -#include <drm/drm_of.h> -#include <drm/drm_panel.h> -#include <drm/drm_probe_helper.h> -#include <video/of_videomode.h> #include <video/videomode.h> #include <drm/bridge/analogix_dp.h> +#include <drm/drm_dp_helper.h> +#include <drm/drm_of.h> +#include <drm/drm_panel.h> +#include <drm/drm_probe_helper.h> #include "rockchip_drm_drv.h" #include "rockchip_drm_psr.h"
drivers/gpu/drm/rockchip/cdn-dp-core.c +8 -9
@@ -4,24 +4,23 @@* Author: Chris Zhong <[email protected]> */ -#include <drm/drmP.h> -#include <drm/drm_atomic_helper.h> -#include <drm/drm_dp_helper.h> -#include <drm/drm_edid.h> -#include <drm/drm_of.h> -#include <drm/drm_probe_helper.h> -#include <linux/clk.h> #include <linux/component.h> #include <linux/extcon.h> #include <linux/firmware.h> -#include <linux/regmap.h> -#include <linux/reset.h> #include <linux/mfd/syscon.h> #include <linux/phy/phy.h> +#include <linux/regmap.h> +#include <linux/reset.h> #include <sound/hdmi-codec.h> +#include <drm/drm_atomic_helper.h> +#include <drm/drm_dp_helper.h> +#include <drm/drm_edid.h> +#include <drm/drm_of.h> +#include <drm/drm_probe_helper.h> +#include "cdn-dp-core.h" #include "cdn-dp-reg.h" #include "rockchip_drm_vop.h"
drivers/gpu/drm/rockchip/cdn-dp-core.h +1 -1
@@ -15,10 +15,10 @@#ifndef _CDN_DP_CORE_H#define _CDN_DP_CORE_H -#include <drm/drmP.h> #include <drm/drm_dp_helper.h> #include <drm/drm_panel.h> #include <drm/drm_probe_helper.h> +#include "rockchip_drm_drv.h" #define MAX_PHY 2
drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c +5 -4
@@ -6,10 +6,6 @@* Nickey Yang <[email protected]> */ -#include <drm/drmP.h> -#include <drm/drm_mipi_dsi.h> -#include <drm/bridge/dw_mipi_dsi.h> -#include <drm/drm_of.h> #include <linux/clk.h> #include <linux/iopoll.h> #include <linux/math64.h>
@@ -18,8 +14,13 @@#include <linux/of_device.h> #include <linux/pm_runtime.h> #include <linux/regmap.h> +#include <video/mipi_display.h> +#include <drm/bridge/dw_mipi_dsi.h> +#include <drm/drm_mipi_dsi.h> +#include <drm/drm_of.h> +#include "rockchip_drm_drv.h" #include "rockchip_drm_vop.h"
drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c +2 -3
@@ -10,11 +10,10 @@#include <linux/phy/phy.h> #include <linux/regmap.h> -#include <drm/drm_of.h> -#include <drm/drmP.h> +#include <drm/bridge/dw_hdmi.h> #include <drm/drm_edid.h> +#include <drm/drm_of.h> #include <drm/drm_probe_helper.h> -#include <drm/bridge/dw_hdmi.h> #include "rockchip_drm_drv.h" #include "rockchip_drm_vop.h"
drivers/gpu/drm/rockchip/inno_hdmi.c +1 -2
@@ -15,10 +15,9 @@#include <linux/mutex.h> #include <linux/of_device.h> -#include <drm/drm_of.h> -#include <drm/drmP.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_edid.h> +#include <drm/drm_of.h> #include <drm/drm_probe_helper.h> #include "rockchip_drm_drv.h"
drivers/gpu/drm/rockchip/rockchip_drm_drv.c +7 -5
@@ -6,11 +6,6 @@* based on exynos_drm_drv.c */ -#include <drm/drmP.h> -#include <drm/drm_fb_helper.h> -#include <drm/drm_gem_cma_helper.h> -#include <drm/drm_of.h> -#include <drm/drm_probe_helper.h> #include <linux/dma-mapping.h> #include <linux/dma-iommu.h> #include <linux/pm_runtime.h>
@@ -21,6 +16,13 @@#include <linux/console.h> #include <linux/iommu.h> +#include <drm/drm_drv.h> +#include <drm/drm_fb_helper.h> +#include <drm/drm_gem_cma_helper.h> +#include <drm/drm_of.h> +#include <drm/drm_probe_helper.h> +#include <drm/drm_vblank.h> +#include "rockchip_drm_drv.h" #include "rockchip_drm_fb.h" #include "rockchip_drm_fbdev.h"
drivers/gpu/drm/rockchip/rockchip_drm_fb.c +2 -1
@@ -5,11 +5,12 @@*/ #include <linux/kernel.h> +#include <drm/drm.h> -#include <drm/drmP.h> #include <drm/drm_atomic.h> #include <drm/drm_damage_helper.h> #include <drm/drm_fb_helper.h> +#include <drm/drm_fourcc.h> #include <drm/drm_gem_framebuffer_helper.h> #include <drm/drm_probe_helper.h>
drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c +1 -1
@@ -5,8 +5,8 @@*/ #include <drm/drm.h> -#include <drm/drmP.h> #include <drm/drm_fb_helper.h> +#include <drm/drm_fourcc.h> #include <drm/drm_probe_helper.h> #include "rockchip_drm_drv.h"
drivers/gpu/drm/rockchip/rockchip_drm_gem.c +4 -4
@@ -4,14 +4,14 @@* Author:Mark Yao <[email protected]> */ +#include <linux/dma-buf.h> +#include <linux/iommu.h> +#include <drm/drm.h> -#include <drm/drmP.h> #include <drm/drm_gem.h> +#include <drm/drm_prime.h> #include <drm/drm_vma_manager.h> -#include <linux/dma-buf.h> -#include <linux/iommu.h> -#include "rockchip_drm_drv.h" #include "rockchip_drm_gem.h"
drivers/gpu/drm/rockchip/rockchip_drm_psr.c +0 -1
@@ -4,7 +4,6 @@* Author: Yakir Yang <[email protected]> */ -#include <drm/drmP.h> #include <drm/drm_atomic.h> #include <drm/drm_probe_helper.h>
drivers/gpu/drm/rockchip/rockchip_drm_vop.c +16 -15
@@ -4,33 +4,34 @@* Author:Mark Yao <[email protected]> */ +#include <linux/clk.h> +#include <linux/component.h> +#include <linux/delay.h> +#include <linux/iopoll.h> +#include <linux/kernel.h> +#include <linux/module.h> +#include <linux/of.h> +#include <linux/of_device.h> +#include <linux/overflow.h> +#include <linux/platform_device.h> +#include <linux/pm_runtime.h> +#include <linux/reset.h> +#include <drm/drm.h> -#include <drm/drmP.h> #include <drm/drm_atomic.h> #include <drm/drm_atomic_uapi.h> #include <drm/drm_crtc.h> #include <drm/drm_flip_work.h> +#include <drm/drm_fourcc.h> #include <drm/drm_gem_framebuffer_helper.h> #include <drm/drm_plane_helper.h> #include <drm/drm_probe_helper.h> +#include <drm/drm_vblank.h> +#ifdef CONFIG_DRM_ANALOGIX_DP #include <drm/bridge/analogix_dp.h> #endif -#include <linux/kernel.h> -#include <linux/module.h> -#include <linux/platform_device.h> -#include <linux/clk.h> -#include <linux/iopoll.h> -#include <linux/of.h> -#include <linux/of_device.h> -#include <linux/pm_runtime.h> -#include <linux/component.h> -#include <linux/overflow.h> - -#include <linux/reset.h> -#include <linux/delay.h> -#include "rockchip_drm_drv.h" #include "rockchip_drm_gem.h" #include "rockchip_drm_fb.h"
drivers/gpu/drm/rockchip/rockchip_lvds.c +8 -8
@@ -6,21 +6,21 @@* Sandy Huang <[email protected]> */ -#include <drm/drmP.h> -#include <drm/drm_atomic_helper.h> -#include <drm/drm_dp_helper.h> -#include <drm/drm_panel.h> -#include <drm/drm_of.h> -#include <drm/drm_probe_helper.h> - -#include <linux/component.h> #include <linux/clk.h> +#include <linux/component.h> #include <linux/mfd/syscon.h> #include <linux/of_graph.h> #include <linux/pinctrl/devinfo.h> +#include <linux/platform_device.h> #include <linux/pm_runtime.h> #include <linux/regmap.h> #include <linux/reset.h> +#include <drm/drm_atomic_helper.h> + +#include <drm/drm_dp_helper.h> +#include <drm/drm_of.h> +#include <drm/drm_panel.h> +#include <drm/drm_probe_helper.h> #include "rockchip_drm_drv.h" #include "rockchip_drm_vop.h"
drivers/gpu/drm/rockchip/rockchip_rgb.c +4 -5
@@ -5,16 +5,15 @@* Sandy Huang <[email protected]> */ -#include <drm/drmP.h> +#include <linux/component.h> +#include <linux/of_graph.h> +#include <drm/drm_atomic_helper.h> #include <drm/drm_dp_helper.h> -#include <drm/drm_panel.h> #include <drm/drm_of.h> +#include <drm/drm_panel.h> #include <drm/drm_probe_helper.h> -#include <linux/component.h> -#include <linux/of_graph.h> -#include "rockchip_drm_drv.h" #include "rockchip_drm_vop.h"
drivers/gpu/drm/rockchip/rockchip_vop_reg.c +8 -3
@@ -4,10 +4,15 @@* Author:Mark Yao <[email protected]> */ -#include <drm/drmP.h> - -#include <linux/kernel.h> #include <linux/component.h> +#include <linux/mod_devicetable.h> +#include <linux/module.h> +#include <linux/of.h> +#include <linux/platform_device.h> + +#include <drm/drm_fourcc.h> +#include <drm/drm_plane.h> +#include <drm/drm_print.h> #include "rockchip_drm_vop.h" #include "rockchip_vop_reg.h"
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v2 19/19 drm/mediatek: drop use of drmP.h
In reply to Sam RavnborgDrop use of the deprecated drmP.h header file.
While touching the include files divide them up in blocks in the typical order:
\#include <linux/*>
\#include <video/*>
\#include <drm/*>
\#include ""
And sort the includes in the blocks
Add the necessary includes to fix build after removal of drmP.h
--- drivers/gpu/drm/mediatek/mtk_disp_color.c | 2 +- drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 2 +- drivers/gpu/drm/mediatek/mtk_disp_rdma.c | 2 +- drivers/gpu/drm/mediatek/mtk_dpi.c | 18 ++++++++++-------- drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 10 ++++++---- drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c | 2 +- drivers/gpu/drm/mediatek/mtk_drm_drv.c | 16 ++++++++++------ drivers/gpu/drm/mediatek/mtk_drm_fb.c | 7 ++++--- drivers/gpu/drm/mediatek/mtk_drm_gem.c | 6 ++++-- drivers/gpu/drm/mediatek/mtk_drm_plane.c | 2 +- drivers/gpu/drm/mediatek/mtk_dsi.c | 14 ++++++++------ drivers/gpu/drm/mediatek/mtk_hdmi.c | 14 +++++++++----- 12 files changed, 56 insertions(+), 39 deletions(-)
drivers/gpu/drm/mediatek/mtk_disp_color.c +1 -1
@@ -3,9 +3,9 @@* Copyright (c) 2017 MediaTek Inc. */ -#include <drm/drmP.h> #include <linux/clk.h> #include <linux/component.h> +#include <linux/module.h> #include <linux/of_device.h> #include <linux/of_irq.h> #include <linux/platform_device.h>
drivers/gpu/drm/mediatek/mtk_disp_ovl.c +1 -1
@@ -3,9 +3,9 @@* Copyright (c) 2015 MediaTek Inc. */ -#include <drm/drmP.h> #include <linux/clk.h> #include <linux/component.h> +#include <linux/module.h> #include <linux/of_device.h> #include <linux/of_irq.h> #include <linux/platform_device.h>
drivers/gpu/drm/mediatek/mtk_disp_rdma.c +1 -1
@@ -3,9 +3,9 @@* Copyright (c) 2015 MediaTek Inc. */ -#include <drm/drmP.h> #include <linux/clk.h> #include <linux/component.h> +#include <linux/module.h> #include <linux/of_device.h> #include <linux/of_irq.h> #include <linux/platform_device.h>
drivers/gpu/drm/mediatek/mtk_dpi.c +10 -8
@@ -3,21 +3,23 @@* Copyright (c) 2014 MediaTek Inc. * Author: Jie Qiu <[email protected]> */ -#include <drm/drmP.h> -#include <drm/drm_crtc.h> -#include <drm/drm_atomic_helper.h> -#include <drm/drm_of.h> -#include <linux/kernel.h> + +#include <linux/clk.h> #include <linux/component.h> -#include <linux/platform_device.h> +#include <linux/interrupt.h> +#include <linux/kernel.h> #include <linux/of.h> #include <linux/of_device.h> #include <linux/of_graph.h> -#include <linux/interrupt.h> +#include <linux/platform_device.h> #include <linux/types.h> -#include <linux/clk.h> +#include <video/videomode.h> +#include <drm/drm_atomic_helper.h> +#include <drm/drm_crtc.h> +#include <drm/drm_of.h> +#include "mtk_dpi_regs.h" #include "mtk_drm_ddp_comp.h"
drivers/gpu/drm/mediatek/mtk_drm_crtc.c +6 -4
@@ -3,14 +3,16 @@* Copyright (c) 2015 MediaTek Inc. */ +#include <linux/clk.h> +#include <linux/pm_runtime.h> +#include <asm/barrier.h> -#include <drm/drmP.h> +#include <soc/mediatek/smi.h> +#include <drm/drm_atomic_helper.h> #include <drm/drm_plane_helper.h> #include <drm/drm_probe_helper.h> -#include <linux/clk.h> -#include <linux/pm_runtime.h> -#include <soc/mediatek/smi.h> +#include <drm/drm_vblank.h> #include "mtk_drm_drv.h" #include "mtk_drm_crtc.h"
drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c +1 -1
@@ -12,7 +12,7 @@#include <linux/of_irq.h> #include <linux/of_platform.h> #include <linux/platform_device.h> -#include <drm/drmP.h> +#include "mtk_drm_drv.h" #include "mtk_drm_plane.h" #include "mtk_drm_ddp_comp.h"
drivers/gpu/drm/mediatek/mtk_drm_drv.c +10 -6
@@ -4,22 +4,26 @@* Author: YT SHEN <[email protected]> */ -#include <drm/drmP.h> +#include <linux/component.h> +#include <linux/iommu.h> +#include <linux/module.h> +#include <linux/of_address.h> +#include <linux/of_platform.h> +#include <linux/pm_runtime.h> +#include <drm/drm_atomic.h> #include <drm/drm_atomic_helper.h> +#include <drm/drm_drv.h> #include <drm/drm_fb_helper.h> #include <drm/drm_gem.h> #include <drm/drm_gem_cma_helper.h> #include <drm/drm_of.h> #include <drm/drm_probe_helper.h> -#include <linux/component.h> -#include <linux/iommu.h> -#include <linux/of_address.h> -#include <linux/of_platform.h> -#include <linux/pm_runtime.h> +#include <drm/drm_vblank.h> #include "mtk_drm_crtc.h" #include "mtk_drm_ddp.h" +#include "mtk_drm_ddp.h" #include "mtk_drm_ddp_comp.h" #include "mtk_drm_drv.h" #include "mtk_drm_fb.h"
drivers/gpu/drm/mediatek/mtk_drm_fb.c +4 -3
@@ -3,13 +3,14 @@* Copyright (c) 2015 MediaTek Inc. */ -#include <drm/drmP.h> +#include <linux/dma-buf.h> +#include <linux/reservation.h> +#include <drm/drm_modeset_helper.h> #include <drm/drm_fb_helper.h> +#include <drm/drm_fourcc.h> #include <drm/drm_gem.h> #include <drm/drm_gem_framebuffer_helper.h> -#include <linux/dma-buf.h> -#include <linux/reservation.h> #include "mtk_drm_drv.h" #include "mtk_drm_fb.h"
drivers/gpu/drm/mediatek/mtk_drm_gem.c +4 -2
@@ -3,10 +3,12 @@* Copyright (c) 2015 MediaTek Inc. */ -#include <drm/drmP.h> -#include <drm/drm_gem.h> #include <linux/dma-buf.h> +#include <drm/drm_device.h> +#include <drm/drm_gem.h> +#include <drm/drm_prime.h> +#include "mtk_drm_drv.h" #include "mtk_drm_gem.h"
drivers/gpu/drm/mediatek/mtk_drm_plane.c +1 -1
@@ -4,9 +4,9 @@* Author: CK Hu <[email protected]> */ -#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 <drm/drm_gem_framebuffer_helper.h>
drivers/gpu/drm/mediatek/mtk_dsi.c +8 -6
@@ -3,12 +3,6 @@* Copyright (c) 2015 MediaTek Inc. */ -#include <drm/drmP.h> -#include <drm/drm_atomic_helper.h> -#include <drm/drm_mipi_dsi.h> -#include <drm/drm_panel.h> -#include <drm/drm_of.h> -#include <drm/drm_probe_helper.h> #include <linux/clk.h> #include <linux/component.h> #include <linux/iopoll.h>
@@ -17,9 +11,17 @@#include <linux/of_platform.h> #include <linux/phy/phy.h> #include <linux/platform_device.h> +#include <video/mipi_display.h> #include <video/videomode.h> +#include <drm/drm_atomic_helper.h> +#include <drm/drm_mipi_dsi.h> +#include <drm/drm_of.h> +#include <drm/drm_panel.h> +#include <drm/drm_print.h> +#include <drm/drm_probe_helper.h> +#include "mtk_drm_ddp_comp.h" #define DSI_START 0x00
drivers/gpu/drm/mediatek/mtk_hdmi.c +9 -5
@@ -3,11 +3,7 @@* Copyright (c) 2014 MediaTek Inc. * Author: Jie Qiu <[email protected]> */ -#include <drm/drmP.h> -#include <drm/drm_atomic_helper.h> -#include <drm/drm_crtc.h> -#include <drm/drm_probe_helper.h> -#include <drm/drm_edid.h> +#include <linux/arm-smccc.h> #include <linux/clk.h> #include <linux/delay.h>
@@ -23,7 +19,15 @@#include <linux/phy/phy.h> #include <linux/platform_device.h> #include <linux/regmap.h> +#include <sound/hdmi-codec.h> + +#include <drm/drm_atomic_helper.h> +#include <drm/drm_crtc.h> +#include <drm/drm_edid.h> +#include <drm/drm_print.h> +#include <drm/drm_probe_helper.h> +#include "mtk_cec.h" #include "mtk_hdmi.h" #include "mtk_hdmi_regs.h"
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v2 19/19] drm/mediatek: drop use of drmP.h
Hi, Sam:
Quoted 7 lines · Sam Ravnborg
Drop use of the deprecated
drmP.hheader file.While touching the include files divide them up in blocks in the typical order:
\#include <linux/*>
Quoted 8 lines
\#include <video/*>
\#include <drm/*>
\#include ""
And sort the includes in the blocks
Add the necessary includes to fix build after removal ofdrmP.h
Thanks.
Quoted 295 lines
Signed-off-by Sam Ravnborg <[email protected]>Acked-by Emil Velikov <[email protected]>Cc CK Hu <[email protected]>Cc Philipp Zabel <[email protected]>Cc David Airlie <[email protected]>Cc Daniel Vetter <[email protected]>Cc Matthias Brugger <[email protected]>--- drivers/gpu/drm/mediatek/mtk_disp_color.c | 2 +- drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 2 +- drivers/gpu/drm/mediatek/mtk_disp_rdma.c | 2 +- drivers/gpu/drm/mediatek/mtk_dpi.c | 18 ++++++++++-------- drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 10 ++++++---- drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c | 2 +- drivers/gpu/drm/mediatek/mtk_drm_drv.c | 16 ++++++++++------ drivers/gpu/drm/mediatek/mtk_drm_fb.c | 7 ++++--- drivers/gpu/drm/mediatek/mtk_drm_gem.c | 6 ++++-- drivers/gpu/drm/mediatek/mtk_drm_plane.c | 2 +- drivers/gpu/drm/mediatek/mtk_dsi.c | 14 ++++++++------ drivers/gpu/drm/mediatek/mtk_hdmi.c | 14 +++++++++----- 12 files changed, 56 insertions(+), 39 deletions(-)drivers/gpu/drm/mediatek/mtk_disp_color.c +1
-1@@ -3,9 +3,9 @@* Copyright (c) 2017 MediaTek Inc. */ -#include <drm/drmP.h> #include <linux/clk.h> #include <linux/component.h> +#include <linux/module.h> #include <linux/of_device.h> #include <linux/of_irq.h> #include <linux/platform_device.h> drivers/gpu/drm/mediatek/mtk_disp_ovl.c +1
-1@@ -3,9 +3,9 @@* Copyright (c) 2015 MediaTek Inc. */ -#include <drm/drmP.h> #include <linux/clk.h> #include <linux/component.h> +#include <linux/module.h> #include <linux/of_device.h> #include <linux/of_irq.h> #include <linux/platform_device.h> drivers/gpu/drm/mediatek/mtk_disp_rdma.c +1
-1@@ -3,9 +3,9 @@* Copyright (c) 2015 MediaTek Inc. */ -#include <drm/drmP.h> #include <linux/clk.h> #include <linux/component.h> +#include <linux/module.h> #include <linux/of_device.h> #include <linux/of_irq.h> #include <linux/platform_device.h> drivers/gpu/drm/mediatek/mtk_dpi.c +10
-8@@ -3,21 +3,23 @@* Copyright (c) 2014 MediaTek Inc. * Author: Jie Qiu <[email protected]> */ -#include <drm/drmP.h> -#include <drm/drm_crtc.h> -#include <drm/drm_atomic_helper.h> -#include <drm/drm_of.h> -#include <linux/kernel.h> + +#include <linux/clk.h> #include <linux/component.h> -#include <linux/platform_device.h> +#include <linux/interrupt.h> +#include <linux/kernel.h> #include <linux/of.h> #include <linux/of_device.h> #include <linux/of_graph.h> -#include <linux/interrupt.h> +#include <linux/platform_device.h> #include <linux/types.h> -#include <linux/clk.h> +#include <video/videomode.h> +#include <drm/drm_atomic_helper.h> +#include <drm/drm_crtc.h> +#include <drm/drm_of.h> +#include "mtk_dpi_regs.h" #include "mtk_drm_ddp_comp.h" drivers/gpu/drm/mediatek/mtk_drm_crtc.c +6
-4@@ -3,14 +3,16 @@* Copyright (c) 2015 MediaTek Inc. */ +#include <linux/clk.h> +#include <linux/pm_runtime.h> +#include <asm/barrier.h> -#include <drm/drmP.h> +#include <soc/mediatek/smi.h> +#include <drm/drm_atomic_helper.h> #include <drm/drm_plane_helper.h> #include <drm/drm_probe_helper.h> -#include <linux/clk.h> -#include <linux/pm_runtime.h> -#include <soc/mediatek/smi.h> +#include <drm/drm_vblank.h> #include "mtk_drm_drv.h" #include "mtk_drm_crtc.h" drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c +1
-1@@ -12,7 +12,7 @@#include <linux/of_irq.h> #include <linux/of_platform.h> #include <linux/platform_device.h> -#include <drm/drmP.h> +#include "mtk_drm_drv.h" #include "mtk_drm_plane.h" #include "mtk_drm_ddp_comp.h" drivers/gpu/drm/mediatek/mtk_drm_drv.c +10
-6@@ -4,22 +4,26 @@* Author: YT SHEN <[email protected]> */ -#include <drm/drmP.h> +#include <linux/component.h> +#include <linux/iommu.h> +#include <linux/module.h> +#include <linux/of_address.h> +#include <linux/of_platform.h> +#include <linux/pm_runtime.h> +#include <drm/drm_atomic.h> #include <drm/drm_atomic_helper.h> +#include <drm/drm_drv.h> #include <drm/drm_fb_helper.h> #include <drm/drm_gem.h> #include <drm/drm_gem_cma_helper.h> #include <drm/drm_of.h> #include <drm/drm_probe_helper.h> -#include <linux/component.h> -#include <linux/iommu.h> -#include <linux/of_address.h> -#include <linux/of_platform.h> -#include <linux/pm_runtime.h> +#include <drm/drm_vblank.h> #include "mtk_drm_crtc.h" #include "mtk_drm_ddp.h" +#include "mtk_drm_ddp.h" #include "mtk_drm_ddp_comp.h" #include "mtk_drm_drv.h" #include "mtk_drm_fb.h" drivers/gpu/drm/mediatek/mtk_drm_fb.c +4
-3@@ -3,13 +3,14 @@* Copyright (c) 2015 MediaTek Inc. */ -#include <drm/drmP.h> +#include <linux/dma-buf.h> +#include <linux/reservation.h> +#include <drm/drm_modeset_helper.h> #include <drm/drm_fb_helper.h> +#include <drm/drm_fourcc.h> #include <drm/drm_gem.h> #include <drm/drm_gem_framebuffer_helper.h> -#include <linux/dma-buf.h> -#include <linux/reservation.h> #include "mtk_drm_drv.h" #include "mtk_drm_fb.h" drivers/gpu/drm/mediatek/mtk_drm_gem.c +4
-2@@ -3,10 +3,12 @@* Copyright (c) 2015 MediaTek Inc. */ -#include <drm/drmP.h> -#include <drm/drm_gem.h> #include <linux/dma-buf.h> +#include <drm/drm_device.h> +#include <drm/drm_gem.h> +#include <drm/drm_prime.h> +#include "mtk_drm_drv.h" #include "mtk_drm_gem.h" drivers/gpu/drm/mediatek/mtk_drm_plane.c +1
-1@@ -4,9 +4,9 @@* Author: CK Hu <[email protected]> */ -#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 <drm/drm_gem_framebuffer_helper.h> drivers/gpu/drm/mediatek/mtk_dsi.c +8
-6@@ -3,12 +3,6 @@* Copyright (c) 2015 MediaTek Inc. */ -#include <drm/drmP.h> -#include <drm/drm_atomic_helper.h> -#include <drm/drm_mipi_dsi.h> -#include <drm/drm_panel.h> -#include <drm/drm_of.h> -#include <drm/drm_probe_helper.h> #include <linux/clk.h> #include <linux/component.h> #include <linux/iopoll.h> @@ -17,9 +11,17 @@#include <linux/of_platform.h> #include <linux/phy/phy.h> #include <linux/platform_device.h> +#include <video/mipi_display.h> #include <video/videomode.h> +#include <drm/drm_atomic_helper.h> +#include <drm/drm_mipi_dsi.h> +#include <drm/drm_of.h> +#include <drm/drm_panel.h> +#include <drm/drm_print.h> +#include <drm/drm_probe_helper.h> +#include "mtk_drm_ddp_comp.h" #define DSI_START 0x00drivers/gpu/drm/mediatek/mtk_hdmi.c +2
-5@@ -3,11 +3,7 @@* Copyright (c) 2014 MediaTek Inc. * Author: Jie Qiu <[email protected]> */ -#include <drm/drmP.h> -#include <drm/drm_atomic_helper.h> -#include <drm/drm_crtc.h> -#include <drm/drm_probe_helper.h> -#include <drm/drm_edid.h> +#include <linux/arm-smccc.h> #include <linux/clk.h> #include <linux/delay.h> @@ -23,7 +19,15 @@#include <linux/phy/phy.h> #include <linux/platform_device.h> #include <linux/regmap.h> +#include <sound/hdmi-codec.h>
drivers/gpu/drm/mediatek/mtk_hdmi.c line 33
Quoted 10 lines
drivers/gpu/drm/mediatek/mtk_hdmi.c +7
-0+ +#include <drm/drm_atomic_helper.h> +#include <drm/drm_crtc.h> +#include <drm/drm_edid.h> +#include <drm/drm_print.h> +#include <drm/drm_probe_helper.h> +#include "mtk_cec.h" #include "mtk_hdmi.h" #include "mtk_hdmi_regs.h"
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v2 19/19] drm/mediatek: drop use of drmP.h
In reply to Sam RavnborgQuoted 17 lines · Sam Ravnborg
Drop use of the deprecated
drmP.hheader file.While touching the include files divide them up in blocks in the typical order:
\#include <linux/*>
\#include <video/*>
\#include <drm/*>
\#include ""
And sort the includes in the blocks
Add the necessary includes to fix build after removal ofdrmP.h
Quoted 9 lines
Signed-off-by Sam Ravnborg <[email protected]>Acked-by Emil Velikov <[email protected]>Cc CK Hu <[email protected]>Cc Philipp Zabel <[email protected]>Cc David Airlie <[email protected]>Cc Daniel Vetter <[email protected]>Cc Matthias Brugger <[email protected]>
Quoted 298 lines
--- drivers/gpu/drm/mediatek/mtk_disp_color.c | 2 +- drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 2 +- drivers/gpu/drm/mediatek/mtk_disp_rdma.c | 2 +- drivers/gpu/drm/mediatek/mtk_dpi.c | 18 ++++++++++-------- drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 10 ++++++---- drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c | 2 +- drivers/gpu/drm/mediatek/mtk_drm_drv.c | 16 ++++++++++------ drivers/gpu/drm/mediatek/mtk_drm_fb.c | 7 ++++--- drivers/gpu/drm/mediatek/mtk_drm_gem.c | 6 ++++-- drivers/gpu/drm/mediatek/mtk_drm_plane.c | 2 +- drivers/gpu/drm/mediatek/mtk_dsi.c | 14 ++++++++------ drivers/gpu/drm/mediatek/mtk_hdmi.c | 14 +++++++++----- 12 files changed, 56 insertions(+), 39 deletions(-)drivers/gpu/drm/mediatek/mtk_disp_color.c +1
-1@@ -3,9 +3,9 @@* Copyright (c) 2017 MediaTek Inc. */ -#include <drm/drmP.h> #include <linux/clk.h> #include <linux/component.h> +#include <linux/module.h> #include <linux/of_device.h> #include <linux/of_irq.h> #include <linux/platform_device.h> drivers/gpu/drm/mediatek/mtk_disp_ovl.c +1
-1@@ -3,9 +3,9 @@* Copyright (c) 2015 MediaTek Inc. */ -#include <drm/drmP.h> #include <linux/clk.h> #include <linux/component.h> +#include <linux/module.h> #include <linux/of_device.h> #include <linux/of_irq.h> #include <linux/platform_device.h> drivers/gpu/drm/mediatek/mtk_disp_rdma.c +1
-1@@ -3,9 +3,9 @@* Copyright (c) 2015 MediaTek Inc. */ -#include <drm/drmP.h> #include <linux/clk.h> #include <linux/component.h> +#include <linux/module.h> #include <linux/of_device.h> #include <linux/of_irq.h> #include <linux/platform_device.h> drivers/gpu/drm/mediatek/mtk_dpi.c +10
-8@@ -3,21 +3,23 @@* Copyright (c) 2014 MediaTek Inc. * Author: Jie Qiu <[email protected]> */ -#include <drm/drmP.h> -#include <drm/drm_crtc.h> -#include <drm/drm_atomic_helper.h> -#include <drm/drm_of.h> -#include <linux/kernel.h> + +#include <linux/clk.h> #include <linux/component.h> -#include <linux/platform_device.h> +#include <linux/interrupt.h> +#include <linux/kernel.h> #include <linux/of.h> #include <linux/of_device.h> #include <linux/of_graph.h> -#include <linux/interrupt.h> +#include <linux/platform_device.h> #include <linux/types.h> -#include <linux/clk.h> +#include <video/videomode.h> +#include <drm/drm_atomic_helper.h> +#include <drm/drm_crtc.h> +#include <drm/drm_of.h> +#include "mtk_dpi_regs.h" #include "mtk_drm_ddp_comp.h" drivers/gpu/drm/mediatek/mtk_drm_crtc.c +6
-4@@ -3,14 +3,16 @@* Copyright (c) 2015 MediaTek Inc. */ +#include <linux/clk.h> +#include <linux/pm_runtime.h> +#include <asm/barrier.h> -#include <drm/drmP.h> +#include <soc/mediatek/smi.h> +#include <drm/drm_atomic_helper.h> #include <drm/drm_plane_helper.h> #include <drm/drm_probe_helper.h> -#include <linux/clk.h> -#include <linux/pm_runtime.h> -#include <soc/mediatek/smi.h> +#include <drm/drm_vblank.h> #include "mtk_drm_drv.h" #include "mtk_drm_crtc.h" drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c +1
-1@@ -12,7 +12,7 @@#include <linux/of_irq.h> #include <linux/of_platform.h> #include <linux/platform_device.h> -#include <drm/drmP.h> +#include "mtk_drm_drv.h" #include "mtk_drm_plane.h" #include "mtk_drm_ddp_comp.h" drivers/gpu/drm/mediatek/mtk_drm_drv.c +10
-6@@ -4,22 +4,26 @@* Author: YT SHEN <[email protected]> */ -#include <drm/drmP.h> +#include <linux/component.h> +#include <linux/iommu.h> +#include <linux/module.h> +#include <linux/of_address.h> +#include <linux/of_platform.h> +#include <linux/pm_runtime.h> +#include <drm/drm_atomic.h> #include <drm/drm_atomic_helper.h> +#include <drm/drm_drv.h> #include <drm/drm_fb_helper.h> #include <drm/drm_gem.h> #include <drm/drm_gem_cma_helper.h> #include <drm/drm_of.h> #include <drm/drm_probe_helper.h> -#include <linux/component.h> -#include <linux/iommu.h> -#include <linux/of_address.h> -#include <linux/of_platform.h> -#include <linux/pm_runtime.h> +#include <drm/drm_vblank.h> #include "mtk_drm_crtc.h" #include "mtk_drm_ddp.h" +#include "mtk_drm_ddp.h" #include "mtk_drm_ddp_comp.h" #include "mtk_drm_drv.h" #include "mtk_drm_fb.h" drivers/gpu/drm/mediatek/mtk_drm_fb.c +4
-3@@ -3,13 +3,14 @@* Copyright (c) 2015 MediaTek Inc. */ -#include <drm/drmP.h> +#include <linux/dma-buf.h> +#include <linux/reservation.h> +#include <drm/drm_modeset_helper.h> #include <drm/drm_fb_helper.h> +#include <drm/drm_fourcc.h> #include <drm/drm_gem.h> #include <drm/drm_gem_framebuffer_helper.h> -#include <linux/dma-buf.h> -#include <linux/reservation.h> #include "mtk_drm_drv.h" #include "mtk_drm_fb.h" drivers/gpu/drm/mediatek/mtk_drm_gem.c +4
-2@@ -3,10 +3,12 @@* Copyright (c) 2015 MediaTek Inc. */ -#include <drm/drmP.h> -#include <drm/drm_gem.h> #include <linux/dma-buf.h> +#include <drm/drm_device.h> +#include <drm/drm_gem.h> +#include <drm/drm_prime.h> +#include "mtk_drm_drv.h" #include "mtk_drm_gem.h" drivers/gpu/drm/mediatek/mtk_drm_plane.c +1
-1@@ -4,9 +4,9 @@* Author: CK Hu <[email protected]> */ -#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 <drm/drm_gem_framebuffer_helper.h> drivers/gpu/drm/mediatek/mtk_dsi.c +8
-6@@ -3,12 +3,6 @@* Copyright (c) 2015 MediaTek Inc. */ -#include <drm/drmP.h> -#include <drm/drm_atomic_helper.h> -#include <drm/drm_mipi_dsi.h> -#include <drm/drm_panel.h> -#include <drm/drm_of.h> -#include <drm/drm_probe_helper.h> #include <linux/clk.h> #include <linux/component.h> #include <linux/iopoll.h> @@ -17,9 +11,17 @@#include <linux/of_platform.h> #include <linux/phy/phy.h> #include <linux/platform_device.h> +#include <video/mipi_display.h> #include <video/videomode.h> +#include <drm/drm_atomic_helper.h> +#include <drm/drm_mipi_dsi.h> +#include <drm/drm_of.h> +#include <drm/drm_panel.h> +#include <drm/drm_print.h> +#include <drm/drm_probe_helper.h> +#include "mtk_drm_ddp_comp.h" #define DSI_START 0x00drivers/gpu/drm/mediatek/mtk_hdmi.c +9
-6@@ -3,11 +3,7 @@* Copyright (c) 2014 MediaTek Inc. * Author: Jie Qiu <[email protected]> */ -#include <drm/drmP.h> -#include <drm/drm_atomic_helper.h> -#include <drm/drm_crtc.h> -#include <drm/drm_probe_helper.h> -#include <drm/drm_edid.h> +#include <linux/arm-smccc.h> #include <linux/clk.h> #include <linux/delay.h> @@ -23,7 +19,15 @@#include <linux/phy/phy.h> #include <linux/platform_device.h> #include <linux/regmap.h> +#include <sound/hdmi-codec.h> + +#include <drm/drm_atomic_helper.h> +#include <drm/drm_crtc.h> +#include <drm/drm_edid.h> +#include <drm/drm_print.h> +#include <drm/drm_probe_helper.h> +#include "mtk_cec.h" #include "mtk_hdmi.h" #include "mtk_hdmi_regs.h" --2.20.1
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
Copied all recipients on the cover letter.
As the list is long this mail may not hit the mailing lists.
Sam
Quoted 194 lines · Sam Ravnborg
This patch set removes a far share of the remaining uses of
drmP.h. Common for all patches are that the respective files are maintained in drm-misc.
All patches are independent.Patches have all been build tested with various configs and various architectures.
There are likely introduced a few build issues that randconfig build will reveal, but for all configs I have used the build was OK.This patchset does not conclude the quest to kill all uses of
drmP.h, but it is a major step towards the goal.Please review/ack.
I plan to apply the patches to drm-misc, but feel free to do it yourself.There will be conflicts with the ongoing work on ttm, gem etc. But let's deal with the conflicts when they hit us - it is simple conflicts in the list of include files.
v2:
- Removed merged patches
- Added ack from Emil Velikov to the full series
- Rebased on top of drm-misc-next
- Hand-edited the list of Cc: as get_maintainer.pl in some cases looks up too much people, due to cross kernel commitsSam
Sam Ravnborg (19):
drm/meson: drop use ofdrmP.h
drm/v3d: drop use ofdrmP.h
drm/pl111: drop use ofdrmP.h
drm/zte: drop use ofdrmP.h
drm/sun4i: drop use ofdrmP.h
drm/vc4: drop use ofdrmP.h
drm/r128: drop use ofdrmP.h
drm/udl: drop use ofdrmP.h
drm/omapdrm: drop use ofdrmP.h
drm/selftests: drop use ofdrmP.h
drm/tdfx: drop use ofdrmP.h
drm/vgem: drop use ofdrmP.h
drm/i810: drop use ofdrmP.h
drm/tilcdc: drop use ofdrmP.h
drm/i2c/ch7006: drop use ofdrmP.h
drm/i2c/sil164: drop use ofdrmP.h
drm/imx: drop use ofdrmP.h
drm/rockchip: drop use ofdrmP.h
drm/mediatek: drop use ofdrmP.hdrivers/gpu/drm/i2c/ch7006_priv.h | 1 - drivers/gpu/drm/i2c/sil164_drv.c | 3 ++- drivers/gpu/drm/i810/i810_dma.c | 17 +++++++++---- drivers/gpu/drm/i810/i810_drv.c | 8 +++--- drivers/gpu/drm/i810/i810_drv.h | 2 ++ drivers/gpu/drm/imx/dw_hdmi-imx.c | 14 ++++++----- drivers/gpu/drm/imx/imx-drm-core.c | 8 ++++-- drivers/gpu/drm/imx/imx-ldb.c | 22 +++++++++-------- drivers/gpu/drm/imx/imx-tve.c | 10 +++++--- drivers/gpu/drm/imx/ipuv3-crtc.c | 8 ++++-- drivers/gpu/drm/imx/ipuv3-plane.c | 5 ++-- drivers/gpu/drm/imx/parallel-display.c | 8 +++--- drivers/gpu/drm/mediatek/mtk_disp_color.c | 2 +- drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 2 +- drivers/gpu/drm/mediatek/mtk_disp_rdma.c | 2 +- drivers/gpu/drm/mediatek/mtk_dpi.c | 18 ++++++++------ drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 10 +++++--- drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c | 2 +- drivers/gpu/drm/mediatek/mtk_drm_drv.c | 16 +++++++----- drivers/gpu/drm/mediatek/mtk_drm_fb.c | 7 +++--- drivers/gpu/drm/mediatek/mtk_drm_gem.c | 6 +++-- drivers/gpu/drm/mediatek/mtk_drm_plane.c | 2 +- drivers/gpu/drm/mediatek/mtk_dsi.c | 14 ++++++----- drivers/gpu/drm/mediatek/mtk_hdmi.c | 14 +++++++---- drivers/gpu/drm/meson/meson_crtc.c | 16 ++++++------ drivers/gpu/drm/meson/meson_drv.c | 27 +++++++++------------ drivers/gpu/drm/meson/meson_drv.h | 11 ++++++--- drivers/gpu/drm/meson/meson_dw_hdmi.c | 19 ++++++++------- drivers/gpu/drm/meson/meson_overlay.c | 13 ++++------ drivers/gpu/drm/meson/meson_plane.c | 16 +++++------- drivers/gpu/drm/meson/meson_registers.h | 2 ++ drivers/gpu/drm/meson/meson_vclk.c | 7 +++--- drivers/gpu/drm/meson/meson_vclk.h | 4 +++ drivers/gpu/drm/meson/meson_venc.c | 10 ++++---- drivers/gpu/drm/meson/meson_venc.h | 2 ++ drivers/gpu/drm/meson/meson_venc_cvbs.c | 11 ++++----- drivers/gpu/drm/meson/meson_viu.c | 7 ++---- drivers/gpu/drm/meson/meson_vpp.c | 7 +++--- drivers/gpu/drm/meson/meson_vpp.h | 3 +++ drivers/gpu/drm/omapdrm/omap_crtc.c | 4 ++- drivers/gpu/drm/omapdrm/omap_debugfs.c | 2 ++ drivers/gpu/drm/omapdrm/omap_drv.c | 10 ++++++-- drivers/gpu/drm/omapdrm/omap_drv.h | 5 ++-- drivers/gpu/drm/omapdrm/omap_fb.c | 4 +-- drivers/gpu/drm/omapdrm/omap_fbdev.c | 2 ++ drivers/gpu/drm/omapdrm/omap_gem.c | 2 ++ drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c | 3 +++ drivers/gpu/drm/omapdrm/omap_irq.c | 2 ++ drivers/gpu/drm/pl111/pl111_debugfs.c | 4 ++- drivers/gpu/drm/pl111/pl111_display.c | 6 +++-- drivers/gpu/drm/pl111/pl111_drm.h | 11 +++++---- drivers/gpu/drm/pl111/pl111_drv.c | 9 ++++--- drivers/gpu/drm/pl111/pl111_nomadik.h | 3 ++- drivers/gpu/drm/pl111/pl111_versatile.c | 9 ++++--- drivers/gpu/drm/pl111/pl111_versatile.h | 3 +++ drivers/gpu/drm/r128/r128_ioc32.c | 3 ++- drivers/gpu/drm/r128/r128_irq.c | 5 +++- drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 10 +++----- drivers/gpu/drm/rockchip/cdn-dp-core.c | 17 ++++++------- drivers/gpu/drm/rockchip/cdn-dp-core.h | 2 +- drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c | 9 ++++--- drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 5 ++-- drivers/gpu/drm/rockchip/inno_hdmi.c | 3 +-- drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 12 +++++---- drivers/gpu/drm/rockchip/rockchip_drm_fb.c | 3 ++- drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c | 2 +- drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 8 +++--- drivers/gpu/drm/rockchip/rockchip_drm_psr.c | 1 - drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 31 ++++++++++++------------ drivers/gpu/drm/rockchip/rockchip_lvds.c | 16 ++++++------ drivers/gpu/drm/rockchip/rockchip_rgb.c | 9 +++---- drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 11 ++++++--- drivers/gpu/drm/selftests/test-drm_framebuffer.c | 7 +++++- drivers/gpu/drm/sun4i/sun4i_backend.c | 16 ++++++------ drivers/gpu/drm/sun4i/sun4i_crtc.c | 13 +++++----- drivers/gpu/drm/sun4i/sun4i_drv.c | 5 +++- drivers/gpu/drm/sun4i/sun4i_framebuffer.c | 1 - drivers/gpu/drm/sun4i/sun4i_frontend.c | 10 +++++--- drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 17 +++++++------ drivers/gpu/drm/sun4i/sun4i_layer.c | 3 +-- drivers/gpu/drm/sun4i/sun4i_lvds.c | 2 +- drivers/gpu/drm/sun4i/sun4i_rgb.c | 2 +- drivers/gpu/drm/sun4i/sun4i_tcon.c | 20 ++++++++------- drivers/gpu/drm/sun4i/sun4i_tv.c | 4 ++- drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c | 9 ++++--- drivers/gpu/drm/sun4i/sun8i_csc.c | 2 +- drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c | 3 +-- drivers/gpu/drm/sun4i/sun8i_mixer.c | 14 +++++------ drivers/gpu/drm/sun4i/sun8i_tcon_top.c | 6 ++--- drivers/gpu/drm/sun4i/sun8i_ui_layer.c | 2 +- drivers/gpu/drm/sun4i/sun8i_vi_layer.c | 1 - drivers/gpu/drm/tdfx/tdfx_drv.c | 11 ++++++--- drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 18 ++++++++------ drivers/gpu/drm/tilcdc/tilcdc_drv.c | 19 ++++++++++++--- drivers/gpu/drm/tilcdc/tilcdc_drv.h | 31 +++++++++++++----------- drivers/gpu/drm/tilcdc/tilcdc_external.c | 1 + drivers/gpu/drm/tilcdc/tilcdc_panel.c | 11 ++++++--- drivers/gpu/drm/tilcdc/tilcdc_plane.c | 4 +-- drivers/gpu/drm/tilcdc/tilcdc_tfp410.c | 8 +++--- drivers/gpu/drm/udl/udl_connector.c | 4 +-- drivers/gpu/drm/udl/udl_connector.h | 2 ++ drivers/gpu/drm/udl/udl_dmabuf.c | 6 +++-- drivers/gpu/drm/udl/udl_drv.c | 7 +++++- drivers/gpu/drm/udl/udl_drv.h | 8 +++++- drivers/gpu/drm/udl/udl_encoder.c | 6 ++--- drivers/gpu/drm/udl/udl_fb.c | 15 ++++++------ drivers/gpu/drm/udl/udl_gem.c | 9 ++++--- drivers/gpu/drm/udl/udl_main.c | 6 +++-- drivers/gpu/drm/udl/udl_modeset.c | 6 ++--- drivers/gpu/drm/udl/udl_transfer.c | 4 --- drivers/gpu/drm/v3d/v3d_debugfs.c | 3 ++- drivers/gpu/drm/v3d/v3d_drv.c | 5 +++- drivers/gpu/drm/v3d/v3d_drv.h | 13 ++++++++-- drivers/gpu/drm/v3d/v3d_gem.c | 12 +++++---- drivers/gpu/drm/v3d/v3d_irq.c | 2 ++ drivers/gpu/drm/vc4/vc4_crtc.c | 11 ++++++--- drivers/gpu/drm/vc4/vc4_debugfs.c | 1 - drivers/gpu/drm/vc4/vc4_drv.c | 7 +++++- drivers/gpu/drm/vc4/vc4_drv.h | 17 +++++++++---- drivers/gpu/drm/vc4/vc4_dsi.c | 17 +++++++------ drivers/gpu/drm/vc4/vc4_gem.c | 2 ++ drivers/gpu/drm/vc4/vc4_hvs.c | 5 +++- drivers/gpu/drm/vc4/vc4_kms.c | 4 ++- drivers/gpu/drm/vc4/vc4_plane.c | 6 +++-- drivers/gpu/drm/vc4/vc4_txp.c | 14 ++++++----- drivers/gpu/drm/vc4/vc4_v3d.c | 4 +++ drivers/gpu/drm/vgem/vgem_drv.c | 11 +++++++-- drivers/gpu/drm/vgem/vgem_drv.h | 1 - drivers/gpu/drm/vgem/vgem_fence.c | 2 ++ drivers/gpu/drm/zte/zx_drm_drv.c | 3 ++- drivers/gpu/drm/zte/zx_hdmi.c | 2 +- drivers/gpu/drm/zte/zx_plane.c | 2 +- drivers/gpu/drm/zte/zx_tvenc.c | 4 ++- drivers/gpu/drm/zte/zx_vga.c | 4 ++- drivers/gpu/drm/zte/zx_vou.c | 5 +++- include/linux/soc/amlogic/meson-canvas.h | 1 + 136 files changed, 626 insertions(+), 427 deletions(-)_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 33 lines · Sam Ravnborg
Copied all recipients on the cover letter.
As the list is long this mail may not hit the mailing lists.Sam
Quoted 27 lines · Sam Ravnborg
This patch set removes a far share of the remaining uses of
drmP.h. Common for all patches are that the respective files are maintained in drm-misc.
All patches are independent.Patches have all been build tested with various configs and various architectures.
There are likely introduced a few build issues that randconfig build will reveal, but for all configs I have used the build was OK.This patchset does not conclude the quest to kill all uses of
drmP.h, but it is a major step towards the goal.Please review/ack.
I plan to apply the patches to drm-misc, but feel free to do it yourself.There will be conflicts with the ongoing work on ttm, gem etc. But let's deal with the conflicts when they hit us - it is simple conflicts in the list of include files.
v2:
- Removed merged patches
- Added ack from Emil Velikov to the full series
- Rebased on top of drm-misc-next
- Hand-edited the list of Cc: as get_maintainer.pl in some cases looks up too much people, due to cross kernel commits
I have collected the additional r-bs and acks and pushed out the full series. Thanks for feedback to everyone!
Sam
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
A message that is not in the archive (sent off-list or not yet received): [email protected]
Alex Deucher
Reviewed-byRe: [PATCH v2 04/19] drm/zte: drop use of drmP.h
Quoted 9 lines · Sam Ravnborg
Drop use of the deprecated
drmP.hheader file.
Fix fallout.Signed-off-by Sam Ravnborg <[email protected]>Acked-by Emil Velikov <[email protected]>Cc Shawn Guo <[email protected]>Cc David Airlie <[email protected]>Cc Daniel Vetter <[email protected]>
Quoted 123 lines
--- drivers/gpu/drm/zte/zx_drm_drv.c | 3 ++- drivers/gpu/drm/zte/zx_hdmi.c | 2 +- drivers/gpu/drm/zte/zx_plane.c | 2 +- drivers/gpu/drm/zte/zx_tvenc.c | 4 +++- drivers/gpu/drm/zte/zx_vga.c | 4 +++- drivers/gpu/drm/zte/zx_vou.c | 5 ++++- 6 files changed, 14 insertions(+), 6 deletions(-)drivers/gpu/drm/zte/zx_drm_drv.c +2
-1@@ -18,13 +18,14 @@#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_of.h> #include <drm/drm_probe_helper.h> -#include <drm/drmP.h> +#include <drm/drm_vblank.h> #include "zx_drm_drv.h" #include "zx_vou.h" drivers/gpu/drm/zte/zx_hdmi.c +1
-1@@ -23,7 +23,7 @@#include <drm/drm_edid.h> #include <drm/drm_of.h> #include <drm/drm_probe_helper.h> -#include <drm/drmP.h> +#include <drm/drm_print.h> #include <sound/hdmi-codec.h> drivers/gpu/drm/zte/zx_plane.c +1
-1@@ -11,10 +11,10 @@#include <drm/drm_atomic.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_fb_cma_helper.h> +#include <drm/drm_fourcc.h> #include <drm/drm_gem_cma_helper.h> #include <drm/drm_modeset_helper_vtables.h> #include <drm/drm_plane_helper.h> -#include <drm/drmP.h> #include "zx_common_regs.h" #include "zx_drm_drv.h" drivers/gpu/drm/zte/zx_tvenc.c +3
-1@@ -11,11 +11,13 @@#include <linux/clk.h> #include <linux/component.h> #include <linux/mfd/syscon.h> +#include <linux/module.h> +#include <linux/platform_device.h> #include <linux/regmap.h> #include <drm/drm_atomic_helper.h> +#include <drm/drm_print.h> #include <drm/drm_probe_helper.h> -#include <drm/drmP.h> #include "zx_drm_drv.h" #include "zx_tvenc_regs.h" drivers/gpu/drm/zte/zx_vga.c +3
-1@@ -10,11 +10,13 @@#include <linux/clk.h> #include <linux/component.h> #include <linux/mfd/syscon.h> +#include <linux/module.h> +#include <linux/platform_device.h> #include <linux/regmap.h> #include <drm/drm_atomic_helper.h> +#include <drm/drm_print.h> #include <drm/drm_probe_helper.h> -#include <drm/drmP.h> #include "zx_drm_drv.h" #include "zx_vga_regs.h" drivers/gpu/drm/zte/zx_vou.c +4
-2@@ -10,7 +10,10 @@#include <linux/clk.h> #include <linux/component.h> +#include <linux/module.h> #include <linux/of_address.h> +#include <linux/platform_device.h> +#include <video/videomode.h> #include <drm/drm_atomic_helper.h> @@ -21,7 +24,7 @@#include <drm/drm_of.h> #include <drm/drm_plane_helper.h> #include <drm/drm_probe_helper.h> -#include <drm/drmP.h> +#include <drm/drm_vblank.h> #include "zx_common_regs.h" #include "zx_drm_drv.h" --2.20.1
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
A message that is not in the archive (sent off-list or not yet received): [email protected]
Alex Deucher
Reviewed-byRe: [PATCH v2 06/19] drm/vc4: drop use of drmP.h
Quoted 11 lines · Sam Ravnborg
Drop use of the deprecated header
drmP.h.
Fix sovc4_drv.his now self-contained, and fixed fall-out in remaining files.Divided include files in blocks.
Sorted include files within their blocks.Signed-off-by Sam Ravnborg <[email protected]>Acked-by Emil Velikov <[email protected]>Cc Eric Anholt <[email protected]>
Quoted 271 lines
--- drivers/gpu/drm/vc4/vc4_crtc.c | 11 +++++++---- drivers/gpu/drm/vc4/vc4_debugfs.c | 1 - drivers/gpu/drm/vc4/vc4_drv.c | 7 ++++++- drivers/gpu/drm/vc4/vc4_drv.h | 17 ++++++++++++----- drivers/gpu/drm/vc4/vc4_dsi.c | 17 ++++++++++------- drivers/gpu/drm/vc4/vc4_gem.c | 2 ++ drivers/gpu/drm/vc4/vc4_hvs.c | 5 ++++- drivers/gpu/drm/vc4/vc4_kms.c | 4 +++- drivers/gpu/drm/vc4/vc4_plane.c | 6 ++++-- drivers/gpu/drm/vc4/vc4_txp.c | 14 ++++++++------ drivers/gpu/drm/vc4/vc4_v3d.c | 4 ++++ 11 files changed, 60 insertions(+), 28 deletions(-)drivers/gpu/drm/vc4/vc4_crtc.c +7
-4@@ -32,15 +32,18 @@* ones that set the clock. */ +#include <linux/clk.h> +#include <linux/component.h> +#include <linux/of_device.h> +#include <drm/drm_atomic.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_atomic_uapi.h> +#include <drm/drm_fb_cma_helper.h> #include <drm/drm_print.h> #include <drm/drm_probe_helper.h> -#include <linux/clk.h> -#include <drm/drm_fb_cma_helper.h> -#include <linux/component.h> -#include <linux/of_device.h> +#include <drm/drm_vblank.h> +#include "vc4_drv.h" #include "vc4_regs.h" drivers/gpu/drm/vc4/vc4_debugfs.c +0
-1@@ -10,7 +10,6 @@#include <linux/circ_buf.h> #include <linux/ctype.h> #include <linux/debugfs.h> -#include <drm/drmP.h> #include "vc4_drv.h" #include "vc4_regs.h" drivers/gpu/drm/vc4/vc4_drv.c +6
-1@@ -26,16 +26,21 @@#include <linux/clk.h> #include <linux/component.h> #include <linux/device.h> +#include <linux/dma-mapping.h> #include <linux/io.h> #include <linux/module.h> #include <linux/of_platform.h> #include <linux/platform_device.h> #include <linux/pm_runtime.h> + +#include <drm/drm_atomic_helper.h> +#include <drm/drm_drv.h> #include <drm/drm_fb_cma_helper.h> #include <drm/drm_fb_helper.h> -#include <drm/drm_atomic_helper.h> +#include <drm/drm_vblank.h> #include "uapi/drm/vc4_drm.h" +#include "vc4_drv.h" #include "vc4_regs.h" drivers/gpu/drm/vc4/vc4_drv.h +12
-5@@ -6,16 +6,23 @@* published by the Free Software Foundation. */ -#include <linux/mm_types.h> -#include <drm/drmP.h> -#include <drm/drm_util.h> +#include <linux/delay.h> +#include <linux/refcount.h> +#include <linux/uaccess.h> + +#include <drm/drm_atomic.h> +#include <drm/drm_debugfs.h> +#include <drm/drm_device.h> #include <drm/drm_encoder.h> #include <drm/drm_gem_cma_helper.h> -#include <drm/drm_atomic.h> -#include <drm/drm_syncobj.h> +#include <drm/drm_mm.h> +#include <drm/drm_modeset_lock.h> #include "uapi/drm/vc4_drm.h" +struct drm_device ; +struct drm_gem_object ; +/* Don't forget to update vc4_bo.c: bo_type_names[] when adding to * this. */ drivers/gpu/drm/vc4/vc4_dsi.c +10
-7@@ -29,22 +29,25 @@* hopefully present. */ -#include <drm/drm_atomic_helper.h> -#include <drm/drm_edid.h> -#include <drm/drm_mipi_dsi.h> -#include <drm/drm_of.h> -#include <drm/drm_panel.h> -#include <drm/drm_probe_helper.h> -#include <linux/clk.h> #include <linux/clk-provider.h> +#include <linux/clk.h> #include <linux/completion.h> #include <linux/component.h> +#include <linux/dma-mapping.h> #include <linux/dmaengine.h> #include <linux/i2c.h> #include <linux/io.h> #include <linux/of_address.h> #include <linux/of_platform.h> #include <linux/pm_runtime.h> + +#include <drm/drm_atomic_helper.h> +#include <drm/drm_edid.h> +#include <drm/drm_mipi_dsi.h> +#include <drm/drm_of.h> +#include <drm/drm_panel.h> +#include <drm/drm_probe_helper.h> +#include "vc4_drv.h" #include "vc4_regs.h" drivers/gpu/drm/vc4/vc4_gem.c +2
-0@@ -29,6 +29,8 @@#include <linux/sched/signal.h> #include <linux/dma-fence-array.h> +#include <drm/drm_syncobj.h> +#include "uapi/drm/vc4_drm.h" #include "vc4_drv.h" #include "vc4_regs.h" drivers/gpu/drm/vc4/vc4_hvs.c +4
-1@@ -22,8 +22,11 @@* each CRTC. */ -#include <drm/drm_atomic_helper.h> #include <linux/component.h> +#include <linux/platform_device.h> + +#include <drm/drm_atomic_helper.h> +#include "vc4_drv.h" #include "vc4_regs.h" drivers/gpu/drm/vc4/vc4_kms.c +3
-1@@ -14,12 +14,14 @@* crtc, HDMI encoder). */ -#include <drm/drm_crtc.h> #include <drm/drm_atomic.h> #include <drm/drm_atomic_helper.h> +#include <drm/drm_crtc.h> #include <drm/drm_gem_framebuffer_helper.h> #include <drm/drm_plane_helper.h> #include <drm/drm_probe_helper.h> +#include <drm/drm_vblank.h> +#include "vc4_drv.h" #include "vc4_regs.h" drivers/gpu/drm/vc4/vc4_plane.c +4
-2@@ -20,12 +20,14 @@#include <drm/drm_atomic.h> #include <drm/drm_atomic_helper.h> -#include <drm/drm_fb_cma_helper.h> -#include <drm/drm_plane_helper.h> #include <drm/drm_atomic_uapi.h> +#include <drm/drm_fb_cma_helper.h> +#include <drm/drm_fourcc.h> #include <drm/drm_gem_framebuffer_helper.h> +#include <drm/drm_plane_helper.h> #include "uapi/drm/vc4_drm.h" +#include "vc4_drv.h" #include "vc4_regs.h" drivers/gpu/drm/vc4/vc4_txp.c +8
-6@@ -7,18 +7,20 @@* Boris Brezillon <[email protected]> */ -#include <drm/drm_atomic_helper.h> -#include <drm/drm_fb_cma_helper.h> -#include <drm/drm_edid.h> -#include <drm/drm_panel.h> -#include <drm/drm_probe_helper.h> -#include <drm/drm_writeback.h> #include <linux/clk.h> #include <linux/component.h> #include <linux/of_graph.h> #include <linux/of_platform.h> #include <linux/pm_runtime.h> +#include <drm/drm_atomic_helper.h> +#include <drm/drm_edid.h> +#include <drm/drm_fb_cma_helper.h> +#include <drm/drm_fourcc.h> +#include <drm/drm_panel.h> +#include <drm/drm_probe_helper.h> +#include <drm/drm_writeback.h> +#include "vc4_drv.h" #include "vc4_regs.h" drivers/gpu/drm/vc4/vc4_v3d.c +4
-1@@ -18,7 +18,11 @@#include <linux/clk.h> #include <linux/component.h> +#include <linux/platform_device.h> #include <linux/pm_runtime.h> + +#include <drm/drm_irq.h> +#include "vc4_drv.h" #include "vc4_regs.h" --2.20.1
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
A message that is not in the archive (sent off-list or not yet received): [email protected]
Alex Deucher
Reviewed-byRe: [PATCH v2 08/19] drm/udl: drop use of drmP.h
Quoted 7 lines · Sam Ravnborg
The
drmP.hheader file is deprecated.
Drop it from all files in the udl driver.Made the header files self contained, which then made it simpler to update the .c files.
Quoted 15 lines
Signed-off-by Sam Ravnborg <[email protected]>Acked-by Emil Velikov <[email protected]>Cc Sean Paul <[email protected]>Cc David Airlie <[email protected]>Cc Daniel Vetter <[email protected]>Cc Jani Nikula <[email protected]>Cc Robert Tarasov <[email protected]>Cc Oleksandr Andrushchenko <[email protected]>Cc Alex Deucher <[email protected]>Cc Thomas Zimmermann <[email protected]>Cc "Noralf Trønnes" <[email protected]>Cc Eric Anholt <[email protected]>Cc Mikulas Patocka <[email protected]>Cc Emil Lundmark <[email protected]>Cc Eugeniy Paltsev <[email protected]>
Quoted 229 lines
--- drivers/gpu/drm/udl/udl_connector.c | 4 +--- drivers/gpu/drm/udl/udl_connector.h | 2 ++ drivers/gpu/drm/udl/udl_dmabuf.c | 6 ++++-- drivers/gpu/drm/udl/udl_drv.c | 7 ++++++- drivers/gpu/drm/udl/udl_drv.h | 8 +++++++- drivers/gpu/drm/udl/udl_encoder.c | 6 +++--- drivers/gpu/drm/udl/udl_fb.c | 15 +++++++-------- drivers/gpu/drm/udl/udl_gem.c | 9 ++++++--- drivers/gpu/drm/udl/udl_main.c | 6 ++++-- drivers/gpu/drm/udl/udl_modeset.c | 6 +++--- drivers/gpu/drm/udl/udl_transfer.c | 4 ---- 11 files changed, 43 insertions(+), 30 deletions(-)drivers/gpu/drm/udl/udl_connector.c +1
-3@@ -7,11 +7,9 @@* Copyright (C) 2009 Bernie Thompson <[email protected]> */ -#include <drm/drmP.h> -#include <drm/drm_crtc.h> -#include <drm/drm_edid.h> #include <drm/drm_crtc_helper.h> #include <drm/drm_probe_helper.h> +#include "udl_connector.h" #include "udl_drv.h" drivers/gpu/drm/udl/udl_connector.h +2
-0@@ -3,6 +3,8 @@#include <drm/drm_crtc.h> +struct edid ; +struct udl_drm_connector {struct drm_connector connector;/* last udl_detect edid */ drivers/gpu/drm/udl/udl_dmabuf.c +4
-2@@ -5,11 +5,13 @@* Copyright (c) 2014 The Chromium OS Authors */ -#include <drm/drmP.h> -#include "udl_drv.h" #include <linux/shmem_fs.h> #include <linux/dma-buf.h> +#include <drm/drm_prime.h> + +#include "udl_drv.h" +struct udl_drm_dmabuf_attachment {struct sg_table sgt;enum dma_data_direction dir;drivers/gpu/drm/udl/udl_drv.c +6
-1@@ -4,9 +4,14 @@*/ #include <linux/module.h> -#include <drm/drmP.h> +#include <drm/drm_crtc_helper.h> +#include <drm/drm_drv.h> +#include <drm/drm_file.h> +#include <drm/drm_ioctl.h> #include <drm/drm_probe_helper.h> +#include <drm/drm_print.h> +#include "udl_drv.h" static int udl_usb_suspend(struct usb_interface *interface,drivers/gpu/drm/udl/udl_drv.h +7
-1@@ -11,9 +11,15 @@#ifndef UDL_DRV_H #define UDL_DRV_H +#include <linux/mm_types.h> #include <linux/usb.h> + +#include <drm/drm_device.h> +#include <drm/drm_framebuffer.h> #include <drm/drm_gem.h> -#include <linux/mm_types.h> + +struct drm_encoder ; +struct drm_mode_create_dumb ;#define DRIVER_NAME "udl"#define DRIVER_DESC "DisplayLink"drivers/gpu/drm/udl/udl_encoder.c +3
-3@@ -7,9 +7,9 @@* Copyright (C) 2009 Bernie Thompson <[email protected]> */ -#include <drm/drmP.h> -#include <drm/drm_crtc.h> -#include <drm/drm_crtc_helper.h> +#include <drm/drm_encoder.h> +#include <drm/drm_modeset_helper_vtables.h> +#include "udl_drv.h" /* dummy encoder */ drivers/gpu/drm/udl/udl_fb.c +7
-8@@ -7,18 +7,17 @@* Copyright (C) 2009 Jaya Kumar <[email protected]> * Copyright (C) 2009 Bernie Thompson <[email protected]> */ -#include <linux/module.h> -#include <linux/slab.h> -#include <linux/fb.h> + +#include <linux/moduleparam.h> #include <linux/dma-buf.h> -#include <linux/mem_encrypt.h> -#include <drm/drmP.h> -#include <drm/drm_crtc.h> #include <drm/drm_crtc_helper.h> -#include "udl_drv.h" - +#include <drm/drm_drv.h> #include <drm/drm_fb_helper.h> +#include <drm/drm_fourcc.h> +#include <drm/drm_modeset_helper.h> + +#include "udl_drv.h" #define DL_DEFIO_WRITE_DELAY (HZ/20)/* fb_deferred_io.delay in jiffies */ drivers/gpu/drm/udl/udl_gem.c +6
-3@@ -3,10 +3,13 @@* Copyright (C) 2012 Red Hat */ -#include <drm/drmP.h> -#include "udl_drv.h" -#include <linux/shmem_fs.h> #include <linux/dma-buf.h> +#include <linux/vmalloc.h> + +#include <drm/drm_mode.h> +#include <drm/drm_prime.h> + +#include "udl_drv.h" struct udl_gem_object *udl_gem_alloc_object (struct drm_device *dev,size_t size)drivers/gpu/drm/udl/udl_main.c +4
-2@@ -7,9 +7,11 @@* Copyright (C) 2009 Jaya Kumar <[email protected]> * Copyright (C) 2009 Bernie Thompson <[email protected]> */ -#include <drm/drmP.h> -#include <drm/drm_crtc_helper.h> + +#include <drm/drm.h> +#include <drm/drm_print.h> #include <drm/drm_probe_helper.h> +#include "udl_drv.h" /* -BULK_SIZE as per usb-skeleton. Can we get full page and avoid overhead? */ drivers/gpu/drm/udl/udl_modeset.c +3
-3@@ -9,10 +9,10 @@*/ -#include <drm/drmP.h> -#include <drm/drm_crtc.h> #include <drm/drm_crtc_helper.h> -#include <drm/drm_plane_helper.h> +#include <drm/drm_modeset_helper_vtables.h> +#include <drm/drm_vblank.h> +#include "udl_drv.h" /* drivers/gpu/drm/udl/udl_transfer.c +0
-5@@ -7,12 +7,8 @@* Copyright (C) 2009 Bernie Thompson <[email protected]> */ -#include <linux/module.h> -#include <linux/slab.h> -#include <linux/fb.h> #include <asm/unaligned.h> -#include <drm/drmP.h> #include "udl_drv.h" #define MAX_CMD_PIXELS 255 --2.20.1
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
Re: [PATCH v2 08/19] drm/udl: drop use of drmP.h
Hi Alex.
Quoted 17 lines
Quoted 16 lines
Signed-off-by Sam Ravnborg <[email protected]>Acked-by Emil Velikov <[email protected]>Cc Sean Paul <[email protected]>Cc David Airlie <[email protected]>Cc Daniel Vetter <[email protected]>Cc Jani Nikula <[email protected]>Cc Robert Tarasov <[email protected]>Cc Oleksandr Andrushchenko <[email protected]>Cc Alex Deucher <[email protected]>Cc Thomas Zimmermann <[email protected]>Cc "Noralf Trønnes" <[email protected]>Cc Eric Anholt <[email protected]>Cc Mikulas Patocka <[email protected]>Cc Emil Lundmark <[email protected]>Cc Eugeniy Paltsev <[email protected]>
Quoted 1 line
Reviewed-by Alex Deucher <[email protected]>
Thanks for all your reviews - appreciated!
Sam
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 4 lines · Sam Ravnborg
This patch set removes a far share of the remaining uses of
drmP.h. Common for all patches are that the respective files are maintained in drm-misc.
All patches are independent.
For v3d, vc4, pl111:
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel