From nobody Fri Nov 29 18:44:33 2024 Received: from relay9-d.mail.gandi.net (relay9-d.mail.gandi.net [217.70.183.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D04191DF267 for ; Fri, 22 Nov 2024 16:28:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.70.183.199 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732292895; cv=none; b=lW3shgdYIHYvlw+v5htR9J5vpyPpOGHiAvhX4mF2OZLE5jwTIETD8GMBfSXRyXL7gl5bxD8ol+A5Z0i7WQN3tVTeQDfPBOqkBsPzVJzkKBtjvxyvmUNJK7j9fj6AVuUiGLAP5Ug94x7ZWt4svRW4o3oolkeWjJu+e77FuNebHtY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732292895; c=relaxed/simple; bh=xMEy8ARubcCf58SXzdc2VN3L872hkUPBgnkxnJ9Ick4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=HoipbXa6NxzVgB+GijQhvI1OvDPeHJ9GYK/U+WmGFI2jXWxfxLJxgWKue2R2j7VnMMmkK2mflRhkyO4C8F1oQLKxZkp9vunJ24P2T1ju1DC1t1s09IhwpIHvt9tGLIulJZIm0AIHmjidQFu4R9keCM+T7qLh0B86PKrO+bdu7mk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com; spf=pass smtp.mailfrom=bootlin.com; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b=mDGtHAki; arc=none smtp.client-ip=217.70.183.199 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bootlin.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="mDGtHAki" Received: by mail.gandi.net (Postfix) with ESMTPSA id 78A67FF805; Fri, 22 Nov 2024 16:28:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1732292885; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=KyRxWncRqDtfIEyzSLj62S6Zb1ebSov3BoKYihZ9vlU=; b=mDGtHAkibMovrYUM1rEEwmChJisFbiy8mpm3moNI0TpKe8rbqsVbSmZ2cL1phKov8GmnSa QUhvqDU4ivn8SQJqf51whAHiJbgrq/dbLr8dQZVundpRPJBG+7g7tFFbBCPnuDKEbHTrf3 0/Ta6v+9yp5C2s8D+m9001eFjyL5lwFGJHRVb4TKjZBKyNx9arhoebHciYegM1XVvg3e7E mfgngSv5ulR4gJya0dV9wSNcUxhSEIHW2PNOlQnEV9BlqqcT+V8GB2xnZStMg7CPyFGcoV LLyHhFMmSTKEtF1DcEegmUVAfRHwmXN+RKuQPe+4rrXKyQe/MEI6USReNs8Isg== From: Louis Chauvet Date: Fri, 22 Nov 2024 17:27:59 +0100 Subject: [PATCH v5 4/5] drm: writeback: Introduce drm managed helpers Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20241122-google-vkms-managed-v5-4-1ab60403e960@bootlin.com> References: <20241122-google-vkms-managed-v5-0-1ab60403e960@bootlin.com> In-Reply-To: <20241122-google-vkms-managed-v5-0-1ab60403e960@bootlin.com> To: Rodrigo Siqueira , Melissa Wen , =?utf-8?q?Ma=C3=ADra_Canal?= , Haneen Mohammed , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Simona Vetter Cc: dri-devel@lists.freedesktop.org, arthurgrillo@riseup.net, linux-kernel@vger.kernel.org, jeremie.dautheribes@bootlin.com, miquel.raynal@bootlin.com, thomas.petazzoni@bootlin.com, seanpaul@google.com, nicolejadeyee@google.com, Louis Chauvet X-Mailer: b4 0.15-dev X-Developer-Signature: v=1; a=openpgp-sha256; l=12891; i=louis.chauvet@bootlin.com; h=from:subject:message-id; bh=xMEy8ARubcCf58SXzdc2VN3L872hkUPBgnkxnJ9Ick4=; b=owEBbQKS/ZANAwAIASCtLsZbECziAcsmYgBnQLEOk7GLbLAuEgFjzBMXy6sWlC10VydWUIqCO Q1jiBj6vTKJAjMEAAEIAB0WIQRPj7g/vng8MQxQWQQgrS7GWxAs4gUCZ0CxDgAKCRAgrS7GWxAs 4i9OEAC3Kk4R8pb6gKRaBbdMJCyLGdNJlTT2vn1G5ESG/hwoRddM4pLRGMfSWJvpHpIF1UZpsS8 O4HLzfJuitSNOlvJax5Z7rjhgnz1ROWCnhmdLxTYgVtN7Rlh9agDDP7+jHoWK1yclvEdJmublW1 uitLIinbaouBkIumukBgC4Usbu3kdAZOXXsfXLsIIHdqZP4tjHZSco9iGYayAyyTWgUXI1z90h9 KhiXF9lXqoCnxOW+974bqgUe+he4XN3CuVyWsWQDqNl3WBes/q7Xfssgv3MyijJJqz4SImdg0DO PMZ1+hyY6QWPy90n4lkveEscrS61f6LVB98W65/zOT+Fw/1+0GGubdGZMt2dysjf+4aaOEZXzNh NWwW5YMoe792zLGJBx+CqGE8oLFgvNnr4229iqly+Fm2Ni5DdiUkhlUEZrJQwahxkAF3YXxrOdu 8qytRMcMRITLutXZiw+GYjVCyNM6xiEimeewaDLX/mGQYlfKUz9BXSNyUsV1gcLiUSOqjqNt/CU pYndDeIxDEo519tJtfQfqymsBIXji2t5IvF72aI+HiUVp1S49hFbMGaanQxwnm16wjEby6jk23Z nFfpfflL+P5wlthcrj52sQjj8UTWCNRDMhiufVaceCcACeY36FRMpMVy7B/FCnYKfbc/im6xO5v lSwCor9KlgxBrdg== X-Developer-Key: i=louis.chauvet@bootlin.com; a=openpgp; fpr=8B7104AE9A272D6693F527F2EC1883F55E0B40A5 X-GND-Sasl: louis.chauvet@bootlin.com Currently drm_writeback_connector are created by drm_writeback_connector_init or drm_writeback_connector_init_with_encoder. Both of the function uses drm_connector_init and drm_encoder_init, but there is no way to properly clean those structure from outside. By using drm managed variants, we can ensure that the writeback connector is properly cleaned. This patch introduce drmm_writeback_connector_init, an helper to initialize a writeback connector using drm managed helpers. This function allows the caller to use its own encoder. Signed-off-by: Louis Chauvet --- drivers/gpu/drm/drm_connector.c | 4 + drivers/gpu/drm/drm_writeback.c | 224 ++++++++++++++++++++++++++++++++++--= ---- include/drm/drm_writeback.h | 10 ++ 3 files changed, 208 insertions(+), 30 deletions(-) diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connecto= r.c index fc35f47e2849ed6786d6223ac9c69e1c359fc648..fe4c1967860a3f49b92622c9691= 2c59c505a26ab 100644 --- a/drivers/gpu/drm/drm_connector.c +++ b/drivers/gpu/drm/drm_connector.c @@ -613,6 +613,7 @@ static void drm_mode_remove(struct drm_connector *conne= ctor, drm_mode_destroy(connector->dev, mode); } =20 +void drm_writeback_connector_cleanup(struct drm_device *dev, void *data); /** * drm_connector_cleanup - cleans up an initialised connector * @connector: connector to cleanup @@ -631,6 +632,9 @@ void drm_connector_cleanup(struct drm_connector *connec= tor) DRM_CONNECTOR_REGISTERED)) drm_connector_unregister(connector); =20 + if (connector->connector_type =3D=3D DRM_MODE_CONNECTOR_WRITEBACK) + drm_writeback_connector_cleanup(dev, connector); + if (connector->privacy_screen) { drm_privacy_screen_put(connector->privacy_screen); connector->privacy_screen =3D NULL; diff --git a/drivers/gpu/drm/drm_writeback.c b/drivers/gpu/drm/drm_writebac= k.c index 33a3c98a962d1ec49ac4b353902036cf74290ae6..28f299ce8e10f5ee6078c759b76= cff9034f010d8 100644 --- a/drivers/gpu/drm/drm_writeback.c +++ b/drivers/gpu/drm/drm_writeback.c @@ -15,6 +15,7 @@ #include #include #include +#include #include #include #include @@ -196,13 +197,12 @@ int drm_writeback_connector_init(struct drm_device *d= ev, EXPORT_SYMBOL(drm_writeback_connector_init); =20 /** - * drm_writeback_connector_init_with_encoder - Initialize a writeback conn= ector with - * a custom encoder + * __drm_writeback_connector_init - Common initialization code for writeba= ck + * connector * * @dev: DRM device * @wb_connector: Writeback connector to initialize * @enc: handle to the already initialized drm encoder - * @con_funcs: Connector funcs vtable * @formats: Array of supported pixel formats for the writeback engine * @n_formats: Length of the formats array * @@ -218,41 +218,32 @@ EXPORT_SYMBOL(drm_writeback_connector_init); * assigning the encoder helper functions, possible_crtcs and any other en= coder * specific operation. * - * Drivers should always use this function instead of drm_connector_init()= to - * set up writeback connectors if they want to manage themselves the lifet= ime of the - * associated encoder. - * * Returns: 0 on success, or a negative error code */ -int drm_writeback_connector_init_with_encoder(struct drm_device *dev, - struct drm_writeback_connector *wb_connector, struct drm_encoder *enc, - const struct drm_connector_funcs *con_funcs, const u32 *formats, - int n_formats) +static int __drm_writeback_connector_init(struct drm_device *dev, + struct drm_writeback_connector *wb_connector, + struct drm_encoder *enc, + const u32 *formats, int n_formats) { - struct drm_property_blob *blob; struct drm_connector *connector =3D &wb_connector->base; struct drm_mode_config *config =3D &dev->mode_config; - int ret =3D create_writeback_properties(dev); - - if (ret !=3D 0) - return ret; - - blob =3D drm_property_create_blob(dev, n_formats * sizeof(*formats), - formats); - if (IS_ERR(blob)) - return PTR_ERR(blob); - + struct drm_property_blob *blob; + int ret; =20 connector->interlace_allowed =3D 0; =20 - ret =3D drm_connector_init(dev, connector, con_funcs, - DRM_MODE_CONNECTOR_WRITEBACK); + ret =3D create_writeback_properties(dev); if (ret) - goto connector_fail; + return ret; =20 ret =3D drm_connector_attach_encoder(connector, enc); if (ret) - goto attach_fail; + return ret; + + blob =3D drm_property_create_blob(dev, n_formats * sizeof(*formats), + formats); + if (IS_ERR(blob)) + return PTR_ERR(blob); =20 INIT_LIST_HEAD(&wb_connector->job_queue); spin_lock_init(&wb_connector->job_lock); @@ -275,15 +266,188 @@ int drm_writeback_connector_init_with_encoder(struct= drm_device *dev, wb_connector->pixel_formats_blob_ptr =3D blob; =20 return 0; +} + +/** + * drm_writeback_connector_init_with_encoder - Initialize a writeback conn= ector with + * a custom encoder + * + * @dev: DRM device + * @wb_connector: Writeback connector to initialize + * @enc: handle to the already initialized drm encoder + * @con_funcs: Connector funcs vtable + * @formats: Array of supported pixel formats for the writeback engine + * @n_formats: Length of the formats array + * + * This function creates the writeback-connector-specific properties if th= ey + * have not been already created, initializes the connector as + * type DRM_MODE_CONNECTOR_WRITEBACK, and correctly initializes the proper= ty + * values. + * + * This function assumes that the drm_writeback_connector's encoder has al= ready been + * created and initialized before invoking this function. + * + * In addition, this function also assumes that callers of this API will m= anage + * assigning the encoder helper functions, possible_crtcs and any other en= coder + * specific operation. + * + * Drivers should always use this function instead of drm_connector_init()= to + * set up writeback connectors if they want to manage themselves the lifet= ime of the + * associated encoder. + * + * Returns: 0 on success, or a negative error code + */ +int drm_writeback_connector_init_with_encoder(struct drm_device *dev, + struct drm_writeback_connector *wb_connector, + struct drm_encoder *enc, + const struct drm_connector_funcs *con_funcs, + const u32 *formats, int n_formats) +{ + struct drm_connector *connector =3D &wb_connector->base; + int ret; + + ret =3D drm_connector_init(dev, connector, con_funcs, + DRM_MODE_CONNECTOR_WRITEBACK); + if (ret) + return ret; + + ret =3D __drm_writeback_connector_init(dev, wb_connector, enc, formats, + n_formats); + if (ret) + drm_connector_cleanup(connector); =20 -attach_fail: - drm_connector_cleanup(connector); -connector_fail: - drm_property_blob_put(blob); return ret; } EXPORT_SYMBOL(drm_writeback_connector_init_with_encoder); =20 +/** + * drm_writeback_connector_cleanup - Cleanup the writeback connector + * @dev: DRM device + * @data: Opaque pointer to the connector + * + * This will decrement the reference counter of blobs and it will clean the + * remaining jobs in this writeback connector. + */ +void drm_writeback_connector_cleanup(struct drm_device *dev, void *data) +{ + struct drm_connector *connector =3D data; + struct drm_writeback_connector *wb_connector =3D container_of(connector, + struct drm_writeback_connector, + base); + unsigned long flags; + struct drm_writeback_job *pos, *n; + + drm_property_blob_put(wb_connector->pixel_formats_blob_ptr); + + spin_lock_irqsave(&wb_connector->job_lock, flags); + list_for_each_entry_safe(pos, n, &wb_connector->job_queue, list_entry) { + drm_writeback_cleanup_job(pos); + list_del(&pos->list_entry); + } + spin_unlock_irqrestore(&wb_connector->job_lock, flags); +} + +/** + * __drmm_writeback_connector_init - Initialize a writeback connector with + * a custom encoder + * + * @dev: DRM device + * @wb_connector: Writeback connector to initialize + * @con_funcs: Connector funcs vtable + * @enc: handle to the already initialized drm encoder + * @formats: Array of supported pixel formats for the writeback engine + * @n_formats: Length of the formats array + * + * This function initialize a writeback connector and register its cleanup. + * It uses the common helper @__drm_writeback_connector_init to do the + * general initialization. + * + * This function assumes that @enc has already been created and initialized + * before invoking this function. + * + * In addition, this function also assumes that callers of this API will m= anage + * assigning the encoder helper functions, possible_crtcs and any other en= coder + * specific operation. + * + * Returns: 0 on success, or a negative error code + */ +static int __drmm_writeback_connector_init(struct drm_device *dev, + struct drm_writeback_connector *wb_connector, + const struct drm_connector_funcs *con_funcs, + struct drm_encoder *enc, + const u32 *formats, int n_formats) +{ + struct drm_connector *connector =3D &wb_connector->base; + int ret; + + ret =3D drmm_connector_init(dev, connector, con_funcs, + DRM_MODE_CONNECTOR_WRITEBACK, NULL); + if (ret) + return ret; + + ret =3D __drm_writeback_connector_init(dev, wb_connector, enc, formats, + n_formats); + if (ret) + return ret; + + return 0; +} + +/** + * drmm_writeback_connector_init - Initialize a writeback connector with + * a custom encoder + * + * @dev: DRM device + * @wb_connector: Writeback connector to initialize + * @con_funcs: Connector funcs vtable + * @enc: handle to the already initialized drm encoder, optional + * @enc_funcs: Encoder funcs vtable, optional, only used when @enc is NULL + * @formats: Array of supported pixel formats for the writeback engine + * @n_formats: Length of the formats array + * @possible_crtcs: if @enc is NULL, this will set the possible_crtc for t= he + * newly created encoder + * + * This function initialize a writeback connector and register its cleanup. + * + * This function creates the writeback-connector-specific properties if th= ey + * have not been already created, initializes the connector as + * type DRM_MODE_CONNECTOR_WRITEBACK, and correctly initializes the proper= ty + * values. + * + * If @enc is NULL, this function will create a drm-managed encoder and wi= ll + * attach @enc_funcs on it. It will also attach the CRTC passed in + * @possible_crtcs + * + * Returns: 0 on success, or a negative error code + */ +int drmm_writeback_connector_init(struct drm_device *dev, + struct drm_writeback_connector *wb_connector, + const struct drm_connector_funcs *con_funcs, + struct drm_encoder *enc, + const struct drm_encoder_helper_funcs *enc_funcs, + const u32 *formats, int n_formats, + u32 possible_crtcs) +{ + int ret; + + if (!enc) { + ret =3D drmm_encoder_init(dev, &wb_connector->encoder, + NULL, DRM_MODE_ENCODER_VIRTUAL, NULL); + if (ret) + return ret; + + enc =3D &wb_connector->encoder; + enc->possible_crtcs |=3D possible_crtcs; + if (enc_funcs) + drm_encoder_helper_add(enc, enc_funcs); + } + + return __drmm_writeback_connector_init(dev, wb_connector, con_funcs, + &wb_connector->encoder, formats, + n_formats); +} +EXPORT_SYMBOL(drmm_writeback_connector_init); + int drm_writeback_set_fb(struct drm_connector_state *conn_state, struct drm_framebuffer *fb) { diff --git a/include/drm/drm_writeback.h b/include/drm/drm_writeback.h index 17e576c80169a820e8d5587b229b2cc2ee369a18..5e5ff8dd9d9d8ab5e46ce028a75= 2062b97e82e0f 100644 --- a/include/drm/drm_writeback.h +++ b/include/drm/drm_writeback.h @@ -161,6 +161,14 @@ int drm_writeback_connector_init_with_encoder(struct d= rm_device *dev, const struct drm_connector_funcs *con_funcs, const u32 *formats, int n_formats); =20 +int drmm_writeback_connector_init(struct drm_device *dev, + struct drm_writeback_connector *wb_connector, + const struct drm_connector_funcs *con_funcs, + struct drm_encoder *enc, + const struct drm_encoder_helper_funcs *enc_funcs, + const u32 *formats, int n_formats, + u32 possible_crtcs); + int drm_writeback_set_fb(struct drm_connector_state *conn_state, struct drm_framebuffer *fb); =20 @@ -175,6 +183,8 @@ void drm_writeback_signal_completion(struct drm_writeback_connector *wb_connect= or, int status); =20 +void drm_writeback_connector_cleanup(struct drm_device *dev, void *data); + struct dma_fence * drm_writeback_get_out_fence(struct drm_writeback_connector *wb_connector); #endif --=20 2.47.0