Re: [PATCH v2 2/4] drm/verisilicon: nuke planes' atomic_enable hooks

From: Icenowy Zheng

Date: Tue Nov 17 2026 - 00:20:12 EST


在 2026-11-16一的 23:25 +0800,Icenowy Zheng写道:
> 在 2026-11-16一的 16:20 +0100,Thomas Zimmermann写道:
> > Hi
> >
> > Am 16.11.26 um 16:11 schrieb Icenowy Zheng:
> > > 在 2026-11-16一的 14:37 +0100,Thomas Zimmermann写道:
> > > > Hi
> > > >
> > > > Am 02.11.26 um 08:57 schrieb Icenowy Zheng:
> > > > > The atomic_update hooks of both planes are just bailing out
> > > > > early
> > > > > when
> > > > > the planes are invisible, so it's reasonable to just remove
> > > > > these
> > > > > hooks
> > > > > and update the enabled state in atomic_update.
> > > > >
> > > > > This fixes the problem that invisible but enabled planes
> > > > > won't
> > > > > be
> > > > > shown when made visible, as pointed by Sashiko.
> > > > >
> > > > > 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 | 22 +++----
> > > > > --
> > > > > -----
> > > > > --
> > > > >    .../gpu/drm/verisilicon/vs_primary_plane.c    | 26 +++++--
> > > > > --
> > > > > -----
> > > > > -----
> > > > >    2 files changed, 10 insertions(+), 38 deletions(-)
> > > > >
> > > > > diff --git a/drivers/gpu/drm/verisilicon/vs_cursor_plane.c
> > > > > b/drivers/gpu/drm/verisilicon/vs_cursor_plane.c
> > > > > index da456dced88aa..5295dc2f9ee2e 100644
> > > > > --- a/drivers/gpu/drm/verisilicon/vs_cursor_plane.c
> > > > > +++ b/drivers/gpu/drm/verisilicon/vs_cursor_plane.c
> > > > > @@ -98,23 +98,6 @@ static void vs_cursor_plane_commit(struct
> > > > > vs_dc
> > > > > *dc, unsigned int output)
> > > > >     VSDC_CURSOR_CONFIG_IMG_UPDATE);
> > > > >    }
> > > > >   
> > > > > -static void vs_cursor_plane_atomic_enable(struct drm_plane
> > > > > *plane,
> > > > > -    struct
> > > > > drm_atomic_commit *atomic_state)
> > > > > -{
> > > > > - struct drm_plane_state *state =
> > > > > drm_atomic_get_new_plane_state(atomic_state,
> > > > > -
> > > > >
> > > > >        plane);
> > > > > - struct drm_crtc *crtc = state->crtc;
> > > > > - struct vs_crtc *vcrtc = drm_crtc_to_vs_crtc(crtc);
> > > > > - unsigned int output = vcrtc->id;
> > > > > - struct vs_dc *dc = vcrtc->dc;
> > > > > -
> > > > > - regmap_update_bits(dc->regs,
> > > > > VSDC_CURSOR_CONFIG(output),
> > > > > -    VSDC_CURSOR_CONFIG_FMT_MASK,
> > > > > -    VSDC_CURSOR_CONFIG_FMT_ARGB8888);
> > > > > -
> > > > > - vs_cursor_plane_commit(dc, output);
> > > > > -}
> > > > > -
> > > > >    static void vs_cursor_plane_atomic_disable(struct
> > > > > drm_plane
> > > > > *plane,
> > > > >         struct
> > > > > drm_atomic_commit *atomic_state)
> > > > >    {
> > > > > @@ -153,6 +136,10 @@ static void
> > > > > vs_cursor_plane_atomic_update(struct drm_plane *plane,
> > > > >     output = vcrtc->id;
> > > > >     dc = vcrtc->dc;
> > > > >   
> > > > > + regmap_update_bits(dc->regs,
> > > > > VSDC_CURSOR_CONFIG(output),
> > > > > +    VSDC_CURSOR_CONFIG_FMT_MASK,
> > > > > +    VSDC_CURSOR_CONFIG_FMT_ARGB8888);
> > > > > +
> > > > >     /* Other sizes should be rejected by atomic_check */
> > > > >     switch (state->crtc_w) {
> > > > >     case 32:
> > > > > @@ -225,7 +212,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_enable = vs_cursor_plane_atomic_enable,
> > > > >     .atomic_disable =
> > > > > vs_cursor_plane_atomic_disable,
> > > > But now you have the worst of both worlds: atomic_disable is
> > > > still
> > > > around but also done by atomic_update. And atomic_update always
> > > > sets
> > > > these registers even if the plane is already visible.
> > > >
> > > > I'd instead remove the disable calls from atomic_update [1] . I
> > > > think
> > > > you should never reach this is you have an atomic_disable
> > > > installed.
> > > > See
> > > > [1] for the logic.
> > > The drm_atomic_plane_disabling() function only checks whether a
> > > CRTC is
> > > bound -- I think it could be possible that a plane is bound to a
> > > CRTC
> > > but with an invisible coordinate (especially for the cursor
> > > plane).
> >
> > Sure, but is that a problem for this hardware?
>
> For the cursor plane, the unchecked coordinate might be improper for
> the registers.
>
> For the primary plane, if the plane is found to be totally off by
> drm_atomic_helper_check_plane_state(), the check for can_position,
> which is below the code snippet I referenced, would be bypassed, and
> such plane would be programmed to be visible by the atomic_update
> hook
> even if it shouldn't be visible.

Well I am now thinking that bound-but-invisible situation is commonly
ignored by drivers.

For drm/verisilicon, maybe I'd remove both atomic_disable and
atomic_enable; however I think the atomic helpers may need some flag to
consider bound-but-invisible planes when calling atomic_{dis,en}able.

Thanks,
Icenowy

>
> Thanks,
> Icenowy
>
> >
> > Best regards
> > Thomas
> >
> > >
> > > The end of drm_atomic_helper_check_plane_state() says:
> > >
> > > ```
> > > if (!plane_state->visible)
> > > /*
> > > * Plane isn't visible; some drivers can handle
> > > this
> > > * so we just return success here.  Drivers that
> > > can't
> > > * (including those that use the primary plane
> > > helper's
> > > * update function) will return an error from
> > > their
> > > * update_plane handler.
> > > */
> > > return 0;
> > > ```
> > >
> > > Thanks,
> > > Icenowy
> > >
> > > > [1]
> > > > https://elixir.bootlin.com/linux/v7.3.1/source/drivers/gpu/drm/drm_atomic_helper.c#L3030
> > > >
> > > > Best regards
> > > > Thomas
> > > >
> > > > >    };
> > > > >   
> > > > > diff --git a/drivers/gpu/drm/verisilicon/vs_primary_plane.c
> > > > > b/drivers/gpu/drm/verisilicon/vs_primary_plane.c
> > > > > index 8e94491693019..fca692f4f7d5c 100644
> > > > > --- a/drivers/gpu/drm/verisilicon/vs_primary_plane.c
> > > > > +++ b/drivers/gpu/drm/verisilicon/vs_primary_plane.c
> > > > > @@ -59,25 +59,6 @@ static void vs_primary_plane_commit(struct
> > > > > vs_dc
> > > > > *dc, unsigned int output)
> > > > >     VSDC_FB_CONFIG_EX_COMMIT);
> > > > >    }
> > > > >   
> > > > > -static void vs_primary_plane_atomic_enable(struct drm_plane
> > > > > *plane,
> > > > > -    struct
> > > > > drm_atomic_commit *atomic_state)
> > > > > -{
> > > > > - struct drm_plane_state *state =
> > > > > drm_atomic_get_new_plane_state(atomic_state,
> > > > > -
> > > > >
> > > > >        plane);
> > > > > - struct drm_crtc *crtc = state->crtc;
> > > > > - struct vs_crtc *vcrtc = drm_crtc_to_vs_crtc(crtc);
> > > > > - unsigned int output = vcrtc->id;
> > > > > - struct vs_dc *dc = vcrtc->dc;
> > > > > -
> > > > > - regmap_set_bits(dc->regs, VSDC_FB_CONFIG_EX(output),
> > > > > - VSDC_FB_CONFIG_EX_FB_EN);
> > > > > - regmap_update_bits(dc->regs,
> > > > > VSDC_FB_CONFIG_EX(output),
> > > > > -   
> > > > > VSDC_FB_CONFIG_EX_DISPLAY_ID_MASK,
> > > > > -   
> > > > > VSDC_FB_CONFIG_EX_DISPLAY_ID(output));
> > > > > -
> > > > > - vs_primary_plane_commit(dc, output);
> > > > > -}
> > > > > -
> > > > >    static void vs_primary_plane_atomic_disable(struct
> > > > > drm_plane
> > > > > *plane,
> > > > >         struct
> > > > > drm_atomic_commit *atomic_state)
> > > > >    {
> > > > > @@ -144,13 +125,18 @@ static void
> > > > > vs_primary_plane_atomic_update(struct drm_plane *plane,
> > > > >     regmap_write(dc->regs, VSDC_FB_BLEND_CONFIG(output),
> > > > >          VSDC_FB_BLEND_CONFIG_BLEND_DISABLE);
> > > > >   
> > > > > + regmap_set_bits(dc->regs, VSDC_FB_CONFIG_EX(output),
> > > > > + VSDC_FB_CONFIG_EX_FB_EN);
> > > > > + regmap_update_bits(dc->regs,
> > > > > VSDC_FB_CONFIG_EX(output),
> > > > > +   
> > > > > VSDC_FB_CONFIG_EX_DISPLAY_ID_MASK,
> > > > > +   
> > > > > VSDC_FB_CONFIG_EX_DISPLAY_ID(output));
> > > > > +
> > > > >     vs_primary_plane_commit(dc, output);
> > > > >    }
> > > > >   
> > > > >    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_enable = vs_primary_plane_atomic_enable,
> > > > >     .atomic_disable =
> > > > > vs_primary_plane_atomic_disable,
> > > > >    };
> > > > >