From patchwork Mon Aug 26 16:22:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Louis Chauvet X-Patchwork-Id: 13778135 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 6B878C5321D for ; Mon, 26 Aug 2024 16:22:54 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E1BC210E233; Mon, 26 Aug 2024 16:22:53 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=bootlin.com header.i=@bootlin.com header.b="C4oPdX5B"; dkim-atps=neutral Received: from relay9-d.mail.gandi.net (relay9-d.mail.gandi.net [217.70.183.199]) by gabe.freedesktop.org (Postfix) with ESMTPS id 70E3210E1E9 for ; Mon, 26 Aug 2024 16:22:52 +0000 (UTC) Received: by mail.gandi.net (Postfix) with ESMTPSA id 76512FF805; Mon, 26 Aug 2024 16:22:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1724689369; 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; bh=Hmv5Zztvd+xgfFCyFuGY+vl66/1uKV6MU6cyJl2eurk=; b=C4oPdX5Bzq1by1yA7MY/ZQug9abWD6vHHF/ngQfTmtrtImdB/VYp9MVnm29fJqHYnSTnoa oPODHCdZC+j0FynIgikASAXbyM5aVDLvvZT86MYZYhelf/n13Zvzw717J6SXCU6TCAVwP5 hp3s2wcL+X7TEBKnzXL1bhztuJeuFZRtE1z2Kz+mhFLmaPdkUF8kpe7cOqeiig7QXhzumE fPVI2SgYpAupK39dlK/E8UxBOdUnVBgNB9OBXSxvv8gHt6jAb6H2e7ClOYyAzwemPGhXPU RgMUaDc6FrF3pYuok///5OFGlfX+I64cvQLfsjZpVC8XbAXNHmzyXgO5ucTyWQ== From: Louis Chauvet Date: Mon, 26 Aug 2024 18:22:45 +0200 Subject: [PATCH v2] drm/vkms: Add documentation MIME-Version: 1.0 Message-Id: <20240826-google-clarifications-v2-1-2574655b0b91@bootlin.com> X-B4-Tracking: v=1; b=H4sIANSrzGYC/3WOQQ6CMBBFr0JmbbUUVMLKexgWpR1gEkq1rQRDu Lu1xKW7eZO8//8KHh2hhzpbweFMnuwUQRwyUIOcemSkI4PgouRnwVlvbT8iU6N01JGSIQqeadR YadViUUmI7sNhR0vKvTc7O3y+YnzYn9BKH1OsMRTqTDvDDHl1+h1swiXA1xzIB+veaeCcJzVtq fLyz5Y5Z5wViNeLvmquRHVrrQ0jTcdYB822bR9cMW5n9gAAAA== To: Rodrigo Siqueira , Melissa Wen , =?utf-8?q?Ma=C3=ADra_Canal?= , Haneen Mohammed , Daniel Vetter , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie 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, marcheu@google.com, nicolejadeyee@google.com, Louis Chauvet X-Mailer: b4 0.15-dev X-Developer-Signature: v=1; a=openpgp-sha256; l=8372; i=louis.chauvet@bootlin.com; h=from:subject:message-id; bh=sxyzh2oWlsvCOBzm/vhCR+eRbF4VQBZxN/wTkbrI97M=; b=owEBbQKS/ZANAwAIASCtLsZbECziAcsmYgBmzKvYAYz4fv/OkpQXIMjtzPMjI60u8QEpUws0e Zwf7+bBMAyJAjMEAAEIAB0WIQRPj7g/vng8MQxQWQQgrS7GWxAs4gUCZsyr2AAKCRAgrS7GWxAs 4oloEACG5D+osN9wRvX6TE+GHPAQxKHwdAcKNN654UPfZ2DYlxY7tifOcAP6sOdE6sskXTMHfC5 UD/FEdHPhIEVvZR+BCSPvmKzhwRjPO2sECO6mYATRrqDzlro9yp9bk1j1kh0FhI37hPwWSVdEQM hiVI1sV6IL3zHq6EZnoiwCM4gJyU7ojpQRON3+PLWxMTlOOlk11z12QImv0fhskoa7Cw3Vrd3yq TzmRUExboAlzQ663/s5REn91KI1T8AGjOX/TfgX9tsKxqMHP/ZNOpaCkU4tpKg9ZU5vFlBq3Quv NxqPXBMa6nChOA+Cv7TGqy1Dml2QstMvODxfZDMr2TDsPZtkIvOHOlSHRTwCqYcQsi+MU3uBSnX NRoGv5rZr2WKYQ3jEVhoFCvWWgcxTjbuVtKcbcEjfxRqlTmL+LcgAfgddX8kAsHvUCtOkoxiZpv VzPp9wRo8qSqL42IpwMHZfWER17mc0y+wHMWKHBGlhVnJcbDuT/xmu5s5czhI0Iw3XtunfepyS3 AKxRQa0qJaC6Kq18sq+GpR1WZaASZHYRTAHd87irbQQPpAcIXdEsEIHMVU8XCdXRQysbCPLRRKD FMP213GRZWVnzQ2BIhXv0N0VIinr1L7mN3MLBVAVdgyagQPjTFM5Y4B55d6AmssNhMBbK0ueHEi vNWU+EnPmRzZpYA== X-Developer-Key: i=louis.chauvet@bootlin.com; a=openpgp; fpr=8B7104AE9A272D6693F527F2EC1883F55E0B40A5 X-GND-Sasl: louis.chauvet@bootlin.com X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Add documentation around vkms_output and its initialization. Signed-off-by: Louis Chauvet --- This series does not introduce functionnal changes, only some documentation and renaming to clarify the code. --- Changes in v2: - Dropped already applied patches - Dropped useless patch as its content is deleted later - Remove dependency on previous series - Apply Maíra's comments - Link to v1: https://lore.kernel.org/r/20240814-google-clarifications-v1-0-3ee76d7d0c28@bootlin.com --- drivers/gpu/drm/vkms/vkms_drv.h | 86 ++++++++++++++++++++++++++++++++------ drivers/gpu/drm/vkms/vkms_output.c | 12 ++++++ 2 files changed, 86 insertions(+), 12 deletions(-) --- base-commit: 22bc22ccf95bfa6eb6288ba4bc33d7fc0078381e change-id: 20240520-google-clarifications-dede8dcbe38a Best regards, diff --git a/drivers/gpu/drm/vkms/vkms_drv.h b/drivers/gpu/drm/vkms/vkms_drv.h index 5e46ea5b96dc..1fc068d4de4c 100644 --- a/drivers/gpu/drm/vkms/vkms_drv.h +++ b/drivers/gpu/drm/vkms/vkms_drv.h @@ -73,29 +73,56 @@ struct vkms_color_lut { }; /** - * vkms_crtc_state - Driver specific CRTC state + * struct vkms_crtc_state - Driver specific CRTC state + * * @base: base CRTC state * @composer_work: work struct to compose and add CRC entries - * @n_frame_start: start frame number for computed CRC - * @n_frame_end: end frame number for computed CRC + * + * @num_active_planes: Number of active planes + * @active_planes: List containing all the active planes (counted by + * @num_active_planes). They should be stored in z-order. + * @active_writeback: Current active writeback job + * @gamma_lut: Look up table for gamma used in this CRTC + * @crc_pending: Protected by @vkms_output.composer_lock, true when the frame CRC is not computed + * yet. Used by vblank to detect if the composer is too slow. + * @wb_pending: Protected by @vkms_output.composer_lock, true when a writeback frame is requested. + * @frame_start: Protected by @vkms_output.composer_lock, saves the frame number before the start + * of the composition process. + * @frame_end: Protected by @vkms_output.composer_lock, saves the last requested frame number. + * This is used to generate enough CRC entries when the composition worker is too slow. */ struct vkms_crtc_state { struct drm_crtc_state base; struct work_struct composer_work; int num_active_planes; - /* stack of active planes for crc computation, should be in z order */ struct vkms_plane_state **active_planes; struct vkms_writeback_job *active_writeback; struct vkms_color_lut gamma_lut; - /* below four are protected by vkms_output.composer_lock */ bool crc_pending; bool wb_pending; u64 frame_start; u64 frame_end; }; +/** + * struct vkms_output - Internal representation of all output components in vkms + * + * @crtc: Base CRTC in DRM + * @encoder: DRM encoder used for this output + * @connector: DRM connector used for this output + * @wb_connecter: DRM writeback connector used for this output + * @vblank_hrtimer: Timer used to trigger the vblank + * @period_ns: Period of the vblank timer, used to configure @vblank_hrtimer and to compute + * vblank timestamps + * @composer_workq: Ordered workqueue for @composer_state.composer_work. + * @lock: Lock used to protect concurrent access to the composer + * @composer_enabled: Protected by @lock, true when the vkms composer is active (crc needed or + * writeback) + * @composer_state: Current state of this vkms output + * @composer_lock: Lock used internally to protect @composer_state members + */ struct vkms_output { struct drm_crtc crtc; struct drm_encoder encoder; @@ -103,28 +130,38 @@ struct vkms_output { struct drm_writeback_connector wb_connector; struct hrtimer vblank_hrtimer; ktime_t period_ns; - /* ordered wq for composer_work */ struct workqueue_struct *composer_workq; - /* protects concurrent access to composer */ spinlock_t lock; - /* protected by @lock */ bool composer_enabled; struct vkms_crtc_state *composer_state; spinlock_t composer_lock; }; -struct vkms_device; - +/** + * struct vkms_config - General configuration for VKMS driver + * + * @writeback: If true, a writeback buffer can be attached to the CRTC + * @cursor: If true, a cursor plane is created in the VKMS device + * @overlay: If true, NUM_OVERLAY_PLANES will be created for the VKMS device + * @dev: Used to store the current vkms device. Only set when the device is instantiated. + */ struct vkms_config { bool writeback; bool cursor; bool overlay; - /* only set when instantiated */ struct vkms_device *dev; }; +/** + * struct vkms_device - Description of a vkms device + * + * @drm - Base device in DRM + * @platform - Associated platform device + * @output - Configuration and sub-components of the vkms device + * @config: Configuration used in this vkms device + */ struct vkms_device { struct drm_device drm; struct platform_device *platform; @@ -132,6 +169,10 @@ struct vkms_device { const struct vkms_config *config; }; +/* + * The following helpers are used to convert a member of a struct into its parent. + */ + #define drm_crtc_to_vkms_output(target) \ container_of(target, struct vkms_output, crtc) @@ -144,12 +185,33 @@ struct vkms_device { #define to_vkms_plane_state(target)\ container_of(target, struct vkms_plane_state, base.base) -/* CRTC */ +/** + * vkms_crtc_init() - Initialize a CRTC for vkms + * @dev: DRM device associated with the vkms buffer + * @crtc: uninitialized CRTC device + * @primary: primary plane to attach to the CRTC + * @cursor plane to attach to the CRTC + */ int vkms_crtc_init(struct drm_device *dev, struct drm_crtc *crtc, struct drm_plane *primary, struct drm_plane *cursor); +/** + * vkms_output_init() - Initialize all sub-components needed for a vkms device. + * + * @vkmsdev: vkms device to initialize + * @possible_crtc_index: CRTC which can be attached to the planes. The caller must ensure that + * possible_crtc_index is positive and less or equals to 31. + */ int vkms_output_init(struct vkms_device *vkmsdev, int index); +/** + * vkms_plane_init() - Initialize a plane + * + * @vkmsdev: vkms device containing the plane + * @type: type of plane to initialize + * @possible_crtc_index: CRTC which can be attached to the plane. The caller must ensure that + * possible_crtc_index is positive and less or equals to 31. + */ struct vkms_plane *vkms_plane_init(struct vkms_device *vkmsdev, enum drm_plane_type type, int index); diff --git a/drivers/gpu/drm/vkms/vkms_output.c b/drivers/gpu/drm/vkms/vkms_output.c index 5ce70dd946aa..da69beb43ab0 100644 --- a/drivers/gpu/drm/vkms/vkms_output.c +++ b/drivers/gpu/drm/vkms/vkms_output.c @@ -21,6 +21,7 @@ static int vkms_conn_get_modes(struct drm_connector *connector) { int count; + /* Use the default modes list from DRM */ count = drm_add_modes_noedid(connector, XRES_MAX, YRES_MAX); drm_set_preferred_mode(connector, XRES_DEF, YRES_DEF); @@ -58,6 +59,12 @@ int vkms_output_init(struct vkms_device *vkmsdev, int index) int writeback; unsigned int n; + /* + * Initialize used plane. One primary plane is required to perform the composition. + * + * The overlay and cursor planes are not mandatory, but can be used to perform complex + * composition. + */ primary = vkms_plane_init(vkmsdev, DRM_PLANE_TYPE_PRIMARY, index); if (IS_ERR(primary)) return PTR_ERR(primary); @@ -76,6 +83,7 @@ int vkms_output_init(struct vkms_device *vkmsdev, int index) return PTR_ERR(cursor); } + /* [1]: Allocation of a CRTC, its index will be 1 */ ret = vkms_crtc_init(dev, crtc, &primary->base, &cursor->base); if (ret) return ret; @@ -95,6 +103,10 @@ int vkms_output_init(struct vkms_device *vkmsdev, int index) DRM_ERROR("Failed to init encoder\n"); goto err_encoder; } + /* + * This is an hardcoded value to select crtc for the encoder. + * 1 here designate the first registered CRTC, the one allocated in [1] + */ encoder->possible_crtcs = 1; ret = drm_connector_attach_encoder(connector, encoder);