Re: [Freedreno] [PATCH v4 1/4] drm: allow passing possible_crtcs to drm_writeback_connector_init()
Hi, On Thu, Mar 17, 2022 at 06:45:33PM -0700, Abhinav Kumar wrote: > Clients of drm_writeback_connector_init() initialize the > possible_crtcs and then invoke the call to this API. > > To simplify things, allow passing possible_crtcs as a parameter > to drm_writeback_connector_init() and make changes to the > other drm drivers to make them compatible with this change. > > changes in v4: > - keep only changes related to possible_crtcs >- add line breaks after ARRAY_SIZE >- stop using temporary variables for possible_crtcs > > Signed-off-by: Abhinav Kumar > --- > drivers/gpu/drm/arm/display/komeda/komeda_wb_connector.c | 3 +-- > drivers/gpu/drm/arm/malidp_mw.c | 4 ++-- > drivers/gpu/drm/drm_writeback.c | 6 +- > drivers/gpu/drm/rcar-du/rcar_du_writeback.c | 4 ++-- > drivers/gpu/drm/vc4/vc4_txp.c| 3 ++- > drivers/gpu/drm/vkms/vkms_writeback.c| 4 ++-- > include/drm/drm_writeback.h | 2 +- > 7 files changed, 15 insertions(+), 11 deletions(-) > > diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_wb_connector.c > b/drivers/gpu/drm/arm/display/komeda/komeda_wb_connector.c > index e465cc4..40774e6 100644 > --- a/drivers/gpu/drm/arm/display/komeda/komeda_wb_connector.c > +++ b/drivers/gpu/drm/arm/display/komeda/komeda_wb_connector.c > @@ -155,7 +155,6 @@ static int komeda_wb_connector_add(struct komeda_kms_dev > *kms, > kwb_conn->wb_layer = kcrtc->master->wb_layer; > > wb_conn = _conn->base; > - wb_conn->encoder.possible_crtcs = BIT(drm_crtc_index(>base)); > > formats = komeda_get_layer_fourcc_list(>fmt_tbl, > kwb_conn->wb_layer->layer_type, > @@ -164,7 +163,7 @@ static int komeda_wb_connector_add(struct komeda_kms_dev > *kms, > err = drm_writeback_connector_init(>base, wb_conn, > _wb_connector_funcs, > _wb_encoder_helper_funcs, > -formats, n_formats); > +formats, n_formats, > BIT(drm_crtc_index(>base))); > komeda_put_fourcc_list(formats); > if (err) { > kfree(kwb_conn); > diff --git a/drivers/gpu/drm/arm/malidp_mw.c b/drivers/gpu/drm/arm/malidp_mw.c > index f5847a7..e54921d 100644 > --- a/drivers/gpu/drm/arm/malidp_mw.c > +++ b/drivers/gpu/drm/arm/malidp_mw.c > @@ -212,7 +212,6 @@ int malidp_mw_connector_init(struct drm_device *drm) > if (!malidp->dev->hw->enable_memwrite) > return 0; > > - malidp->mw_connector.encoder.possible_crtcs = 1 << > drm_crtc_index(>crtc); > drm_connector_helper_add(>mw_connector.base, >_mw_connector_helper_funcs); > > @@ -223,7 +222,8 @@ int malidp_mw_connector_init(struct drm_device *drm) > ret = drm_writeback_connector_init(drm, >mw_connector, > _mw_connector_funcs, > _mw_encoder_helper_funcs, > -formats, n_formats); > +formats, n_formats, > + (1 << drm_crtc_index(>crtc))); > kfree(formats); > if (ret) > return ret; > diff --git a/drivers/gpu/drm/drm_writeback.c b/drivers/gpu/drm/drm_writeback.c > index dccf4504..dc2ef12 100644 > --- a/drivers/gpu/drm/drm_writeback.c > +++ b/drivers/gpu/drm/drm_writeback.c > @@ -157,6 +157,7 @@ static const struct drm_encoder_funcs > drm_writeback_encoder_funcs = { > * @enc_helper_funcs: Encoder helper funcs vtable to be used by the internal > encoder > * @formats: Array of supported pixel formats for the writeback engine > * @n_formats: Length of the formats array > + * @possible_crtcs: possible crtcs for the internal writeback encoder > * > * This function creates the writeback-connector-specific properties if they > * have not been already created, initializes the connector as > @@ -174,7 +175,7 @@ int drm_writeback_connector_init(struct drm_device *dev, >struct drm_writeback_connector *wb_connector, >const struct drm_connector_funcs *con_funcs, >const struct drm_encoder_helper_funcs > *enc_helper_funcs, > - const u32 *formats, int n_formats) > + const u32 *formats, int n_formats, uint32_t > possible_crtcs) > { > struct drm_property_blob *blob; > struct drm_connector *connector = _connector->base; > @@ -190,6 +191,9 @@ int drm_writeback_connector_init(struct drm_device *dev, > return PTR_ERR(blob); > > drm_encoder_helper_add(_connector->encoder, enc_helper_funcs); > + > + wb_connector->encoder.possible_crtcs
[Freedreno] [PATCH v4 1/4] drm: allow passing possible_crtcs to drm_writeback_connector_init()
Clients of drm_writeback_connector_init() initialize the possible_crtcs and then invoke the call to this API. To simplify things, allow passing possible_crtcs as a parameter to drm_writeback_connector_init() and make changes to the other drm drivers to make them compatible with this change. changes in v4: - keep only changes related to possible_crtcs - add line breaks after ARRAY_SIZE - stop using temporary variables for possible_crtcs Signed-off-by: Abhinav Kumar --- drivers/gpu/drm/arm/display/komeda/komeda_wb_connector.c | 3 +-- drivers/gpu/drm/arm/malidp_mw.c | 4 ++-- drivers/gpu/drm/drm_writeback.c | 6 +- drivers/gpu/drm/rcar-du/rcar_du_writeback.c | 4 ++-- drivers/gpu/drm/vc4/vc4_txp.c| 3 ++- drivers/gpu/drm/vkms/vkms_writeback.c| 4 ++-- include/drm/drm_writeback.h | 2 +- 7 files changed, 15 insertions(+), 11 deletions(-) diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_wb_connector.c b/drivers/gpu/drm/arm/display/komeda/komeda_wb_connector.c index e465cc4..40774e6 100644 --- a/drivers/gpu/drm/arm/display/komeda/komeda_wb_connector.c +++ b/drivers/gpu/drm/arm/display/komeda/komeda_wb_connector.c @@ -155,7 +155,6 @@ static int komeda_wb_connector_add(struct komeda_kms_dev *kms, kwb_conn->wb_layer = kcrtc->master->wb_layer; wb_conn = _conn->base; - wb_conn->encoder.possible_crtcs = BIT(drm_crtc_index(>base)); formats = komeda_get_layer_fourcc_list(>fmt_tbl, kwb_conn->wb_layer->layer_type, @@ -164,7 +163,7 @@ static int komeda_wb_connector_add(struct komeda_kms_dev *kms, err = drm_writeback_connector_init(>base, wb_conn, _wb_connector_funcs, _wb_encoder_helper_funcs, - formats, n_formats); + formats, n_formats, BIT(drm_crtc_index(>base))); komeda_put_fourcc_list(formats); if (err) { kfree(kwb_conn); diff --git a/drivers/gpu/drm/arm/malidp_mw.c b/drivers/gpu/drm/arm/malidp_mw.c index f5847a7..e54921d 100644 --- a/drivers/gpu/drm/arm/malidp_mw.c +++ b/drivers/gpu/drm/arm/malidp_mw.c @@ -212,7 +212,6 @@ int malidp_mw_connector_init(struct drm_device *drm) if (!malidp->dev->hw->enable_memwrite) return 0; - malidp->mw_connector.encoder.possible_crtcs = 1 << drm_crtc_index(>crtc); drm_connector_helper_add(>mw_connector.base, _mw_connector_helper_funcs); @@ -223,7 +222,8 @@ int malidp_mw_connector_init(struct drm_device *drm) ret = drm_writeback_connector_init(drm, >mw_connector, _mw_connector_funcs, _mw_encoder_helper_funcs, - formats, n_formats); + formats, n_formats, + (1 << drm_crtc_index(>crtc))); kfree(formats); if (ret) return ret; diff --git a/drivers/gpu/drm/drm_writeback.c b/drivers/gpu/drm/drm_writeback.c index dccf4504..dc2ef12 100644 --- a/drivers/gpu/drm/drm_writeback.c +++ b/drivers/gpu/drm/drm_writeback.c @@ -157,6 +157,7 @@ static const struct drm_encoder_funcs drm_writeback_encoder_funcs = { * @enc_helper_funcs: Encoder helper funcs vtable to be used by the internal encoder * @formats: Array of supported pixel formats for the writeback engine * @n_formats: Length of the formats array + * @possible_crtcs: possible crtcs for the internal writeback encoder * * This function creates the writeback-connector-specific properties if they * have not been already created, initializes the connector as @@ -174,7 +175,7 @@ int drm_writeback_connector_init(struct drm_device *dev, struct drm_writeback_connector *wb_connector, const struct drm_connector_funcs *con_funcs, const struct drm_encoder_helper_funcs *enc_helper_funcs, -const u32 *formats, int n_formats) +const u32 *formats, int n_formats, uint32_t possible_crtcs) { struct drm_property_blob *blob; struct drm_connector *connector = _connector->base; @@ -190,6 +191,9 @@ int drm_writeback_connector_init(struct drm_device *dev, return PTR_ERR(blob); drm_encoder_helper_add(_connector->encoder, enc_helper_funcs); + + wb_connector->encoder.possible_crtcs = possible_crtcs; + ret = drm_encoder_init(dev, _connector->encoder, _writeback_encoder_funcs, DRM_MODE_ENCODER_VIRTUAL,