From patchwork Tue Jul 16 06:42:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Ravnborg X-Patchwork-Id: 11045291 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E281A13BD for ; Tue, 16 Jul 2019 06:43:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D1510284ED for ; Tue, 16 Jul 2019 06:43:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C4DB1285AF; Tue, 16 Jul 2019 06:43:10 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 13FA9284ED for ; Tue, 16 Jul 2019 06:43:09 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B42906E09E; Tue, 16 Jul 2019 06:43:07 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-lf1-x144.google.com (mail-lf1-x144.google.com [IPv6:2a00:1450:4864:20::144]) by gabe.freedesktop.org (Postfix) with ESMTPS id 82B6A6E09E for ; Tue, 16 Jul 2019 06:43:06 +0000 (UTC) Received: by mail-lf1-x144.google.com with SMTP id q26so12817186lfc.3 for ; Mon, 15 Jul 2019 23:43:06 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :mime-version:content-transfer-encoding; bh=wGYBUzltNzkGnUvS/hu47fzVDOcw/R4eBL0EAMIhfrE=; b=Eq0Po96Yb0MKOxaUHA4repQr895bzrPFxATX+vPriKK4kobaGcWanCqT9jj0g1KRTM Bbkdnxvf9+7XdiSepifAIF1Hntx9EnTP+A+AeUVkFB/viZ0iUr6wGWcXP5wl4ASyCruH nkOZPdHagZEvtHbBMOJqpXuQH5siLXg0aEjQYzW6EtYBxF2yLczTSGsFWJZHgeEORXIa EeQsqXoFJQKoRBrd/ewexSzAa4aESJ8St35dHib5TX4wOwxOJVML4l8kqQOoeO0rUK+5 it64sx90++lpA2tfd3ry6YYd5ZrepTw5E9ohpEd9JN9QAeVoHbhRmqoMLg929Ug6MRSd n+7w== X-Gm-Message-State: APjAAAVOAp+g6pX93MSSpPv0ft1z8ijx4m5DR1f+hMyVhFplm7MceITV KVApQxdeV4KHUEuOjfzVYAVovsnjBhc= X-Google-Smtp-Source: APXvYqwFNEdyfMcIMeFdd8LUMhnBUPZIpk5nhspuTStrRZMTTEbDAkmabrAtfkSPQZ5UAOZm/ImBTA== X-Received: by 2002:ac2:51a3:: with SMTP id f3mr13087590lfk.94.1563259384674; Mon, 15 Jul 2019 23:43:04 -0700 (PDT) Received: from saturn.lan (18.158-248-194.customer.lyse.net. [158.248.194.18]) by smtp.gmail.com with ESMTPSA id 27sm3529993ljw.97.2019.07.15.23.43.03 for (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 15 Jul 2019 23:43:03 -0700 (PDT) From: Sam Ravnborg To: dri-devel@lists.freedesktop.org Subject: [PATCH v2 0/19] drm: drop use of drmp.h in drm-misc Date: Tue, 16 Jul 2019 08:42:01 +0200 Message-Id: <20190716064220.18157-1-sam@ravnborg.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=wGYBUzltNzkGnUvS/hu47fzVDOcw/R4eBL0EAMIhfrE=; b=dSZgZft3Q0P1+kc0Xh5GP5eT5UDXK+RJJNxYzKdyEK0v5qEMp+h0ALWo+aQiK4WGF8 AoK0iFKuzPLNDujJ2JbHGYyjO9+lDq/wVu6zGRvnmQm/dggNCq1YFPUozncybB6IXFZS fyzXkDrlOFrFQmv8vtVf567JJlw/DUvcQhtZXyC6wGkA2DpMpJ9b+IxRCazPmQnyHiql UBZx/z8w/P00DS8r9qrkYXRuEr5eFasxPeMk3/Axn3n19dEGaieITOiD7Uh6Fqv/wXfp PlEu4gAnkprOxUrseSGUTC1/tB2eNBIuC/NHcHykPKbpL9yYhajvBLr0QOgmqgyExoZZ kLyA== X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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(-) Reviewed-by: Eric Anholt