Commit 57b8280a authored by Abhinav Kumar's avatar Abhinav Kumar Committed by Dmitry Baryshkov
Browse files

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 v2:
	- split the changes according to their functionality

changes in v3:
	- allow passing possible_crtcs for existing users of
	  drm_writeback_connector_init()
	- squash the vendor changes into the same commit so
	  that each patch in the series can compile individually

changes in v4:
    - keep only changes related to possible_crtcs
	- add line breaks after ARRAY_SIZE
	- stop using temporary variables for possible_crtcs

changes in v5:
    - None

changes in v6:
    - None

changes in v7:
	- wrap long lines to match the coding style of existing drivers
	- Fix indentation and remove parenthesis where not needed
	- use u32 instead of uint32_t for possible_crtcs

Signed-off-by: default avatarAbhinav Kumar <quic_abhinavk@quicinc.com>
Acked-by: default avatarLiviu Dudau <liviu.dudau@arm.com>
Reviewed-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Patchwork: https://patchwork.freedesktop.org/patch/483501/
Link: https://lore.kernel.org/r/1650984096-9964-2-git-send-email-quic_abhinavk@quicinc.com


Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
parent fa5186b2

drivers/gpu/drm/arm/display/komeda/komeda_wb_connector.c

+2 −2
Original line number Diff line number Diff line
@@ -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 = &kwb_conn->base;

	wb_conn->encoder.possible_crtcs = BIT(drm_crtc_index(&kcrtc->base));



	formats = komeda_get_layer_fourcc_list(&mdev->fmt_tbl,

					       kwb_conn->wb_layer->layer_type,
@@ -164,7 +163,8 @@ static int komeda_wb_connector_add(struct komeda_kms_dev *kms, 
	err = drm_writeback_connector_init(&kms->base, wb_conn,

					   &komeda_wb_connector_funcs,

					   &komeda_wb_encoder_helper_funcs,

					   formats, n_formats);

					   formats, n_formats,

					   BIT(drm_crtc_index(&kcrtc->base)));

	komeda_put_fourcc_list(formats);

	if (err) {

		kfree(kwb_conn);

drivers/gpu/drm/arm/malidp_mw.c

+2 −2
Original line number Diff line number Diff line
@@ -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(&malidp->crtc);

	drm_connector_helper_add(&malidp->mw_connector.base,

				 &malidp_mw_connector_helper_funcs);
@@ -223,7 +222,8 @@ int malidp_mw_connector_init(struct drm_device *drm) 
	ret = drm_writeback_connector_init(drm, &malidp->mw_connector,

					   &malidp_mw_connector_funcs,

					   &malidp_mw_encoder_helper_funcs,

					   formats, n_formats);

					   formats, n_formats,

					   1 << drm_crtc_index(&malidp->crtc));

	kfree(formats);

	if (ret)

		return ret;

drivers/gpu/drm/drm_writeback.c

+6 −1
Original line number Diff line number Diff line
@@ -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,8 @@ 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,

				 u32 possible_crtcs)

{

	struct drm_property_blob *blob;

	struct drm_connector *connector = &wb_connector->base;
@@ -190,6 +192,9 @@ int drm_writeback_connector_init(struct drm_device *dev, 
		return PTR_ERR(blob);



	drm_encoder_helper_add(&wb_connector->encoder, enc_helper_funcs);



	wb_connector->encoder.possible_crtcs = possible_crtcs;



	ret = drm_encoder_init(dev, &wb_connector->encoder,

			       &drm_writeback_encoder_funcs,

			       DRM_MODE_ENCODER_VIRTUAL, NULL);

drivers/gpu/drm/rcar-du/rcar_du_writeback.c

+2 −2
Original line number Diff line number Diff line
@@ -200,7 +200,6 @@ int rcar_du_writeback_init(struct rcar_du_device *rcdu, 
{

	struct drm_writeback_connector *wb_conn = &rcrtc->writeback;



	wb_conn->encoder.possible_crtcs = 1 << drm_crtc_index(&rcrtc->crtc);

	drm_connector_helper_add(&wb_conn->base,

				 &rcar_du_wb_conn_helper_funcs);
@@ -208,7 +207,8 @@ int rcar_du_writeback_init(struct rcar_du_device *rcdu, 
					    &rcar_du_wb_conn_funcs,

					    &rcar_du_wb_enc_helper_funcs,

					    writeback_formats,

					    ARRAY_SIZE(writeback_formats));

					    ARRAY_SIZE(writeback_formats),

					    1 << drm_crtc_index(&rcrtc->crtc));

}



void rcar_du_writeback_setup(struct rcar_du_crtc *rcrtc,

drivers/gpu/drm/vc4/vc4_txp.c

+2 −1
Original line number Diff line number Diff line
@@ -497,7 +497,8 @@ static int vc4_txp_bind(struct device *dev, struct device *master, void *data) 
	ret = drm_writeback_connector_init(drm, &txp->connector,

					   &vc4_txp_connector_funcs,

					   &vc4_txp_encoder_helper_funcs,

					   drm_fmts, ARRAY_SIZE(drm_fmts));

					   drm_fmts, ARRAY_SIZE(drm_fmts),

					   0);

	if (ret)

		return ret;