提交 29a84084 编写于 作者: D Daniel Vetter

drm/<driver>: drm_gem_plane_helper_prepare_fb is now the default

No need to set it explicitly.
Acked-by: NPhilipp Zabel <p.zabel@pengutronix.de>
Acked-by: NHeiko Stuebner <heiko@sntech.de>
Acked-by: NPaul Cercueil <paul@crapouillou.net>
Acked-by: NJernej Skrabec <jernej.skrabec@gmail.com>
Acked-by: NChun-Kuang Hu <chunkuang.hu@kernel.org>
Acked-by: NMartin Blumenstingl <martin.blumenstingl@googlemail.com>
Acked-by: NTomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Acked-by: NPhilippe Cornu <philippe.cornu@foss.st.com>
Acked-by: NLucas Stach <l.stach@pengutronix.de>
Signed-off-by: NDaniel Vetter <daniel.vetter@intel.com>
Cc: Laurentiu Palcu <laurentiu.palcu@oss.nxp.com>
Cc: Lucas Stach <l.stach@pengutronix.de>
Cc: Shawn Guo <shawnguo@kernel.org>
Cc: Sascha Hauer <s.hauer@pengutronix.de>
Cc: Pengutronix Kernel Team <kernel@pengutronix.de>
Cc: Fabio Estevam <festevam@gmail.com>
Cc: NXP Linux Team <linux-imx@nxp.com>
Cc: Philipp Zabel <p.zabel@pengutronix.de>
Cc: Paul Cercueil <paul@crapouillou.net>
Cc: Chun-Kuang Hu <chunkuang.hu@kernel.org>
Cc: Matthias Brugger <matthias.bgg@gmail.com>
Cc: Neil Armstrong <narmstrong@baylibre.com>
Cc: Kevin Hilman <khilman@baylibre.com>
Cc: Jerome Brunet <jbrunet@baylibre.com>
Cc: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Cc: Marek Vasut <marex@denx.de>
Cc: Stefan Agner <stefan@agner.ch>
Cc: Sandy Huang <hjc@rock-chips.com>
Cc: "Heiko Stübner" <heiko@sntech.de>
Cc: Yannick Fertre <yannick.fertre@foss.st.com>
Cc: Philippe Cornu <philippe.cornu@foss.st.com>
Cc: Benjamin Gaignard <benjamin.gaignard@linaro.org>
Cc: Maxime Coquelin <mcoquelin.stm32@gmail.com>
Cc: Alexandre Torgue <alexandre.torgue@foss.st.com>
Cc: Maxime Ripard <mripard@kernel.org>
Cc: Chen-Yu Tsai <wens@csie.org>
Cc: Jernej Skrabec <jernej.skrabec@gmail.com>
Cc: Jyri Sarha <jyri.sarha@iki.fi>
Cc: Tomi Valkeinen <tomba@kernel.org>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-mips@vger.kernel.org
Cc: linux-mediatek@lists.infradead.org
Cc: linux-amlogic@lists.infradead.org
Cc: linux-rockchip@lists.infradead.org
Cc: linux-stm32@st-md-mailman.stormreply.com
Cc: linux-sunxi@lists.linux.dev
Link: https://patchwork.freedesktop.org/patch/msgid/20210622165511.3169559-9-daniel.vetter@ffwll.ch
上级 7d30963f
...@@ -361,7 +361,6 @@ static void dcss_plane_atomic_disable(struct drm_plane *plane, ...@@ -361,7 +361,6 @@ static void dcss_plane_atomic_disable(struct drm_plane *plane,
} }
static const struct drm_plane_helper_funcs dcss_plane_helper_funcs = { static const struct drm_plane_helper_funcs dcss_plane_helper_funcs = {
.prepare_fb = drm_gem_plane_helper_prepare_fb,
.atomic_check = dcss_plane_atomic_check, .atomic_check = dcss_plane_atomic_check,
.atomic_update = dcss_plane_atomic_update, .atomic_update = dcss_plane_atomic_update,
.atomic_disable = dcss_plane_atomic_disable, .atomic_disable = dcss_plane_atomic_disable,
......
...@@ -772,7 +772,6 @@ static void ipu_plane_atomic_update(struct drm_plane *plane, ...@@ -772,7 +772,6 @@ static void ipu_plane_atomic_update(struct drm_plane *plane,
} }
static const struct drm_plane_helper_funcs ipu_plane_helper_funcs = { static const struct drm_plane_helper_funcs ipu_plane_helper_funcs = {
.prepare_fb = drm_gem_plane_helper_prepare_fb,
.atomic_check = ipu_plane_atomic_check, .atomic_check = ipu_plane_atomic_check,
.atomic_disable = ipu_plane_atomic_disable, .atomic_disable = ipu_plane_atomic_disable,
.atomic_update = ipu_plane_atomic_update, .atomic_update = ipu_plane_atomic_update,
......
...@@ -830,7 +830,6 @@ static const struct drm_plane_helper_funcs ingenic_drm_plane_helper_funcs = { ...@@ -830,7 +830,6 @@ static const struct drm_plane_helper_funcs ingenic_drm_plane_helper_funcs = {
.atomic_update = ingenic_drm_plane_atomic_update, .atomic_update = ingenic_drm_plane_atomic_update,
.atomic_check = ingenic_drm_plane_atomic_check, .atomic_check = ingenic_drm_plane_atomic_check,
.atomic_disable = ingenic_drm_plane_atomic_disable, .atomic_disable = ingenic_drm_plane_atomic_disable,
.prepare_fb = drm_gem_plane_helper_prepare_fb,
}; };
static const struct drm_crtc_helper_funcs ingenic_drm_crtc_helper_funcs = { static const struct drm_crtc_helper_funcs ingenic_drm_crtc_helper_funcs = {
......
...@@ -625,7 +625,6 @@ static const struct drm_plane_helper_funcs ingenic_ipu_plane_helper_funcs = { ...@@ -625,7 +625,6 @@ static const struct drm_plane_helper_funcs ingenic_ipu_plane_helper_funcs = {
.atomic_update = ingenic_ipu_plane_atomic_update, .atomic_update = ingenic_ipu_plane_atomic_update,
.atomic_check = ingenic_ipu_plane_atomic_check, .atomic_check = ingenic_ipu_plane_atomic_check,
.atomic_disable = ingenic_ipu_plane_atomic_disable, .atomic_disable = ingenic_ipu_plane_atomic_disable,
.prepare_fb = drm_gem_plane_helper_prepare_fb,
}; };
static int static int
......
...@@ -227,7 +227,6 @@ static void mtk_plane_atomic_update(struct drm_plane *plane, ...@@ -227,7 +227,6 @@ static void mtk_plane_atomic_update(struct drm_plane *plane,
} }
static const struct drm_plane_helper_funcs mtk_plane_helper_funcs = { static const struct drm_plane_helper_funcs mtk_plane_helper_funcs = {
.prepare_fb = drm_gem_plane_helper_prepare_fb,
.atomic_check = mtk_plane_atomic_check, .atomic_check = mtk_plane_atomic_check,
.atomic_update = mtk_plane_atomic_update, .atomic_update = mtk_plane_atomic_update,
.atomic_disable = mtk_plane_atomic_disable, .atomic_disable = mtk_plane_atomic_disable,
......
...@@ -747,7 +747,6 @@ static const struct drm_plane_helper_funcs meson_overlay_helper_funcs = { ...@@ -747,7 +747,6 @@ static const struct drm_plane_helper_funcs meson_overlay_helper_funcs = {
.atomic_check = meson_overlay_atomic_check, .atomic_check = meson_overlay_atomic_check,
.atomic_disable = meson_overlay_atomic_disable, .atomic_disable = meson_overlay_atomic_disable,
.atomic_update = meson_overlay_atomic_update, .atomic_update = meson_overlay_atomic_update,
.prepare_fb = drm_gem_plane_helper_prepare_fb,
}; };
static bool meson_overlay_format_mod_supported(struct drm_plane *plane, static bool meson_overlay_format_mod_supported(struct drm_plane *plane,
......
...@@ -422,7 +422,6 @@ static const struct drm_plane_helper_funcs meson_plane_helper_funcs = { ...@@ -422,7 +422,6 @@ static const struct drm_plane_helper_funcs meson_plane_helper_funcs = {
.atomic_check = meson_plane_atomic_check, .atomic_check = meson_plane_atomic_check,
.atomic_disable = meson_plane_atomic_disable, .atomic_disable = meson_plane_atomic_disable,
.atomic_update = meson_plane_atomic_update, .atomic_update = meson_plane_atomic_update,
.prepare_fb = drm_gem_plane_helper_prepare_fb,
}; };
static bool meson_plane_format_mod_supported(struct drm_plane *plane, static bool meson_plane_format_mod_supported(struct drm_plane *plane,
......
...@@ -500,13 +500,11 @@ static bool mxsfb_format_mod_supported(struct drm_plane *plane, ...@@ -500,13 +500,11 @@ static bool mxsfb_format_mod_supported(struct drm_plane *plane,
} }
static const struct drm_plane_helper_funcs mxsfb_plane_primary_helper_funcs = { static const struct drm_plane_helper_funcs mxsfb_plane_primary_helper_funcs = {
.prepare_fb = drm_gem_plane_helper_prepare_fb,
.atomic_check = mxsfb_plane_atomic_check, .atomic_check = mxsfb_plane_atomic_check,
.atomic_update = mxsfb_plane_primary_atomic_update, .atomic_update = mxsfb_plane_primary_atomic_update,
}; };
static const struct drm_plane_helper_funcs mxsfb_plane_overlay_helper_funcs = { static const struct drm_plane_helper_funcs mxsfb_plane_overlay_helper_funcs = {
.prepare_fb = drm_gem_plane_helper_prepare_fb,
.atomic_check = mxsfb_plane_atomic_check, .atomic_check = mxsfb_plane_atomic_check,
.atomic_update = mxsfb_plane_overlay_atomic_update, .atomic_update = mxsfb_plane_overlay_atomic_update,
}; };
......
...@@ -1110,7 +1110,6 @@ static const struct drm_plane_helper_funcs plane_helper_funcs = { ...@@ -1110,7 +1110,6 @@ static const struct drm_plane_helper_funcs plane_helper_funcs = {
.atomic_disable = vop_plane_atomic_disable, .atomic_disable = vop_plane_atomic_disable,
.atomic_async_check = vop_plane_atomic_async_check, .atomic_async_check = vop_plane_atomic_async_check,
.atomic_async_update = vop_plane_atomic_async_update, .atomic_async_update = vop_plane_atomic_async_update,
.prepare_fb = drm_gem_plane_helper_prepare_fb,
}; };
static const struct drm_plane_funcs vop_plane_funcs = { static const struct drm_plane_funcs vop_plane_funcs = {
......
...@@ -947,7 +947,6 @@ static const struct drm_plane_funcs ltdc_plane_funcs = { ...@@ -947,7 +947,6 @@ static const struct drm_plane_funcs ltdc_plane_funcs = {
}; };
static const struct drm_plane_helper_funcs ltdc_plane_helper_funcs = { static const struct drm_plane_helper_funcs ltdc_plane_helper_funcs = {
.prepare_fb = drm_gem_plane_helper_prepare_fb,
.atomic_check = ltdc_plane_atomic_check, .atomic_check = ltdc_plane_atomic_check,
.atomic_update = ltdc_plane_atomic_update, .atomic_update = ltdc_plane_atomic_update,
.atomic_disable = ltdc_plane_atomic_disable, .atomic_disable = ltdc_plane_atomic_disable,
......
...@@ -127,7 +127,6 @@ static bool sun4i_layer_format_mod_supported(struct drm_plane *plane, ...@@ -127,7 +127,6 @@ static bool sun4i_layer_format_mod_supported(struct drm_plane *plane,
} }
static const struct drm_plane_helper_funcs sun4i_backend_layer_helper_funcs = { static const struct drm_plane_helper_funcs sun4i_backend_layer_helper_funcs = {
.prepare_fb = drm_gem_plane_helper_prepare_fb,
.atomic_disable = sun4i_backend_layer_atomic_disable, .atomic_disable = sun4i_backend_layer_atomic_disable,
.atomic_update = sun4i_backend_layer_atomic_update, .atomic_update = sun4i_backend_layer_atomic_update,
}; };
......
...@@ -332,7 +332,6 @@ static void sun8i_ui_layer_atomic_update(struct drm_plane *plane, ...@@ -332,7 +332,6 @@ static void sun8i_ui_layer_atomic_update(struct drm_plane *plane,
} }
static const struct drm_plane_helper_funcs sun8i_ui_layer_helper_funcs = { static const struct drm_plane_helper_funcs sun8i_ui_layer_helper_funcs = {
.prepare_fb = drm_gem_plane_helper_prepare_fb,
.atomic_check = sun8i_ui_layer_atomic_check, .atomic_check = sun8i_ui_layer_atomic_check,
.atomic_disable = sun8i_ui_layer_atomic_disable, .atomic_disable = sun8i_ui_layer_atomic_disable,
.atomic_update = sun8i_ui_layer_atomic_update, .atomic_update = sun8i_ui_layer_atomic_update,
......
...@@ -436,7 +436,6 @@ static void sun8i_vi_layer_atomic_update(struct drm_plane *plane, ...@@ -436,7 +436,6 @@ static void sun8i_vi_layer_atomic_update(struct drm_plane *plane,
} }
static const struct drm_plane_helper_funcs sun8i_vi_layer_helper_funcs = { static const struct drm_plane_helper_funcs sun8i_vi_layer_helper_funcs = {
.prepare_fb = drm_gem_plane_helper_prepare_fb,
.atomic_check = sun8i_vi_layer_atomic_check, .atomic_check = sun8i_vi_layer_atomic_check,
.atomic_disable = sun8i_vi_layer_atomic_disable, .atomic_disable = sun8i_vi_layer_atomic_disable,
.atomic_update = sun8i_vi_layer_atomic_update, .atomic_update = sun8i_vi_layer_atomic_update,
......
...@@ -158,7 +158,6 @@ static void drm_plane_destroy(struct drm_plane *plane) ...@@ -158,7 +158,6 @@ static void drm_plane_destroy(struct drm_plane *plane)
} }
static const struct drm_plane_helper_funcs tidss_plane_helper_funcs = { static const struct drm_plane_helper_funcs tidss_plane_helper_funcs = {
.prepare_fb = drm_gem_plane_helper_prepare_fb,
.atomic_check = tidss_plane_atomic_check, .atomic_check = tidss_plane_atomic_check,
.atomic_update = tidss_plane_atomic_update, .atomic_update = tidss_plane_atomic_update,
.atomic_disable = tidss_plane_atomic_disable, .atomic_disable = tidss_plane_atomic_disable,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册