]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
drm/msm/dpu: use drmm_writeback_connector_init()
authorDmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Tue, 19 Aug 2025 20:32:58 +0000 (23:32 +0300)
committerDmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Thu, 28 Aug 2025 23:01:15 +0000 (02:01 +0300)
Use drmm_writeback_connector_init() in order to initialize writeback
connector instance.

Reviewed-by: Louis Chauvet <louis.chauvet@bootlin.com>
Reviewed-by: Suraj Kandpal <suraj.kandpal@intel.com>
Reviewed-by: Jessica Zhang <jessica.zhang@oss.qualcomm.com>
Patchwork: https://patchwork.freedesktop.org/patch/669506/
Link: https://lore.kernel.org/r/20250819-wb-drop-encoder-v3-4-b48a6af7903b@oss.qualcomm.com
[DB: fixed commit message]
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
drivers/gpu/drm/msm/disp/dpu1/dpu_writeback.c

index 8ff496082902b1ee713e806140f39b4730ed256a..cd73468e369a93c50303db2a7d4499bcb17be5d1 100644 (file)
@@ -80,7 +80,6 @@ static int dpu_wb_conn_atomic_check(struct drm_connector *connector,
 static const struct drm_connector_funcs dpu_wb_conn_funcs = {
        .reset = drm_atomic_helper_connector_reset,
        .fill_modes = drm_helper_probe_single_connector_modes,
-       .destroy = drm_connector_cleanup,
        .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,
        .atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
 };
@@ -131,12 +130,9 @@ int dpu_writeback_init(struct drm_device *dev, struct drm_encoder *enc,
 
        drm_connector_helper_add(&dpu_wb_conn->base.base, &dpu_wb_conn_helper_funcs);
 
-       /* DPU initializes the encoder and sets it up completely for writeback
-        * cases and hence should use the new API drm_writeback_connector_init_with_encoder
-        * to initialize the writeback connector
-        */
-       rc = drm_writeback_connector_init_with_encoder(dev, &dpu_wb_conn->base, enc,
-                       &dpu_wb_conn_funcs, format_list, num_formats);
+       rc = drmm_writeback_connector_init(dev, &dpu_wb_conn->base,
+                                          &dpu_wb_conn_funcs, enc,
+                                          format_list, num_formats);
 
        if (!rc)
                dpu_wb_conn->wb_enc = enc;