From nobody Sat Nov 30 04:38:24 2024 Received: from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net [217.70.183.196]) (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 CEE401DED6A for ; Fri, 22 Nov 2024 16:35:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.70.183.196 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732293319; cv=none; b=dGooik1F0URiXrLIdSf0f8LpPvcsDRl9yAA6WuIbzQUB56s8pR1t7y0WMD2+N/MtlLdSfzJdiOThCvpw3aq0wd9EbpBHV2dAsLdU4UTqkEhYudHVtQGTzllQpivFUNdkZm8TVm3xAhb7xX+BW/syBi44p/uBhN+L8/TH+l2q92M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732293319; c=relaxed/simple; bh=F+HJyRf6lb1k3bzd/+c5woMOLjAKNPQSEAbQosOxVSA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=rdDOjpGhkBpLKLeAcfTdsgvOe5r7rn4xO+QmxNfOsOoaLsd8BjMc+YHhLFMYlJudR6lAfEHh0Z3lNsRuwoMldzKJXPHdb06vTpxBPhUaItZGCV7ydS51bOCEwYZJVVeJypHF2bTUv9V9rFUoMS7/Z8NfXrPn0I0Epn0/ps/abTs= 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=aO9i4fhZ; arc=none smtp.client-ip=217.70.183.196 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="aO9i4fhZ" Received: by mail.gandi.net (Postfix) with ESMTPSA id BDA61E0002; Fri, 22 Nov 2024 16:35:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1732293315; 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=kwzI7LH/JVNC8tyOHUOkPCCdhISBVOIS1JXA3feRKeg=; b=aO9i4fhZvFSFeAmpo1xhk9+YZLUgheis9/e2JaW6sOyRChm4tnyLaXADAmeLaYo4B2izRX Vj5QNh2tRlzoGLHEw9lxr/09iUbrih3XS5UrkrrWkxTl1nujQkcb1lYE3dwYb0rMk3Y/jO OtOyE/eKJztUHaF93WnkvvGFo/NfM02Jnwv0UIPbFmshEOkMt1h2dT/xOI2+iCv5LM0RyW QF2UTmIlweIWC6rSohPmqSyF1aMhQ6DsfqD1/Lj/7bZCYCD95JO8dr9y7LicF+1vyhJJ9B xaDXel5hLhNo4u26qWzYE+zoJozYpU9c1uBfk8INVM7i4uRivhOEyfzcpbTHQA== From: Louis Chauvet Date: Fri, 22 Nov 2024 17:35:11 +0100 Subject: [PATCH v2 3/4] 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: <20241122-b4-vkms-allocated-v2-3-ff7bddbf0bfb@bootlin.com> References: <20241122-b4-vkms-allocated-v2-0-ff7bddbf0bfb@bootlin.com> In-Reply-To: <20241122-b4-vkms-allocated-v2-0-ff7bddbf0bfb@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=9214; i=louis.chauvet@bootlin.com; h=from:subject:message-id; bh=F+HJyRf6lb1k3bzd/+c5woMOLjAKNPQSEAbQosOxVSA=; b=owEBbQKS/ZANAwAIASCtLsZbECziAcsmYgBnQLK/hV5x9PKstbzmloKqZfQ0vSz+bAV6QWMDW xE/G/dkI7SJAjMEAAEIAB0WIQRPj7g/vng8MQxQWQQgrS7GWxAs4gUCZ0CyvwAKCRAgrS7GWxAs 4mgVD/oCMQX4HWpUrzwUSuCNrLpr/4Rlt9nK03+0rWL6tjJ8BJkNOZ7OcTjTirksgFV/X6nVPDS cP1A/OWqiGFh1T00smiMXboJ/ROpEvQrCnZBjmcGRWfDVayiDrwCvADtBgglJMOx59qf2P0nAK9 cijvWY7PmR0W+ork/cQK8V4ei1DKVTTZslPUEEKJ8XRHnffuMW2D7LNwio5EYNx7VH7817XJ1kz KC8Tim/kepxG/ljsvgBXYRoPrSqfDDNvvHI9b7H3NGibcp3WHBb5DLpOB67NmRZx4wiNnZUTfik skAGE6o0NXBsrggM3GkxxU+NTN/0PhEc7ttRZObuo8McQ56tav4eRC2zZhKxjwR6UBaW3rzUiRL oP7Yhmm5ks1HSqgIMDe/jPtmuRZKsquL3BCQpW/Nwl7V/wVUkBCsReW9oVCdro+WsV5GnRHvg70 YnQg/wAs4JQR/td/wi8llEijZEebsB1AL+987OAFP4DIfuuyJKbWGo0+GtHLHgwSjex3w80oFkE n3U7BT3ZfJ6xF1G8yfl2QcnBfY6E5twI83rVSft9P9P9woUPdDYe8ckbNHUgU7dbNoPUahR+yYE nOvKtQHGL/KBpfuN9vmQqsudUxxNgqDhkPCJ0cZMie8Qwf1O+wEHAGwNubwXcAEvwdBQxHxgrMD TPrW3K944PH1F9A== X-Developer-Key: i=louis.chauvet@bootlin.com; a=openpgp; fpr=8B7104AE9A272D6693F527F2EC1883F55E0B40A5 X-GND-Sasl: louis.chauvet@bootlin.com 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. Signed-off-by: Louis Chauvet --- drivers/gpu/drm/vkms/vkms_crtc.c | 32 +++++++++++++++++--------------- drivers/gpu/drm/vkms/vkms_drv.h | 9 +++++---- drivers/gpu/drm/vkms/vkms_output.c | 26 +++++++++++++++----------- drivers/gpu/drm/vkms/vkms_writeback.c | 17 +++++++++-------- 4 files changed, 46 insertions(+), 38 deletions(-) diff --git a/drivers/gpu/drm/vkms/vkms_crtc.c b/drivers/gpu/drm/vkms/vkms_c= rtc.c index ace8d293f7da611110c1e117b6cf2f3c9e9b4381..d014dec117e7d4ec7e9e38037a4= a4cb4bc6be4ca 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)) { @@ -279,25 +277,29 @@ static void vkms_crtc_destroy_workqueue(struct drm_de= vice *dev, destroy_workqueue(vkms_out->composer_workq); } =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); @@ -307,12 +309,12 @@ int vkms_crtc_init(struct drm_device *dev, struct drm= _crtc *crtc, =20 vkms_out->composer_workq =3D alloc_ordered_workqueue("vkms_composer", 0); if (!vkms_out->composer_workq) - return -ENOMEM; + return ERR_PTR(-ENOMEM); =20 ret =3D drmm_add_action_or_reset(dev, vkms_crtc_destroy_workqueue, vkms_out); if (ret) - return ret; + return ERR_PTR(ret); =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 19fd99b8e506c4454d7878b67f692a0441c22665..fbe7de67fb9c6a6a6964d71b452= b9a3ce573e0f8 100644 --- a/drivers/gpu/drm/vkms/vkms_drv.h +++ b/drivers/gpu/drm/vkms/vkms_drv.h @@ -214,7 +214,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 @@ -241,8 +240,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. @@ -273,6 +273,7 @@ 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); +int vkms_enable_writeback_connector(struct vkms_device *vkmsdev, + struct vkms_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 102b6ad466cb4f7c6704f30cea669e5d7f81540a..6a5cf6e7714938f23b4276a9699= 1d05431bcd76e 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,25 @@ 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); - if (writeback) + writeback =3D vkms_enable_writeback_connector(vkmsdev, output); + if (writeback) { DRM_ERROR("Failed to init writeback connector\n"); + return ret; + } } =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 f12417b2d24803a33e4ff56108cc89704a500faf..c9b6e161fa8698491f20082dfe0= b713f27bcb918 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,9 +162,10 @@ static const struct drm_connector_helper_funcs vkms_wb= _conn_helper_funcs =3D { .atomic_check =3D vkms_wb_atomic_check, }; =20 -int vkms_enable_writeback_connector(struct vkms_device *vkmsdev) +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; =20 drm_connector_helper_add(&wb->base, &vkms_wb_conn_helper_funcs); =20 --=20 2.47.0