drm/arm: komeda: Switch private_obj initialization to atomic_create_state

The ARM komeda driver relies on a number of drm_private_objs, that are
initialized by allocating and initializing a state, and then passing it
to drm_private_obj_init.

Since we're gradually moving away from that pattern to the more
established one relying on a atomic_create_state implementation, let's
migrate this instance to the new pattern.

Acked-by: Liviu Dudau <liviu.dudau@arm.com>
Acked-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Link: https://patch.msgid.link/20260128-drm-private-obj-reset-v4-8-90891fa3d3b0@redhat.com
Signed-off-by: Maxime Ripard <mripard@kernel.org>

diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_pipeline.h b/drivers/gpu/drm/arm/display/komeda/komeda_pipeline.h
index ac8725e248537e5737d16cd36860401c42073500..37b9e92202443cc72adc0666ed047d4f77d79782 100644 (file)
--- a/drivers/gpu/drm/arm/display/komeda/komeda_pipeline.h
+++ b/drivers/gpu/drm/arm/display/komeda/komeda_pipeline.h
@@ -128,6 +128,8 @@ struct komeda_component {
        const struct komeda_component_funcs *funcs;
 };
 
+#define to_component(o)        container_of(o, struct komeda_component, obj)
+
 /**
  * struct komeda_component_output
  *

diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_private_obj.c b/drivers/gpu/drm/arm/display/komeda/komeda_private_obj.c
index 914400c4af73824e52dda76425a73a74e681a146..4994b69c6595637ea832b97629b052e3aea97ee7 100644 (file)
--- a/drivers/gpu/drm/arm/display/komeda/komeda_private_obj.c
+++ b/drivers/gpu/drm/arm/display/komeda/komeda_private_obj.c
@@ -40,7 +40,24 @@ komeda_layer_atomic_destroy_state(struct drm_private_obj *obj,
        kfree(st);
 }
 
+static struct drm_private_state *
+komeda_layer_atomic_create_state(struct drm_private_obj *obj)
+{
+       struct komeda_layer_state *st;
+
+       st = kzalloc(sizeof(*st), GFP_KERNEL);
+       if (!st)
+               return ERR_PTR(-ENOMEM);
+
+       __drm_atomic_helper_private_obj_create_state(obj, &st->base.obj);
+       komeda_component_state_reset(&st->base);
+       st->base.component = to_component(obj);
+
+       return &st->base.obj;
+}
+
 static const struct drm_private_state_funcs komeda_layer_obj_funcs = {
+       .atomic_create_state    = komeda_layer_atomic_create_state,
        .atomic_duplicate_state = komeda_layer_atomic_duplicate_state,
        .atomic_destroy_state   = komeda_layer_atomic_destroy_state,
 };
@@ -48,14 +65,7 @@ static const struct drm_private_state_funcs komeda_layer_obj_funcs = {
 static int komeda_layer_obj_add(struct komeda_kms_dev *kms,
                                struct komeda_layer *layer)
 {
-       struct komeda_layer_state *st;
-
-       st = kzalloc(sizeof(*st), GFP_KERNEL);
-       if (!st)
-               return -ENOMEM;
-
-       st->base.component = &layer->base;
-       drm_atomic_private_obj_init(&kms->base, &layer->base.obj, &st->base.obj,
+       drm_atomic_private_obj_init(&kms->base, &layer->base.obj, NULL,
                                    &komeda_layer_obj_funcs);
        return 0;
 }
@@ -82,7 +92,24 @@ komeda_scaler_atomic_destroy_state(struct drm_private_obj *obj,
        kfree(to_scaler_st(priv_to_comp_st(state)));
 }
 
+static struct drm_private_state *
+komeda_scaler_atomic_create_state(struct drm_private_obj *obj)
+{
+       struct komeda_scaler_state *st;
+
+       st = kzalloc(sizeof(*st), GFP_KERNEL);
+       if (!st)
+               return ERR_PTR(-ENOMEM);
+
+       __drm_atomic_helper_private_obj_create_state(obj, &st->base.obj);
+       komeda_component_state_reset(&st->base);
+       st->base.component = to_component(obj);
+
+       return &st->base.obj;
+}
+
 static const struct drm_private_state_funcs komeda_scaler_obj_funcs = {
+       .atomic_create_state    = komeda_scaler_atomic_create_state,
        .atomic_duplicate_state = komeda_scaler_atomic_duplicate_state,
        .atomic_destroy_state   = komeda_scaler_atomic_destroy_state,
 };
@@ -90,15 +117,8 @@ static const struct drm_private_state_funcs komeda_scaler_obj_funcs = {
 static int komeda_scaler_obj_add(struct komeda_kms_dev *kms,
                                 struct komeda_scaler *scaler)
 {
-       struct komeda_scaler_state *st;
-
-       st = kzalloc(sizeof(*st), GFP_KERNEL);
-       if (!st)
-               return -ENOMEM;
-
-       st->base.component = &scaler->base;
        drm_atomic_private_obj_init(&kms->base,
-                                   &scaler->base.obj, &st->base.obj,
+                                   &scaler->base.obj, NULL,
                                    &komeda_scaler_obj_funcs);
        return 0;
 }
@@ -125,7 +145,24 @@ komeda_compiz_atomic_destroy_state(struct drm_private_obj *obj,
        kfree(to_compiz_st(priv_to_comp_st(state)));
 }
 
+static struct drm_private_state *
+komeda_compiz_atomic_create_state(struct drm_private_obj *obj)
+{
+       struct komeda_compiz_state *st;
+
+       st = kzalloc(sizeof(*st), GFP_KERNEL);
+       if (!st)
+               return ERR_PTR(-ENOMEM);
+
+       __drm_atomic_helper_private_obj_create_state(obj, &st->base.obj);
+       komeda_component_state_reset(&st->base);
+       st->base.component = to_component(obj);
+
+       return &st->base.obj;
+}
+
 static const struct drm_private_state_funcs komeda_compiz_obj_funcs = {
+       .atomic_create_state    = komeda_compiz_atomic_create_state,
        .atomic_duplicate_state = komeda_compiz_atomic_duplicate_state,
        .atomic_destroy_state   = komeda_compiz_atomic_destroy_state,
 };
@@ -133,14 +170,7 @@ static const struct drm_private_state_funcs komeda_compiz_obj_funcs = {
 static int komeda_compiz_obj_add(struct komeda_kms_dev *kms,
                                 struct komeda_compiz *compiz)
 {
-       struct komeda_compiz_state *st;
-
-       st = kzalloc(sizeof(*st), GFP_KERNEL);
-       if (!st)
-               return -ENOMEM;
-
-       st->base.component = &compiz->base;
-       drm_atomic_private_obj_init(&kms->base, &compiz->base.obj, &st->base.obj,
+       drm_atomic_private_obj_init(&kms->base, &compiz->base.obj, NULL,
                                    &komeda_compiz_obj_funcs);
 
        return 0;
@@ -168,7 +198,24 @@ komeda_splitter_atomic_destroy_state(struct drm_private_obj *obj,
        kfree(to_splitter_st(priv_to_comp_st(state)));
 }
 
+static struct drm_private_state *
+komeda_splitter_atomic_create_state(struct drm_private_obj *obj)
+{
+       struct komeda_splitter_state *st;
+
+       st = kzalloc(sizeof(*st), GFP_KERNEL);
+       if (!st)
+               return ERR_PTR(-ENOMEM);
+
+       __drm_atomic_helper_private_obj_create_state(obj, &st->base.obj);
+       komeda_component_state_reset(&st->base);
+       st->base.component = to_component(obj);
+
+       return &st->base.obj;
+}
+
 static const struct drm_private_state_funcs komeda_splitter_obj_funcs = {
+       .atomic_create_state    = komeda_splitter_atomic_create_state,
        .atomic_duplicate_state = komeda_splitter_atomic_duplicate_state,
        .atomic_destroy_state   = komeda_splitter_atomic_destroy_state,
 };
@@ -176,15 +223,8 @@ static const struct drm_private_state_funcs komeda_splitter_obj_funcs = {
 static int komeda_splitter_obj_add(struct komeda_kms_dev *kms,
                                   struct komeda_splitter *splitter)
 {
-       struct komeda_splitter_state *st;
-
-       st = kzalloc(sizeof(*st), GFP_KERNEL);
-       if (!st)
-               return -ENOMEM;
-
-       st->base.component = &splitter->base;
        drm_atomic_private_obj_init(&kms->base,
-                                   &splitter->base.obj, &st->base.obj,
+                                   &splitter->base.obj, NULL,
                                    &komeda_splitter_obj_funcs);
 
        return 0;
@@ -211,7 +251,24 @@ static void komeda_merger_atomic_destroy_state(struct drm_private_obj *obj,
        kfree(to_merger_st(priv_to_comp_st(state)));
 }
 
+static struct drm_private_state *
+komeda_merger_atomic_create_state(struct drm_private_obj *obj)
+{
+       struct komeda_merger_state *st;
+
+       st = kzalloc(sizeof(*st), GFP_KERNEL);
+       if (!st)
+               return ERR_PTR(-ENOMEM);
+
+       __drm_atomic_helper_private_obj_create_state(obj, &st->base.obj);
+       komeda_component_state_reset(&st->base);
+       st->base.component = to_component(obj);
+
+       return &st->base.obj;
+}
+
 static const struct drm_private_state_funcs komeda_merger_obj_funcs = {
+       .atomic_create_state    = komeda_merger_atomic_create_state,
        .atomic_duplicate_state = komeda_merger_atomic_duplicate_state,
        .atomic_destroy_state   = komeda_merger_atomic_destroy_state,
 };
@@ -219,15 +276,8 @@ static const struct drm_private_state_funcs komeda_merger_obj_funcs = {
 static int komeda_merger_obj_add(struct komeda_kms_dev *kms,
                                 struct komeda_merger *merger)
 {
-       struct komeda_merger_state *st;
-
-       st = kzalloc(sizeof(*st), GFP_KERNEL);
-       if (!st)
-               return -ENOMEM;
-
-       st->base.component = &merger->base;
        drm_atomic_private_obj_init(&kms->base,
-                                   &merger->base.obj, &st->base.obj,
+                                   &merger->base.obj, NULL,
                                    &komeda_merger_obj_funcs);
 
        return 0;
@@ -255,7 +305,24 @@ komeda_improc_atomic_destroy_state(struct drm_private_obj *obj,
        kfree(to_improc_st(priv_to_comp_st(state)));
 }
 
+static struct drm_private_state *
+komeda_improc_atomic_create_state(struct drm_private_obj *obj)
+{
+       struct komeda_improc_state *st;
+
+       st = kzalloc(sizeof(*st), GFP_KERNEL);
+       if (!st)
+               return ERR_PTR(-ENOMEM);
+
+       __drm_atomic_helper_private_obj_create_state(obj, &st->base.obj);
+       komeda_component_state_reset(&st->base);
+       st->base.component = to_component(obj);
+
+       return &st->base.obj;
+}
+
 static const struct drm_private_state_funcs komeda_improc_obj_funcs = {
+       .atomic_create_state    = komeda_improc_atomic_create_state,
        .atomic_duplicate_state = komeda_improc_atomic_duplicate_state,
        .atomic_destroy_state   = komeda_improc_atomic_destroy_state,
 };
@@ -263,14 +330,7 @@ static const struct drm_private_state_funcs komeda_improc_obj_funcs = {
 static int komeda_improc_obj_add(struct komeda_kms_dev *kms,
                                 struct komeda_improc *improc)
 {
-       struct komeda_improc_state *st;
-
-       st = kzalloc(sizeof(*st), GFP_KERNEL);
-       if (!st)
-               return -ENOMEM;
-
-       st->base.component = &improc->base;
-       drm_atomic_private_obj_init(&kms->base, &improc->base.obj, &st->base.obj,
+       drm_atomic_private_obj_init(&kms->base, &improc->base.obj, NULL,
                                    &komeda_improc_obj_funcs);
 
        return 0;
@@ -298,7 +358,24 @@ komeda_timing_ctrlr_atomic_destroy_state(struct drm_private_obj *obj,
        kfree(to_ctrlr_st(priv_to_comp_st(state)));
 }
 
+static struct drm_private_state *
+komeda_timing_ctrlr_atomic_create_state(struct drm_private_obj *obj)
+{
+       struct komeda_timing_ctrlr_state *st;
+
+       st = kzalloc(sizeof(*st), GFP_KERNEL);
+       if (!st)
+               return ERR_PTR(-ENOMEM);
+
+       __drm_atomic_helper_private_obj_create_state(obj, &st->base.obj);
+       komeda_component_state_reset(&st->base);
+       st->base.component = to_component(obj);
+
+       return &st->base.obj;
+}
+
 static const struct drm_private_state_funcs komeda_timing_ctrlr_obj_funcs = {
+       .atomic_create_state    = komeda_timing_ctrlr_atomic_create_state,
        .atomic_duplicate_state = komeda_timing_ctrlr_atomic_duplicate_state,
        .atomic_destroy_state   = komeda_timing_ctrlr_atomic_destroy_state,
 };
@@ -306,14 +383,7 @@ static const struct drm_private_state_funcs komeda_timing_ctrlr_obj_funcs = {
 static int komeda_timing_ctrlr_obj_add(struct komeda_kms_dev *kms,
                                       struct komeda_timing_ctrlr *ctrlr)
 {
-       struct komeda_compiz_state *st;
-
-       st = kzalloc(sizeof(*st), GFP_KERNEL);
-       if (!st)
-               return -ENOMEM;
-
-       st->base.component = &ctrlr->base;
-       drm_atomic_private_obj_init(&kms->base, &ctrlr->base.obj, &st->base.obj,
+       drm_atomic_private_obj_init(&kms->base, &ctrlr->base.obj, NULL,
                                    &komeda_timing_ctrlr_obj_funcs);
 
        return 0;
@@ -342,7 +412,24 @@ komeda_pipeline_atomic_destroy_state(struct drm_private_obj *obj,
        kfree(priv_to_pipe_st(state));
 }
 
+static struct drm_private_state *
+komeda_pipeline_atomic_create_state(struct drm_private_obj *obj)
+{
+       struct komeda_pipeline_state *st;
+
+       st = kzalloc(sizeof(*st), GFP_KERNEL);
+       if (!st)
+               return ERR_PTR(-ENOMEM);
+
+       __drm_atomic_helper_private_obj_create_state(obj, &st->obj);
+       st->active_comps = 0;
+       st->pipe = container_of(obj, struct komeda_pipeline, obj);
+
+       return &st->obj;
+}
+
 static const struct drm_private_state_funcs komeda_pipeline_obj_funcs = {
+       .atomic_create_state    = komeda_pipeline_atomic_create_state,
        .atomic_duplicate_state = komeda_pipeline_atomic_duplicate_state,
        .atomic_destroy_state   = komeda_pipeline_atomic_destroy_state,
 };
@@ -350,14 +437,7 @@ static const struct drm_private_state_funcs komeda_pipeline_obj_funcs = {
 static int komeda_pipeline_obj_add(struct komeda_kms_dev *kms,
                                   struct komeda_pipeline *pipe)
 {
-       struct komeda_pipeline_state *st;
-
-       st = kzalloc(sizeof(*st), GFP_KERNEL);
-       if (!st)
-               return -ENOMEM;
-
-       st->pipe = pipe;
-       drm_atomic_private_obj_init(&kms->base, &pipe->obj, &st->obj,
+       drm_atomic_private_obj_init(&kms->base, &pipe->obj, NULL,
                                    &komeda_pipeline_obj_funcs);
 
        return 0;