: drm_gem_plane_helper_prepare_fb is now the default

Philippe CORNU Fri, 28 May 2021 02:56:30 -0700


On 5/21/21 11:09 AM, Daniel Vetter wrote:

No need to set it explicitly.

Signed-off-by: Daniel Vetter <daniel.vet...@intel.com>
Cc: Laurentiu Palcu <laurentiu.pa...@oss.nxp.com>
Cc: Lucas Stach <l.st...@pengutronix.de>
Cc: Shawn Guo <shawn...@kernel.org>
Cc: Sascha Hauer <s.ha...@pengutronix.de>
Cc: Pengutronix Kernel Team <ker...@pengutronix.de>
Cc: Fabio Estevam <feste...@gmail.com>
Cc: NXP Linux Team <linux-...@nxp.com>
Cc: Philipp Zabel <p.za...@pengutronix.de>
Cc: Paul Cercueil <p...@crapouillou.net>
Cc: Chun-Kuang Hu <chunkuang...@kernel.org>
Cc: Matthias Brugger <matthias....@gmail.com>
Cc: Neil Armstrong <narmstr...@baylibre.com>
Cc: Kevin Hilman <khil...@baylibre.com>
Cc: Jerome Brunet <jbru...@baylibre.com>
Cc: Martin Blumenstingl <martin.blumensti...@googlemail.com>
Cc: Marek Vasut <ma...@denx.de>
Cc: Stefan Agner <ste...@agner.ch>
Cc: Sandy Huang <h...@rock-chips.com>
Cc: "Heiko Stübner" <he...@sntech.de>
Cc: Yannick Fertre <yannick.fer...@foss.st.com>
Cc: Philippe Cornu <philippe.co...@foss.st.com>


For stm
Acked-by: Philippe Cornu <philippe.co...@foss.st.com>

Many thanks
Philippe :-)

Cc: Benjamin Gaignard <benjamin.gaign...@linaro.org>
Cc: Maxime Coquelin <mcoquelin.st...@gmail.com>
Cc: Alexandre Torgue <alexandre.tor...@foss.st.com>
Cc: Maxime Ripard <mrip...@kernel.org>
Cc: Chen-Yu Tsai <w...@csie.org>
Cc: Jernej Skrabec <jernej.skra...@gmail.com>
Cc: Jyri Sarha <jyri.sa...@iki.fi>
Cc: Tomi Valkeinen <to...@kernel.org>
Cc: linux-arm-ker...@lists.infradead.org
Cc: linux-m...@vger.kernel.org
Cc: linux-media...@lists.infradead.org
Cc: linux-amlo...@lists.infradead.org
Cc: linux-rockc...@lists.infradead.org
Cc: linux-st...@st-md-mailman.stormreply.com
Cc: linux-su...@lists.linux.dev
---
  drivers/gpu/drm/imx/dcss/dcss-plane.c       | 1 -
  drivers/gpu/drm/imx/ipuv3-plane.c           | 1 -
  drivers/gpu/drm/ingenic/ingenic-drm-drv.c   | 1 -
  drivers/gpu/drm/ingenic/ingenic-ipu.c       | 1 -
  drivers/gpu/drm/mediatek/mtk_drm_plane.c    | 1 -
  drivers/gpu/drm/meson/meson_overlay.c       | 1 -
  drivers/gpu/drm/meson/meson_plane.c         | 1 -
  drivers/gpu/drm/mxsfb/mxsfb_kms.c           | 2 --
  drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 1 -
  drivers/gpu/drm/stm/ltdc.c                  | 1 -
  drivers/gpu/drm/sun4i/sun4i_layer.c         | 1 -
  drivers/gpu/drm/sun4i/sun8i_ui_layer.c      | 1 -
  drivers/gpu/drm/sun4i/sun8i_vi_layer.c      | 1 -
  drivers/gpu/drm/tidss/tidss_plane.c         | 1 -
  14 files changed, 15 deletions(-)

