Re: [PATCH v2 2/4] drm/verisilicon: nuke planes' atomic_enable hooks
From: Thomas Zimmermann
Date: Tue Nov 17 2026 - 02:39:21 EST
Hi
Am 17.11.26 um 08:34 schrieb Icenowy Zheng:
在 2026-11-17二的 08:25 +0100,Thomas Zimmermann写道:
HiWell I don't know whether I am overthinking...
Am 17.11.26 um 06:19 schrieb Icenowy Zheng:
[...]
I don't think I really understand what you're up to, but it seemsWell I am now thinking that bound-but-invisible situation isSure, 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.
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.
you're
overthinking the whole thing. Other drivers only care about plane
on/off
Enabled but invisible planes are explicitly allowed in
drm_atomic_helper_check_plane_state(), and even the can_position check
is bypassed in such case (so such a configuration can even appear on
primary planes). In addition, in most implementations for atomic_check,
the invisible situations have the validity check explicitly skipped, so
just disallow enabled-but-invisible planes in atomic_check would make
the behavior quite different with most drivers.
Maybe I should craft some "evil" programs to check for this situation.
If you can make an igt test case for broken plane coordinates, go for it.
Best regards
Thomas
Thanks,
Icenowy
and the contained image. That's also what the 3 callbacks are for. It
usually works nicely. Hence me asking. But maybe verisilicon is
different, IDK.
My suggestion is therefore to remove _enable and _disable and keep
all
logic in _update.
atomic_update()
{
if (plane_state->visible) {
// do update
// enable hw plane
} else {
// disable hw plane
}
}
If you have any special cases where you want visible to be false (or
true), detect them in atomic_check and set the flags accordingly.
atomic_check()
{
drm_atomic_helper_check_plane_state() if (awkward coords)
plane_state->visible = false;
}
Best regards
Thomas
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,
};
--
--
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Frankenstr. 146, 90461 Nürnberg, Germany, www.suse.com
GF: Stefan Gaiser, Jochen Jaser, Abhinav Puri, (HRB 36809, AG Nürnberg)