vc4 driver currently embeds the drm_encoder into struct vc4_txp and later on uses container_of to retrieve the vc4_txp from the drm_encoder.
Since drm_encoder has now been made a pointer inside drm_writeback_connector, make vc4 driver use the new API so that the embedded encoder model can be retained in the driver and there is no change in functionality.
changes in v3: - none
Signed-off-by: Abhinav Kumar quic_abhinavk@quicinc.com --- drivers/gpu/drm/vc4/vc4_txp.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/vc4/vc4_txp.c b/drivers/gpu/drm/vc4/vc4_txp.c index 32c4fb0..36dffcf 100644 --- a/drivers/gpu/drm/vc4/vc4_txp.c +++ b/drivers/gpu/drm/vc4/vc4_txp.c @@ -370,6 +370,10 @@ static const struct drm_encoder_helper_funcs vc4_txp_encoder_helper_funcs = { .disable = vc4_txp_encoder_disable, };
+static const struct drm_encoder_funcs vc4_txp_encoder_funcs = { + .destroy = drm_encoder_cleanup, +}; + static int vc4_txp_enable_vblank(struct drm_crtc *crtc) { return 0; @@ -498,13 +502,23 @@ static int vc4_txp_bind(struct device *dev, struct device *master, void *data) wb_conn = &txp->connector; wb_conn->encoder = &txp->drm_enc;
+ drm_encoder_helper_add(wb_conn->encoder, &vc4_txp_encoder_helper_funcs); + + ret = drm_encoder_init(drm, wb_conn->encoder, + &vc4_txp_encoder_funcs, + DRM_MODE_ENCODER_VIRTUAL, NULL); + + if (ret) + return ret; + drm_connector_helper_add(&wb_conn->base, &vc4_txp_connector_helper_funcs); - ret = drm_writeback_connector_init(drm, wb_conn, - &vc4_txp_connector_funcs, &vc4_txp_encoder_helper_funcs, - drm_fmts, ARRAY_SIZE(drm_fmts), 0); - if (ret) + ret = drm_writeback_connector_init_with_encoder(drm, wb_conn, + &vc4_txp_connector_funcs, drm_fmts, ARRAY_SIZE(drm_fmts)); + if (ret) { + drm_encoder_cleanup(wb_conn->encoder); return ret; + }
ret = vc4_crtc_init(drm, vc4_crtc, &vc4_txp_crtc_funcs, &vc4_txp_crtc_helper_funcs);