From nobody Sat Feb 7 09:29:36 2026 Received: from relay5-d.mail.gandi.net (relay5-d.mail.gandi.net [217.70.183.197]) (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 32B3E1F560C for ; Fri, 17 Jan 2025 09:05:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.70.183.197 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737104710; cv=none; b=JboEFejBiZX6w6ZxwlfBAU6qUx29mnBwtrI78BBu80YwH/mBQHd5OT58tr2d9XdnyJAnhPoD6eoxcUBwzqYB1LuEKSIMev2E7JckZo7n2iZw11Xcaw8vcj6vg02FboOwG6mA9MPZyIyXiSWUmi5c2Ugqd9l5KBTAhqLkiqzzIPE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737104710; c=relaxed/simple; bh=pxspv5P5WV7R1DJlKtdquHCZNwmXnqhT4lP7W4392Gk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=GdDCecoQuLJv4PeTstrsOeobv0gztH0Xmmd8Dh35uoBK5KdzvFZa7RdNUwXzKjKlvx6ij+CBXsQPVfZP4529SXoUHIFi37qhrmKN5EU6as/NXOKWWUV6/3Pup/Zgsj3KYYjAxVg8jpuoe+TU0GS0j7bnCwnUOYhgbUxAOQeUUY4= 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=m0mENJu+; arc=none smtp.client-ip=217.70.183.197 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="m0mENJu+" Received: by mail.gandi.net (Postfix) with ESMTPSA id 9739B1C0010; Fri, 17 Jan 2025 09:05:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1737104706; 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=wW2GE+k42eHWzMuTxRJ4pv3t8Znb8O3qE1HKvW+jpiY=; b=m0mENJu+pEwqctltsiTbU4znLsg5xC6pP1pHZzpubq7WhBH+TLn12rNx5QOzCZpIUAnOd6 vNxNj4FRXzvhHg774MHpZZmpQcS29VW5nlZUHdP1qWzNnmy5GIS39NJAQr9L7R6eNxNSrw dD61UO8JFumkaZkJjl5s4RahFE5dS+tK4b+tlTeYyfzykmGu72ktEUZeeCzOCXV2ewNTzR T6lUABiJK7M+jdg1DjdKmTC2Sml7c9O+ED4JNkHzdKOPwgZQpM3KBqlSlvAsHuzAT5Vj5h SkmDQZJrv00EAV9F6KBHsvMubtM/pFenktKC7O85DcROSt2+HAUdDTxOEOM1eA== From: Louis Chauvet Date: Fri, 17 Jan 2025 10:04:29 +0100 Subject: [PATCH v4 3/3] drm/vkms: Switch to dynamic allocation for CRTC 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: <20250117-b4-vkms-allocated-v4-3-8ec8fd21aaf6@bootlin.com> References: <20250117-b4-vkms-allocated-v4-0-8ec8fd21aaf6@bootlin.com> In-Reply-To: <20250117-b4-vkms-allocated-v4-0-8ec8fd21aaf6@bootlin.com> To: Rodrigo Siqueira , =?utf-8?q?Ma=C3=ADra_Canal?= , Haneen Mohammed , Melissa Wen , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Simona Vetter Cc: thomas.petazzoni@bootlin.com, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Louis Chauvet X-Mailer: b4 0.15-dev X-Developer-Signature: v=1; a=openpgp-sha256; l=9891; i=louis.chauvet@bootlin.com; h=from:subject:message-id; bh=pxspv5P5WV7R1DJlKtdquHCZNwmXnqhT4lP7W4392Gk=; b=owEBbQKS/ZANAwAIASCtLsZbECziAcsmYgBnih09Emp+aTjh3QtNN+86NRtYwbKdZItwIxMnZ 5kXAY4MDgCJAjMEAAEIAB0WIQRPj7g/vng8MQxQWQQgrS7GWxAs4gUCZ4odPQAKCRAgrS7GWxAs 4hKXD/9WQ/ZHuxDEuDtzkbnIbGnVML6Q3c7pr+WG9soOV8bKzH2QFd8O9bpC5DQWtR4ellYJgEr +2zt+9La5E4XHU/Vd8K4QxwZNszmEZkZk2c0/ohgVjm92aMjwFoTqmrAJfrawE79anzk4em1Dcn PcJYXAYMkpYFyNjU0qtQw+/uESW5h2I8i5ZKu5Vlxhd6QDU7ahfUHD2UnKgSN3W/aUjOkqUDixN w+xoOC29y4WRItMRtmvbYLR+UbkM2gYWxQFiZ8Vg/lrPy9/zFI4rQ1sb2ki1DC1eLqGvFkhMyvU hfkMWMVTMKcQ+UlpBH5qMd3X83kM1ietmcLeqLSEytN/lKfAKQR8JUy63FRFyeSLwnki/yFXw0p VVfZys2/VMMSK0na+u2Ab0ZHSYJf0IPeO0Mp9ifnaFEUdNCXs9b184jGmpW2sqQq5CHjX91g6rE hgdwaHrXj//mIQkCGqi4v/UGDegxqihV3iOp5uOtN3ExqbWTZIqnp5fmlFJEzZi9Df2RB2fbcL2 5OA0SJ0yvZFi1pzx5VM+EkcuC1T7vpVMRFY21q56g1hqYYnwhHnAskIRpQME8rC+BXqQCJkhkuO OgLFQWynt6TfrBmahacPczpkAaXtd3T9NxCoA8VFlmT31j/2lUy9s4wdNTXp9cKaiHR2ECmMQza 2P3ZpXhQiXyxJ9w== X-Developer-Key: i=louis.chauvet@bootlin.com; a=openpgp; fpr=8B7104AE9A272D6693F527F2EC1883F55E0B40A5 X-GND-Sasl: louis.chauvet@bootlin.com A specific allocation for the CRTC is not strictly necessary at this point, but in order to implement dynamic configuration of VKMS (configFS), it will be easier to have one allocation per CRTC. Reviewed-by: Maxime Ripard Signed-off-by: Louis Chauvet Reviewed-by: Jos=C3=A9 Exp=C3=B3sito --- drivers/gpu/drm/vkms/vkms_crtc.c | 32 +++++++++++++++++--------------- drivers/gpu/drm/vkms/vkms_drv.h | 8 ++++---- drivers/gpu/drm/vkms/vkms_output.c | 22 ++++++++++++---------- drivers/gpu/drm/vkms/vkms_writeback.c | 23 ++++++++++++----------- 4 files changed, 45 insertions(+), 40 deletions(-) diff --git a/drivers/gpu/drm/vkms/vkms_crtc.c b/drivers/gpu/drm/vkms/vkms_c= rtc.c index 434c35d5e9477d2961826262591db8ab43838e09..cf229aec71c3f03bb1306095e8d= d44d63f80cd2a 100644 --- a/drivers/gpu/drm/vkms/vkms_crtc.c +++ b/drivers/gpu/drm/vkms/vkms_crtc.c @@ -84,9 +84,7 @@ static bool vkms_get_vblank_timestamp(struct drm_crtc *cr= tc, int *max_error, ktime_t *vblank_time, bool in_vblank_irq) { - struct drm_device *dev =3D crtc->dev; - struct vkms_device *vkmsdev =3D drm_device_to_vkms_device(dev); - struct vkms_output *output =3D &vkmsdev->output; + struct vkms_output *output =3D drm_crtc_to_vkms_output(crtc); struct drm_vblank_crtc *vblank =3D drm_crtc_vblank_crtc(crtc); =20 if (!READ_ONCE(vblank->enabled)) { @@ -271,25 +269,29 @@ static const struct drm_crtc_helper_funcs vkms_crtc_h= elper_funcs =3D { .atomic_disable =3D vkms_crtc_atomic_disable, }; =20 -int vkms_crtc_init(struct drm_device *dev, struct drm_crtc *crtc, - struct drm_plane *primary, struct drm_plane *cursor) +struct vkms_output *vkms_crtc_init(struct drm_device *dev, struct drm_plan= e *primary, + struct drm_plane *cursor) { - struct vkms_output *vkms_out =3D drm_crtc_to_vkms_output(crtc); + struct vkms_output *vkms_out; + struct drm_crtc *crtc; int ret; =20 - ret =3D drmm_crtc_init_with_planes(dev, crtc, primary, cursor, - &vkms_crtc_funcs, NULL); - if (ret) { - DRM_ERROR("Failed to init CRTC\n"); - return ret; + vkms_out =3D drmm_crtc_alloc_with_planes(dev, struct vkms_output, crtc, + primary, cursor, + &vkms_crtc_funcs, NULL); + if (IS_ERR(vkms_out)) { + DRM_DEV_ERROR(dev->dev, "Failed to init CRTC\n"); + return vkms_out; } =20 + crtc =3D &vkms_out->crtc; + drm_crtc_helper_add(crtc, &vkms_crtc_helper_funcs); =20 ret =3D drm_mode_crtc_set_gamma_size(crtc, VKMS_LUT_SIZE); if (ret) { DRM_ERROR("Failed to set gamma size\n"); - return ret; + return ERR_PTR(ret); } =20 drm_crtc_enable_color_mgmt(crtc, 0, false, VKMS_LUT_SIZE); @@ -299,9 +301,9 @@ int vkms_crtc_init(struct drm_device *dev, struct drm_c= rtc *crtc, =20 vkms_out->composer_workq =3D drmm_alloc_ordered_workqueue(dev, "vkms_comp= oser", 0); if (IS_ERR(vkms_out->composer_workq)) - return PTR_ERR(vkms_out->composer_workq); + return ERR_CAST(vkms_out->composer_workq); if (!vkms_out->composer_workq) - return -ENOMEM; + return ERR_PTR(-ENOMEM); =20 - return ret; + return vkms_out; } diff --git a/drivers/gpu/drm/vkms/vkms_drv.h b/drivers/gpu/drm/vkms/vkms_dr= v.h index 333983bcf8d46ef85101e7c344e256df57551b78..abbb652be2b5389f96cec788371= 17ceb9acef656 100644 --- a/drivers/gpu/drm/vkms/vkms_drv.h +++ b/drivers/gpu/drm/vkms/vkms_drv.h @@ -215,7 +215,6 @@ struct vkms_config { struct vkms_device { struct drm_device drm; struct platform_device *platform; - struct vkms_output output; const struct vkms_config *config; }; =20 @@ -242,8 +241,9 @@ struct vkms_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); +struct vkms_output *vkms_crtc_init(struct drm_device *dev, + struct drm_plane *primary, + struct drm_plane *cursor); =20 /** * vkms_output_init() - Initialize all sub-components needed for a VKMS de= vice. @@ -274,6 +274,6 @@ void vkms_set_composer(struct vkms_output *out, bool en= abled); void vkms_writeback_row(struct vkms_writeback_job *wb, const struct line_b= uffer *src_buffer, int y); =20 /* Writeback */ -int vkms_enable_writeback_connector(struct vkms_device *vkmsdev, struct dr= m_crtc *crtc); +int vkms_enable_writeback_connector(struct vkms_device *vkmsdev, struct vk= ms_output *vkms_out); =20 #endif /* _VKMS_DRV_H_ */ diff --git a/drivers/gpu/drm/vkms/vkms_output.c b/drivers/gpu/drm/vkms/vkms= _output.c index 21ca975e424d148b0669b87784d86f5da2a8b333..22f0d678af3ac8177e43c4ea730= af3f2109de5f3 100644 --- a/drivers/gpu/drm/vkms/vkms_output.c +++ b/drivers/gpu/drm/vkms/vkms_output.c @@ -30,11 +30,10 @@ static const struct drm_connector_helper_funcs vkms_con= n_helper_funcs =3D { =20 int vkms_output_init(struct vkms_device *vkmsdev) { - struct vkms_output *output =3D &vkmsdev->output; struct drm_device *dev =3D &vkmsdev->drm; struct drm_connector *connector; struct drm_encoder *encoder; - struct drm_crtc *crtc =3D &output->crtc; + struct vkms_output *output; struct vkms_plane *primary, *overlay, *cursor =3D NULL; int ret; int writeback; @@ -56,9 +55,12 @@ int vkms_output_init(struct vkms_device *vkmsdev) return PTR_ERR(cursor); } =20 - ret =3D vkms_crtc_init(dev, crtc, &primary->base, &cursor->base); - if (ret) - return ret; + output =3D vkms_crtc_init(dev, &primary->base, + cursor ? &cursor->base : NULL); + if (IS_ERR(output)) { + DRM_ERROR("Failed to allocate CRTC\n"); + return PTR_ERR(output); + } =20 if (vkmsdev->config->overlay) { for (n =3D 0; n < NUM_OVERLAY_PLANES; n++) { @@ -67,7 +69,7 @@ int vkms_output_init(struct vkms_device *vkmsdev) DRM_DEV_ERROR(dev->dev, "Failed to init vkms plane\n"); return PTR_ERR(overlay); } - overlay->base.possible_crtcs =3D drm_crtc_mask(crtc); + overlay->base.possible_crtcs =3D drm_crtc_mask(&output->crtc); } } =20 @@ -97,23 +99,23 @@ int vkms_output_init(struct vkms_device *vkmsdev) DRM_ERROR("Failed to init encoder\n"); return ret; } - encoder->possible_crtcs =3D drm_crtc_mask(crtc); + encoder->possible_crtcs =3D drm_crtc_mask(&output->crtc); =20 + /* Attach the encoder and the connector */ ret =3D drm_connector_attach_encoder(connector, encoder); if (ret) { DRM_ERROR("Failed to attach connector to encoder\n"); return ret; } =20 + /* Initialize the writeback component */ if (vkmsdev->config->writeback) { - writeback =3D vkms_enable_writeback_connector(vkmsdev, crtc); + writeback =3D vkms_enable_writeback_connector(vkmsdev, output); if (writeback) DRM_ERROR("Failed to init writeback connector\n"); } =20 drm_mode_config_reset(dev); =20 - return 0; - return ret; } diff --git a/drivers/gpu/drm/vkms/vkms_writeback.c b/drivers/gpu/drm/vkms/v= kms_writeback.c index 981975c2b0a0c75e4a3aceca2a965f5876ae0a8f..e9b5c74d7c58e7faed870a4368d= ecbd67dab23d2 100644 --- a/drivers/gpu/drm/vkms/vkms_writeback.c +++ b/drivers/gpu/drm/vkms/vkms_writeback.c @@ -105,7 +105,9 @@ static void vkms_wb_cleanup_job(struct drm_writeback_co= nnector *connector, struct drm_writeback_job *job) { struct vkms_writeback_job *vkmsjob =3D job->priv; - struct vkms_device *vkmsdev; + struct vkms_output *vkms_output =3D container_of(connector, + struct vkms_output, + wb_connector); =20 if (!job->fb) return; @@ -114,8 +116,7 @@ static void vkms_wb_cleanup_job(struct drm_writeback_co= nnector *connector, =20 drm_framebuffer_put(vkmsjob->wb_frame_info.fb); =20 - vkmsdev =3D drm_device_to_vkms_device(job->fb->dev); - vkms_set_composer(&vkmsdev->output, false); + vkms_set_composer(vkms_output, false); kfree(vkmsjob); } =20 @@ -124,8 +125,7 @@ static void vkms_wb_atomic_commit(struct drm_connector = *conn, { struct drm_connector_state *connector_state =3D drm_atomic_get_new_connec= tor_state(state, conn); - struct vkms_device *vkmsdev =3D drm_device_to_vkms_device(conn->dev); - struct vkms_output *output =3D &vkmsdev->output; + struct vkms_output *output =3D drm_crtc_to_vkms_output(connector_state->c= rtc); struct drm_writeback_connector *wb_conn =3D &output->wb_connector; struct drm_connector_state *conn_state =3D wb_conn->base.state; struct vkms_crtc_state *crtc_state =3D output->composer_state; @@ -139,7 +139,7 @@ static void vkms_wb_atomic_commit(struct drm_connector = *conn, if (!conn_state) return; =20 - vkms_set_composer(&vkmsdev->output, true); + vkms_set_composer(output, true); =20 active_wb =3D conn_state->writeback_job->priv; wb_frame_info =3D &active_wb->wb_frame_info; @@ -162,22 +162,23 @@ static const struct drm_connector_helper_funcs vkms_w= b_conn_helper_funcs =3D { .atomic_check =3D vkms_wb_atomic_check, }; =20 -int vkms_enable_writeback_connector(struct vkms_device *vkmsdev, struct dr= m_crtc *crtc) +int vkms_enable_writeback_connector(struct vkms_device *vkmsdev, + struct vkms_output *vkms_output) { - struct drm_writeback_connector *wb =3D &vkmsdev->output.wb_connector; + struct drm_writeback_connector *wb =3D &vkms_output->wb_connector; int ret; =20 - ret =3D drmm_encoder_init(&vkmsdev->drm, &vkmsdev->output.wb_encoder, + ret =3D drmm_encoder_init(&vkmsdev->drm, &vkms_output->wb_encoder, NULL, DRM_MODE_ENCODER_VIRTUAL, NULL); if (ret) return ret; - vkmsdev->output.wb_encoder.possible_crtcs |=3D drm_crtc_mask(crtc); + vkms_output->wb_encoder.possible_crtcs |=3D drm_crtc_mask(&vkms_output->c= rtc); =20 drm_connector_helper_add(&wb->base, &vkms_wb_conn_helper_funcs); =20 return drmm_writeback_connector_init(&vkmsdev->drm, wb, &vkms_wb_connector_funcs, - &vkmsdev->output.wb_encoder, + &vkms_output->wb_encoder, vkms_wb_formats, ARRAY_SIZE(vkms_wb_formats)); } --=20 2.47.1