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 except [PATCH 32] drm/ast,
[PATCH 31] drm/bochs and [PATCH 33] drm/hisilicon.
They need the fix to drm_vram_mm_helper.h [PATCH 30].
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.
Sam
Sam Ravnborg (33):
drm/meson: drop use of drmP.h
drm/xen: drop use of drmP.h
drm/stm: drop use of drmP.h
drm/tve200: drop use of drmP.h
drm/mxsfb: drop use of drmP.h
drm/v3d: drop use of drmP.h
drm/pl111: drop use of drmP.h
drm/fsl-dcu: drop use of drmP.h
drm/qxl: drop use of drmP.h
drm/zte: drop use of drmP.h
drm/sun4i: drop use of drmP.h
drm/vkms: drop use of drmP.h
drm/vc4: drop use of drmP.h
drm/atmel_hlcdc: 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/scheduler: drop use of drmP.h
drm/imx: drop use of drmP.h
drm/virtgpu: drop use of drmP.h
drm/rockchip: drop use of drmP.h
drm/mediatek: drop use of drmP.h
drm: add missing include to drm_vram_mm_helper.h
drm/bochs: drop use of drmP.h
drm/ast: drop use of drmP.h
drm/hisilicon: drop use of drmP.h
drivers/gpu/drm/ast/ast_dp501.c | 5 +++-
drivers/gpu/drm/ast/ast_drv.c | 9 +++++--
drivers/gpu/drm/ast/ast_drv.h | 17 +++++++------
drivers/gpu/drm/ast/ast_fb.c | 20 +++++++++------
drivers/gpu/drm/ast/ast_main.c | 9 +++++--
drivers/gpu/drm/ast/ast_mode.c | 8 ++++--
drivers/gpu/drm/ast/ast_post.c | 7 +++--
drivers/gpu/drm/ast/ast_ttm.c | 7 ++++-
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c | 12 ++++++---
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 12 +++++++++
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.h | 20 +++------------
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c | 3 ++-
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c | 10 ++++++++
drivers/gpu/drm/bochs/bochs.h | 6 ++---
drivers/gpu/drm/bochs/bochs_drv.c | 7 +++--
drivers/gpu/drm/bochs/bochs_hw.c | 4 +++
drivers/gpu/drm/bochs/bochs_kms.c | 8 +++---
drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_crtc.c | 5 ++--
drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c | 4 ++-
drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_kms.c | 1 -
drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c | 2 +-
drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c | 1 -
drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c | 6 +++++
drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 7 +++++
drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h | 9 +++----
drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_fbdev.c | 2 ++
drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c | 1 +
drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c | 6 +++++
drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 8 ++++--
drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 5 +++-
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/mxsfb/mxsfb_crtc.c | 16 +++++++-----
drivers/gpu/drm/mxsfb/mxsfb_drv.c | 11 +++++---
drivers/gpu/drm/mxsfb/mxsfb_out.c | 1 -
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/qxl/qxl_cmd.c | 2 ++
drivers/gpu/drm/qxl/qxl_debugfs.c | 4 +--
drivers/gpu/drm/qxl/qxl_display.c | 3 +++
drivers/gpu/drm/qxl/qxl_draw.c | 2 ++
drivers/gpu/drm/qxl/qxl_drv.c | 10 +++++---
drivers/gpu/drm/qxl/qxl_drv.h | 7 +++--
drivers/gpu/drm/qxl/qxl_gem.c | 1 -
drivers/gpu/drm/qxl/qxl_ioctl.c | 3 +++
drivers/gpu/drm/qxl/qxl_irq.c | 4 +++
drivers/gpu/drm/qxl/qxl_kms.c | 9 ++++---
drivers/gpu/drm/qxl/qxl_release.c | 6 ++++-
drivers/gpu/drm/qxl/qxl_ttm.c | 16 +++++++-----
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/scheduler/gpu_scheduler_trace.h | 2 --
drivers/gpu/drm/scheduler/sched_entity.c | 3 +++
drivers/gpu/drm/scheduler/sched_fence.c | 6 +++--
drivers/gpu/drm/scheduler/sched_main.c | 3 ++-
drivers/gpu/drm/selftests/test-drm_framebuffer.c | 7 ++++-
drivers/gpu/drm/stm/dw_mipi_dsi-stm.c | 10 +++++---
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/tve200/tve200_display.c | 8 +++---
drivers/gpu/drm/tve200/tve200_drm.h | 15 ++++++++---
drivers/gpu/drm/tve200/tve200_drv.c | 3 ++-
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/virtio/virtgpu_debugfs.c | 4 +--
drivers/gpu/drm/virtio/virtgpu_display.c | 7 +++--
drivers/gpu/drm/virtio/virtgpu_drv.c | 5 +++-
drivers/gpu/drm/virtio/virtgpu_drv.h | 6 ++---
drivers/gpu/drm/virtio/virtgpu_fence.c | 2 +-
drivers/gpu/drm/virtio/virtgpu_gem.c | 4 ++-
drivers/gpu/drm/virtio/virtgpu_ioctl.c | 8 +++---
drivers/gpu/drm/virtio/virtgpu_kms.c | 4 ++-
drivers/gpu/drm/virtio/virtgpu_plane.c | 6 +++--
drivers/gpu/drm/virtio/virtgpu_prime.c | 2 ++
drivers/gpu/drm/virtio/virtgpu_ttm.c | 13 +++++-----
drivers/gpu/drm/virtio/virtgpu_vq.c | 7 ++---
drivers/gpu/drm/vkms/vkms_crc.c | 5 +++-
drivers/gpu/drm/vkms/vkms_crtc.c | 4 ++-
drivers/gpu/drm/vkms/vkms_drv.c | 11 ++++++--
drivers/gpu/drm/vkms/vkms_drv.h | 4 +--
drivers/gpu/drm/vkms/vkms_gem.c | 1 +
drivers/gpu/drm/vkms/vkms_plane.c | 6 +++--
drivers/gpu/drm/xen/xen_drm_front.c | 11 +++++---
drivers/gpu/drm/xen/xen_drm_front.h | 12 ++++++---
drivers/gpu/drm/xen/xen_drm_front_cfg.c | 4 +--
drivers/gpu/drm/xen/xen_drm_front_conn.c | 1 +
drivers/gpu/drm/xen/xen_drm_front_conn.h | 7 +++--
drivers/gpu/drm/xen/xen_drm_front_evtchnl.c | 4 +--
drivers/gpu/drm/xen/xen_drm_front_gem.c | 11 ++++----
drivers/gpu/drm/xen/xen_drm_front_gem.h | 7 ++++-
drivers/gpu/drm/xen/xen_drm_front_kms.c | 7 ++---
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/drm/drm_vram_mm_helper.h | 2 ++
include/linux/soc/amlogic/meson-canvas.h | 1 +
217 files changed, 979 insertions(+), 605 deletions(-)
_______________________________________________
dri-devel mailing list
dri-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/dri-devel
