Hi

Am 05.03.26 um 16:38 schrieb Icenowy Zheng:
The `drm_atomic_helper_check_plane_state()` helper function needs to be
called even if the plane is bound to no CRTCs.

Remove the early return in the primary plane's atomic_check, and use
NULL for crtc_state in this situation.

Signed-off-by: Icenowy Zheng <[email protected]>

Reviewed-by: Thomas Zimmermann <[email protected]>

Please also add

Fixes: dbf21777caa8 ("drm: verisilicon: add a driver for Verisilicon display controllers")

Best regards
Thomas


---
New patch in v3.

  drivers/gpu/drm/verisilicon/vs_primary_plane.c | 10 +++-------
  1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/drivers/gpu/drm/verisilicon/vs_primary_plane.c 
b/drivers/gpu/drm/verisilicon/vs_primary_plane.c
index bad0bc5e3242d..421d6f9dc547b 100644
--- a/drivers/gpu/drm/verisilicon/vs_primary_plane.c
+++ b/drivers/gpu/drm/verisilicon/vs_primary_plane.c
@@ -26,14 +26,10 @@ static int vs_primary_plane_atomic_check(struct drm_plane 
*plane,
        struct drm_plane_state *new_plane_state = 
drm_atomic_get_new_plane_state(state,
                                                                                
 plane);
        struct drm_crtc *crtc = new_plane_state->crtc;
-       struct drm_crtc_state *crtc_state;
+       struct drm_crtc_state *crtc_state = NULL;
- if (!crtc)
-               return 0;
-
-       crtc_state = drm_atomic_get_new_crtc_state(state, crtc);
-       if (WARN_ON(!crtc_state))
-               return -EINVAL;
+       if (crtc)
+               crtc_state = drm_atomic_get_new_crtc_state(state, crtc);
return drm_atomic_helper_check_plane_state(new_plane_state,
                                                   crtc_state,

--
--
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Frankenstr. 146, 90461 Nürnberg, Germany, www.suse.com
GF: Jochen Jaser, Andrew McDonald, Werner Knoblich, (HRB 36809, AG Nürnberg)


Reply via email to