drm: Don't implement empty prepare_fb()/cleanup_fb()
The plane .prepare_fb() and .cleanup_fb() helpers are optional, there's no need to implement empty stubs, and no need to explicitly set the function pointers to NULL either. Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> [danvet: Resolved conflicts with Chris' patch.] Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
parent
7ad61e6b4a
commit
420382adf6
@ -183,8 +183,6 @@ static void arc_pgu_plane_atomic_update(struct drm_plane *plane,
|
||||
}
|
||||
|
||||
static const struct drm_plane_helper_funcs arc_pgu_plane_helper_funcs = {
|
||||
.prepare_fb = NULL,
|
||||
.cleanup_fb = NULL,
|
||||
.atomic_update = arc_pgu_plane_atomic_update,
|
||||
};
|
||||
|
||||
|
@ -169,25 +169,10 @@ static void fsl_dcu_drm_plane_atomic_update(struct drm_plane *plane,
|
||||
return;
|
||||
}
|
||||
|
||||
static void
|
||||
fsl_dcu_drm_plane_cleanup_fb(struct drm_plane *plane,
|
||||
struct drm_plane_state *new_state)
|
||||
{
|
||||
}
|
||||
|
||||
static int
|
||||
fsl_dcu_drm_plane_prepare_fb(struct drm_plane *plane,
|
||||
struct drm_plane_state *new_state)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
static const struct drm_plane_helper_funcs fsl_dcu_drm_plane_helper_funcs = {
|
||||
.atomic_check = fsl_dcu_drm_plane_atomic_check,
|
||||
.atomic_disable = fsl_dcu_drm_plane_atomic_disable,
|
||||
.atomic_update = fsl_dcu_drm_plane_atomic_update,
|
||||
.cleanup_fb = fsl_dcu_drm_plane_cleanup_fb,
|
||||
.prepare_fb = fsl_dcu_drm_plane_prepare_fb,
|
||||
};
|
||||
|
||||
static void fsl_dcu_drm_plane_destroy(struct drm_plane *plane)
|
||||
|
@ -817,19 +817,6 @@ static void ade_disable_channel(struct ade_plane *aplane)
|
||||
ade_compositor_routing_disable(base, ch);
|
||||
}
|
||||
|
||||
static int ade_plane_prepare_fb(struct drm_plane *plane,
|
||||
struct drm_plane_state *new_state)
|
||||
{
|
||||
/* do nothing */
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void ade_plane_cleanup_fb(struct drm_plane *plane,
|
||||
struct drm_plane_state *old_state)
|
||||
{
|
||||
/* do nothing */
|
||||
}
|
||||
|
||||
static int ade_plane_atomic_check(struct drm_plane *plane,
|
||||
struct drm_plane_state *state)
|
||||
{
|
||||
@ -897,8 +884,6 @@ static void ade_plane_atomic_disable(struct drm_plane *plane,
|
||||
}
|
||||
|
||||
static const struct drm_plane_helper_funcs ade_plane_helper_funcs = {
|
||||
.prepare_fb = ade_plane_prepare_fb,
|
||||
.cleanup_fb = ade_plane_cleanup_fb,
|
||||
.atomic_check = ade_plane_atomic_check,
|
||||
.atomic_update = ade_plane_atomic_update,
|
||||
.atomic_disable = ade_plane_atomic_disable,
|
||||
|
@ -480,17 +480,6 @@ static const struct drm_plane_funcs tegra_primary_plane_funcs = {
|
||||
.atomic_destroy_state = tegra_plane_atomic_destroy_state,
|
||||
};
|
||||
|
||||
static int tegra_plane_prepare_fb(struct drm_plane *plane,
|
||||
struct drm_plane_state *new_state)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void tegra_plane_cleanup_fb(struct drm_plane *plane,
|
||||
struct drm_plane_state *old_fb)
|
||||
{
|
||||
}
|
||||
|
||||
static int tegra_plane_state_add(struct tegra_plane *plane,
|
||||
struct drm_plane_state *state)
|
||||
{
|
||||
@ -624,8 +613,6 @@ static void tegra_plane_atomic_disable(struct drm_plane *plane,
|
||||
}
|
||||
|
||||
static const struct drm_plane_helper_funcs tegra_primary_plane_helper_funcs = {
|
||||
.prepare_fb = tegra_plane_prepare_fb,
|
||||
.cleanup_fb = tegra_plane_cleanup_fb,
|
||||
.atomic_check = tegra_plane_atomic_check,
|
||||
.atomic_update = tegra_plane_atomic_update,
|
||||
.atomic_disable = tegra_plane_atomic_disable,
|
||||
@ -796,8 +783,6 @@ static const struct drm_plane_funcs tegra_cursor_plane_funcs = {
|
||||
};
|
||||
|
||||
static const struct drm_plane_helper_funcs tegra_cursor_plane_helper_funcs = {
|
||||
.prepare_fb = tegra_plane_prepare_fb,
|
||||
.cleanup_fb = tegra_plane_cleanup_fb,
|
||||
.atomic_check = tegra_cursor_atomic_check,
|
||||
.atomic_update = tegra_cursor_atomic_update,
|
||||
.atomic_disable = tegra_cursor_atomic_disable,
|
||||
@ -866,8 +851,6 @@ static const uint32_t tegra_overlay_plane_formats[] = {
|
||||
};
|
||||
|
||||
static const struct drm_plane_helper_funcs tegra_overlay_plane_helper_funcs = {
|
||||
.prepare_fb = tegra_plane_prepare_fb,
|
||||
.cleanup_fb = tegra_plane_cleanup_fb,
|
||||
.atomic_check = tegra_plane_atomic_check,
|
||||
.atomic_update = tegra_plane_atomic_update,
|
||||
.atomic_disable = tegra_plane_atomic_disable,
|
||||
|
@ -735,8 +735,6 @@ void vc4_plane_async_set_fb(struct drm_plane *plane, struct drm_framebuffer *fb)
|
||||
}
|
||||
|
||||
static const struct drm_plane_helper_funcs vc4_plane_helper_funcs = {
|
||||
.prepare_fb = NULL,
|
||||
.cleanup_fb = NULL,
|
||||
.atomic_check = vc4_plane_atomic_check,
|
||||
.atomic_update = vc4_plane_atomic_update,
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user