[PATCH v3 5/5] drm/verisilicon: nuke planes' atomic_disable hooks

From: Icenowy Zheng

Date: Wed Nov 18 2026 - 10:36:28 EST


As the plane disable routine is called in atomic_update hooks and the
atomic_enable hooks doesn't exit any longer, having atomic_disable hooks
seems to be meaningless and misleading.

Nuke the hooks and leave the disabling routines as subroutines of
atomic_update hooks.

Fixes: dbf21777caa8 ("drm: verisilicon: add a driver for Verisilicon display controllers")
Fixes: 8c4ae2189125 ("drm: verisilicon: add support for cursor planes")
Signed-off-by: Icenowy Zheng <zhengxingda@xxxxxxxxxxx>
---
drivers/gpu/drm/verisilicon/vs_cursor_plane.c | 7 +++----
drivers/gpu/drm/verisilicon/vs_primary_plane.c | 7 +++----
2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/drivers/gpu/drm/verisilicon/vs_cursor_plane.c b/drivers/gpu/drm/verisilicon/vs_cursor_plane.c
index a58e4a47cf286..8bb26b9e23f6b 100644
--- a/drivers/gpu/drm/verisilicon/vs_cursor_plane.c
+++ b/drivers/gpu/drm/verisilicon/vs_cursor_plane.c
@@ -99,8 +99,8 @@ static void vs_cursor_plane_commit(struct vs_dc *dc, unsigned int output)
VSDC_CURSOR_CONFIG_IMG_UPDATE);
}

-static void vs_cursor_plane_atomic_disable(struct drm_plane *plane,
- struct drm_atomic_commit *atomic_state)
+static void vs_cursor_plane_disable(struct drm_plane *plane,
+ struct drm_atomic_commit *atomic_state)
{
struct drm_plane_state *state = drm_atomic_get_old_plane_state(atomic_state,
plane);
@@ -136,7 +136,7 @@ static void vs_cursor_plane_atomic_update(struct drm_plane *plane,
dma_addr_t dma_addr;

if (!state->visible) {
- vs_cursor_plane_atomic_disable(plane, atomic_state);
+ vs_cursor_plane_disable(plane, atomic_state);
return;
}

@@ -221,7 +221,6 @@ static void vs_cursor_plane_atomic_update(struct drm_plane *plane,
static const struct drm_plane_helper_funcs vs_cursor_plane_helper_funcs = {
.atomic_check = vs_cursor_plane_atomic_check,
.atomic_update = vs_cursor_plane_atomic_update,
- .atomic_disable = vs_cursor_plane_atomic_disable,
};

static const struct drm_plane_funcs vs_cursor_plane_funcs = {
diff --git a/drivers/gpu/drm/verisilicon/vs_primary_plane.c b/drivers/gpu/drm/verisilicon/vs_primary_plane.c
index 730dab6204e98..397e95bd6de3f 100644
--- a/drivers/gpu/drm/verisilicon/vs_primary_plane.c
+++ b/drivers/gpu/drm/verisilicon/vs_primary_plane.c
@@ -60,8 +60,8 @@ static void vs_primary_plane_commit(struct vs_dc *dc, unsigned int output)
VSDC_FB_CONFIG_EX_COMMIT);
}

-static void vs_primary_plane_atomic_disable(struct drm_plane *plane,
- struct drm_atomic_commit *atomic_state)
+static void vs_primary_plane_disable(struct drm_plane *plane,
+ struct drm_atomic_commit *atomic_state)
{
struct drm_plane_state *state = drm_atomic_get_old_plane_state(atomic_state,
plane);
@@ -97,7 +97,7 @@ static void vs_primary_plane_atomic_update(struct drm_plane *plane,
dma_addr_t dma_addr;

if (!state->visible) {
- vs_primary_plane_atomic_disable(plane, atomic_state);
+ vs_primary_plane_disable(plane, atomic_state);
return;
}

@@ -149,7 +149,6 @@ static void vs_primary_plane_atomic_update(struct drm_plane *plane,
static const struct drm_plane_helper_funcs vs_primary_plane_helper_funcs = {
.atomic_check = vs_primary_plane_atomic_check,
.atomic_update = vs_primary_plane_atomic_update,
- .atomic_disable = vs_primary_plane_atomic_disable,
};

static const struct drm_plane_funcs vs_primary_plane_funcs = {
--
2.56.0