Skip to content

Commit 90d480c

Browse files
sandiecao-dcDC-DeepComputing
authored andcommitted
drm/eswin: es_plane: Convert to atomic_create_state
Signed-off-by: Sandie Cao <sandie.cao@deepcomputing.io>
1 parent 834d902 commit 90d480c

1 file changed

Lines changed: 6 additions & 4 deletions

File tree

‎drivers/gpu/drm/eswin/es_plane.c‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ void es_plane_destory(struct drm_plane *plane)
4040
kfree(es_plane);
4141
}
4242

43-
static void es_plane_reset(struct drm_plane *plane)
43+
static struct drm_plane_state *es_plane_create_state(struct drm_plane *plane)
4444
{
4545
struct es_plane_state *state;
4646

@@ -54,13 +54,15 @@ static void es_plane_reset(struct drm_plane *plane)
5454

5555
state = kzalloc(sizeof(*state), GFP_KERNEL);
5656
if (state == NULL)
57-
return;
57+
return ERR_PTR(-ENOMEM);
5858

59-
__drm_atomic_helper_plane_reset(plane, &state->base);
59+
__drm_atomic_helper_plane_state_init(&state->base, plane);
6060

6161
state->degamma = ES_DEGAMMA_DISABLE;
6262
state->degamma_changed = false;
6363
memset(&state->status, 0, sizeof(state->status));
64+
65+
return &state->base;
6466
}
6567

6668
static void _es_plane_duplicate_blob(struct es_plane_state *state,
@@ -221,7 +223,7 @@ const struct drm_plane_funcs es_plane_funcs = {
221223
.update_plane = drm_atomic_helper_update_plane,
222224
.disable_plane = drm_atomic_helper_disable_plane,
223225
.destroy = es_plane_destory,
224-
.reset = es_plane_reset,
226+
.atomic_create_state = es_plane_create_state,
225227
.atomic_duplicate_state = es_plane_atomic_duplicate_state,
226228
.atomic_destroy_state = es_plane_atomic_destroy_state,
227229
.atomic_set_property = es_plane_atomic_set_property,

0 commit comments

Comments
 (0)