Re: [PATCH drm-misc-next] drm: verisilicon: fix build failure of cursor plane code

[Thomas Zimmermann]

Am 25.05.26 um 17:36 schrieb Icenowy Zheng:

The cursor plane patch was stalled for a too long time that the
struct drm_atomic_state parameter of atomic modeset hooks has been
changed to struct drm_atomic_commit.

Fix this by replacing the parameter's type. All helpers that retrieve
information from this struct are also changed so simply replacing the
type works.

Fixes: 8c4ae2189125 ("drm: verisilicon: add support for cursor planes")
Signed-off-by: Icenowy Zheng <zhengxin...@iscas.ac.cn>

Reviewed-by: Thomas Zimmermann <tzimmerm...@suse.de>

---
  drivers/gpu/drm/verisilicon/vs_cursor_plane.c | 8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/verisilicon/vs_cursor_plane.c 
b/drivers/gpu/drm/verisilicon/vs_cursor_plane.c
index acb9854fa67ed..fa4f601dd0c87 100644
--- a/drivers/gpu/drm/verisilicon/vs_cursor_plane.c
+++ b/drivers/gpu/drm/verisilicon/vs_cursor_plane.c
@@ -40,7 +40,7 @@ static bool vs_cursor_plane_check_coord(int32_t coord)
  }

static int vs_cursor_plane_atomic_check(struct drm_plane *plane,

-                                       struct drm_atomic_state *state)
+                                       struct drm_atomic_commit *state)
  {
        struct drm_plane_state *new_plane_state = 
drm_atomic_get_new_plane_state(state,
                                                                                
 plane);
@@ -98,7 +98,7 @@ static void vs_cursor_plane_commit(struct vs_dc *dc, unsigned 
int output)
  }

static void vs_cursor_plane_atomic_enable(struct drm_plane *plane,

-                                          struct drm_atomic_state 
*atomic_state)
+                                          struct drm_atomic_commit 
*atomic_state)
  {
        struct drm_plane_state *state = 
drm_atomic_get_new_plane_state(atomic_state,
                                                                       plane);
@@ -115,7 +115,7 @@ static void vs_cursor_plane_atomic_enable(struct drm_plane 
*plane,
  }

static void vs_cursor_plane_atomic_disable(struct drm_plane *plane,

-                                           struct drm_atomic_state 
*atomic_state)
+                                           struct drm_atomic_commit 
*atomic_state)
  {
        struct drm_plane_state *state = 
drm_atomic_get_old_plane_state(atomic_state,
                                                                       plane);
@@ -132,7 +132,7 @@ static void vs_cursor_plane_atomic_disable(struct drm_plane 
*plane,
  }

static void vs_cursor_plane_atomic_update(struct drm_plane *plane,

-                                          struct drm_atomic_state 
*atomic_state)
+                                          struct drm_atomic_commit 
*atomic_state)
  {
        struct drm_plane_state *state = 
drm_atomic_get_new_plane_state(atomic_state,
                                                                       plane);

--
--
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)