diff --git a/drivers/gpu/drm/imx/dcss/dcss-plane.c 
b/drivers/gpu/drm/imx/dcss/dcss-plane.c
index 044d3bdf313c..ac45d54acd4e 100644
--- a/drivers/gpu/drm/imx/dcss/dcss-plane.c
+++ b/drivers/gpu/drm/imx/dcss/dcss-plane.c
@@ -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 = {

-       .prepare_fb = drm_gem_plane_helper_prepare_fb,
        .atomic_check = dcss_plane_atomic_check,
        .atomic_update = dcss_plane_atomic_update,
        .atomic_disable = dcss_plane_atomic_disable,
diff --git a/drivers/gpu/drm/imx/ipuv3-plane.c 
b/drivers/gpu/drm/imx/ipuv3-plane.c
index 8710f55d2579..ef114b6aa691 100644
--- a/drivers/gpu/drm/imx/ipuv3-plane.c
+++ b/drivers/gpu/drm/imx/ipuv3-plane.c
@@ -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 = {

-       .prepare_fb = drm_gem_plane_helper_prepare_fb,
        .atomic_check = ipu_plane_atomic_check,
        .atomic_disable = ipu_plane_atomic_disable,
        .atomic_update = ipu_plane_atomic_update,
diff --git a/drivers/gpu/drm/ingenic/ingenic-drm-drv.c 
b/drivers/gpu/drm/ingenic/ingenic-drm-drv.c
index 389cad59e090..62db7349bf6a 100644
--- a/drivers/gpu/drm/ingenic/ingenic-drm-drv.c
+++ b/drivers/gpu/drm/ingenic/ingenic-drm-drv.c
@@ -786,7 +786,6 @@ static const struct drm_plane_helper_funcs 
ingenic_drm_plane_helper_funcs = {
        .atomic_update          = ingenic_drm_plane_atomic_update,
        .atomic_check           = ingenic_drm_plane_atomic_check,
        .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 = {

diff --git a/drivers/gpu/drm/ingenic/ingenic-ipu.c 
b/drivers/gpu/drm/ingenic/ingenic-ipu.c
index 3b1091e7c0cd..caf038f3e231 100644
--- a/drivers/gpu/drm/ingenic/ingenic-ipu.c
+++ b/drivers/gpu/drm/ingenic/ingenic-ipu.c
@@ -615,7 +615,6 @@ static const struct drm_plane_helper_funcs 
ingenic_ipu_plane_helper_funcs = {
        .atomic_update          = ingenic_ipu_plane_atomic_update,
        .atomic_check           = ingenic_ipu_plane_atomic_check,
        .atomic_disable         = ingenic_ipu_plane_atomic_disable,
-       .prepare_fb             = drm_gem_plane_helper_prepare_fb,
  };

static int

diff --git a/drivers/gpu/drm/mediatek/mtk_drm_plane.c 
b/drivers/gpu/drm/mediatek/mtk_drm_plane.c
index b5582dcf564c..1667a7e7de38 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_plane.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_plane.c
@@ -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 = {

-       .prepare_fb = drm_gem_plane_helper_prepare_fb,
        .atomic_check = mtk_plane_atomic_check,
        .atomic_update = mtk_plane_atomic_update,
        .atomic_disable = mtk_plane_atomic_disable,
diff --git a/drivers/gpu/drm/meson/meson_overlay.c 
b/drivers/gpu/drm/meson/meson_overlay.c
index ed063152aecd..dfef8afcc245 100644
--- a/drivers/gpu/drm/meson/meson_overlay.c
+++ b/drivers/gpu/drm/meson/meson_overlay.c
@@ -747,7 +747,6 @@ static const struct drm_plane_helper_funcs 
meson_overlay_helper_funcs = {
        .atomic_check   = meson_overlay_atomic_check,
        .atomic_disable = meson_overlay_atomic_disable,
        .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,

diff --git a/drivers/gpu/drm/meson/meson_plane.c 
b/drivers/gpu/drm/meson/meson_plane.c
index a18510dae4c8..8640a8a8a469 100644
--- a/drivers/gpu/drm/meson/meson_plane.c
+++ b/drivers/gpu/drm/meson/meson_plane.c
@@ -422,7 +422,6 @@ static const struct drm_plane_helper_funcs 
meson_plane_helper_funcs = {
        .atomic_check   = meson_plane_atomic_check,
        .atomic_disable = meson_plane_atomic_disable,
        .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,

diff --git a/drivers/gpu/drm/mxsfb/mxsfb_kms.c 
b/drivers/gpu/drm/mxsfb/mxsfb_kms.c
index 300e7bab0f43..8797c671d0d5 100644
--- a/drivers/gpu/drm/mxsfb/mxsfb_kms.c
+++ b/drivers/gpu/drm/mxsfb/mxsfb_kms.c
@@ -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 = {

-       .prepare_fb = drm_gem_plane_helper_prepare_fb,
        .atomic_check = mxsfb_plane_atomic_check,
        .atomic_update = mxsfb_plane_primary_atomic_update,
  };

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_update = mxsfb_plane_overlay_atomic_update,
  };
diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c 
b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
index 64469439ddf2..6406bc0a71c7 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
@@ -1109,7 +1109,6 @@ static const struct drm_plane_helper_funcs 
plane_helper_funcs = {
        .atomic_disable = vop_plane_atomic_disable,
        .atomic_async_check = vop_plane_atomic_async_check,
        .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 = {

diff --git a/drivers/gpu/drm/stm/ltdc.c b/drivers/gpu/drm/stm/ltdc.c
index e99771b947b6..a5a2956f23f2 100644
--- a/drivers/gpu/drm/stm/ltdc.c
+++ b/drivers/gpu/drm/stm/ltdc.c
@@ -946,7 +946,6 @@ static const struct drm_plane_funcs ltdc_plane_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_update = ltdc_plane_atomic_update,
        .atomic_disable = ltdc_plane_atomic_disable,
diff --git a/drivers/gpu/drm/sun4i/sun4i_layer.c 
b/drivers/gpu/drm/sun4i/sun4i_layer.c
index 11771bdd6e7c..929e95f86b5b 100644
--- a/drivers/gpu/drm/sun4i/sun4i_layer.c
+++ b/drivers/gpu/drm/sun4i/sun4i_layer.c
@@ -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 = {

-       .prepare_fb     = drm_gem_plane_helper_prepare_fb,
        .atomic_disable = sun4i_backend_layer_atomic_disable,
        .atomic_update  = sun4i_backend_layer_atomic_update,
  };
diff --git a/drivers/gpu/drm/sun4i/sun8i_ui_layer.c 
b/drivers/gpu/drm/sun4i/sun8i_ui_layer.c
index 0db164a774a1..ac3d43394589 100644
--- a/drivers/gpu/drm/sun4i/sun8i_ui_layer.c
+++ b/drivers/gpu/drm/sun4i/sun8i_ui_layer.c
@@ -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 = {

-       .prepare_fb     = drm_gem_plane_helper_prepare_fb,
        .atomic_check   = sun8i_ui_layer_atomic_check,
        .atomic_disable = sun8i_ui_layer_atomic_disable,
        .atomic_update  = sun8i_ui_layer_atomic_update,
diff --git a/drivers/gpu/drm/sun4i/sun8i_vi_layer.c 
b/drivers/gpu/drm/sun4i/sun8i_vi_layer.c
index 46420780db59..45b1e37f9cda 100644
--- a/drivers/gpu/drm/sun4i/sun8i_vi_layer.c
+++ b/drivers/gpu/drm/sun4i/sun8i_vi_layer.c
@@ -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 = {

-       .prepare_fb     = drm_gem_plane_helper_prepare_fb,
        .atomic_check   = sun8i_vi_layer_atomic_check,
        .atomic_disable = sun8i_vi_layer_atomic_disable,
        .atomic_update  = sun8i_vi_layer_atomic_update,
diff --git a/drivers/gpu/drm/tidss/tidss_plane.c 
b/drivers/gpu/drm/tidss/tidss_plane.c
index 1acd15aa4193..217415ec8eea 100644
--- a/drivers/gpu/drm/tidss/tidss_plane.c
+++ b/drivers/gpu/drm/tidss/tidss_plane.c
@@ -158,7 +158,6 @@ static void drm_plane_destroy(struct drm_plane *plane)
  }

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_update = tidss_plane_atomic_update,
        .atomic_disable = tidss_plane_atomic_disable,

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [Intel-gfx] [PATCH 06/11] drm/: drm_gem_plane_helper_prepare_fb is now the default

Reply via email to