From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F26C31E5718 for ; Mon, 20 Jan 2025 16:23:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.50 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737390215; cv=none; b=TxZf6IEBF/TmnI8R5LDSxBz+SuFcnh+h8sFIcjxf/lk81tCuxJDwQCo9BHP5l4cEkPJT1INLJ0B68qJGE84r4F5K9X0anJwRqGYvxaNS6N4Mav/RYtGe7+i/S2QKkmuybDDJfudGxf0dU2MFQCnVdMwZ/LkoNTeBsBH1N/VX9fY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737390215; c=relaxed/simple; bh=8mHtFUfKziHoRJL6bKjqsXT4AsQomz1aStG524hDPzU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=p+b9I5lQ1KiPa1VDk213FlnSvVGIqfqe1nFraGDeFd6qTaDTFdL/yw83fpXmZqxZR3l5kT9iHlREWwpJ/VErPeWW9czRXXJKT1RDx8mb6SDyEuZwjvuYRKlr6SxCqATd7/aB6P0K31HfttGXLDgx+pl1jLuxtCE8DMOzbxK4g0Y= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Ndd98dkJ; arc=none smtp.client-ip=209.85.221.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Ndd98dkJ" Received: by mail-wr1-f50.google.com with SMTP id ffacd0b85a97d-38be3bfb045so3512796f8f.0 for ; Mon, 20 Jan 2025 08:23:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1737390211; x=1737995011; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=O/8/9MoqMuPyTG7pMFvJjVYykG16SlEX1i5W0aG30EM=; b=Ndd98dkJZXvUshYkwwWoNRHU79HdMaU5iUTOGXi/SkK1oDl3Z0R9WwDdgGdj8GTquw J39rcEHfMR56uwRAmc/G3nKNNwCQSvom5lIMOg5EdphVtd7N7cV6o44mf4taaShFOXTF /v2h4iw4UDCWjYvOigWzT4bu+HsOABxEJ8IX29Ua/PM1OCWpDUVHeDkDxMQZe7TJkUfX 1dBGOfX61aLFxaxMThOd4UNktlINy9JwEbbG+1Q6F1DHgl6isgGAaNJ9avRrsG6vo9z+ DysNIqlfrR2hiVoYlS/nIF50UWWgXp0pgJJJW4aGQK48FY+BMFqAPleIYX328MSFCZ6Q f5Nw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737390211; x=1737995011; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=O/8/9MoqMuPyTG7pMFvJjVYykG16SlEX1i5W0aG30EM=; b=JT1FEEBFTKfQCCV7x5+3+UC3ufNHQ3nGRgRearm6gFGFq5/PpDjDUcBp0+hTt/g2Z8 naT1aolxXBcRoZR40VCXYQIxp801Nd6wMvLzMWVNCS1/akxeANmoxtbaIJrLh9VdhVQJ 6PT7ytEJftHBLkNESJ6gV98smiO5Qu2/2CcpKWj/iuS1Cg3qsdeguPYgx4elz/+TgZXy bYucPJsaQ6YT1H674hNJvKmYW85UFPlyAbeUEQWk66aJVqTFpJNgxm1rzblxMOCCMc6n JTLvXoENzSqrWwwa94DaUR1x5T4KmTp0mgyIYh/6X04W42X/g43Njx7dtGN+zDhgovWY 5BAg== X-Forwarded-Encrypted: i=1; AJvYcCXXALwYy6q88mvIlrLn/SJynz+Yu7HAOrNPhMJ1MLKRz+vdArXLRx9lA8KEGmIX3EmQ8e0FdxdaAtZDXV4=@vger.kernel.org X-Gm-Message-State: AOJu0YyASwj33OcnBskmcVo4bXKQ7TB7CZgNGIe3DOG0sfssgwX6QEIN 05HlJnWqhkKP+3nNv8Xm3zxm6Q4PCZWSFbouSnKXU9ONVW7CIogt X-Gm-Gg: ASbGncuSp/FF5rxe6IBBabADvbL4+azKrItGADWas2o+D7eACktIfhxD+hrC3r0EMDf QcznuFthRwJIV6rz1zDf1XjQ2d4bwul6C0n+EKEc910/pCGcLlZPQvMlCRDoGiNClCYUysgHZ/Y H9fzryubZyEHirhpbEPekhBfPDT8haDzku1TXkJoWEYmEXM0D33d0OH2iZBO7UhdEsPbHkRc34n LFxp7Fm5BYUBiCFISaVCsQSKxk2VQmOe1vwYCDcuRGVctYPU8YQ8i7QKQXu36epfaLeVFw= X-Google-Smtp-Source: AGHT+IGJE9SzzaEnM+ZHSKDjHWXEXcXfbv/Db9F1ZrEdEm/3HvCUrxPOHBlHnrIwV8L4lLJpqt34bA== X-Received: by 2002:a05:6000:1786:b0:38a:8d32:2707 with SMTP id ffacd0b85a97d-38bec548925mr18891266f8f.26.1737390210811; Mon, 20 Jan 2025 08:23:30 -0800 (PST) Received: from fedora.. ([94.73.34.116]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38bf3221b7fsm10800176f8f.27.2025.01.20.08.23.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Jan 2025 08:23:30 -0800 (PST) From: =?UTF-8?q?Jos=C3=A9=20Exp=C3=B3sito?= To: louis.chauvet@bootlin.com Cc: airlied@gmail.com, dri-devel@lists.freedesktop.org, hamohammed.sa@gmail.com, linux-kernel@vger.kernel.org, maarten.lankhorst@linux.intel.com, mairacanal@riseup.net, melissa.srw@gmail.com, mripard@kernel.org, rodrigosiqueiramelo@gmail.com, simona.vetter@ffwll.ch, simona@ffwll.ch, thomas.petazzoni@bootlin.com, tzimmermann@suse.de, =?UTF-8?q?Jos=C3=A9=20Exp=C3=B3sito?= Subject: [PATCH v4 3/3] drm/vkms: Switch to dynamic allocation for CRTC Date: Mon, 20 Jan 2025 17:23:25 +0100 Message-ID: <20250120162327.2866-1-jose.exposito89@gmail.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250117-b4-vkms-allocated-v4-3-8ec8fd21aaf6@bootlin.com> References: <20250117-b4-vkms-allocated-v4-3-8ec8fd21aaf6@bootlin.com> 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: 8bit > 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 > --- > 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_crtc.c > index 434c35d5e9477d2961826262591db8ab43838e09..cf229aec71c3f03bb1306095e8dd44d63f80cd2a 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 *crtc, > int *max_error, ktime_t *vblank_time, > bool in_vblank_irq) > { > - struct drm_device *dev = crtc->dev; > - struct vkms_device *vkmsdev = drm_device_to_vkms_device(dev); > - struct vkms_output *output = &vkmsdev->output; > + struct vkms_output *output = drm_crtc_to_vkms_output(crtc); > struct drm_vblank_crtc *vblank = drm_crtc_vblank_crtc(crtc); > > if (!READ_ONCE(vblank->enabled)) { > @@ -271,25 +269,29 @@ static const struct drm_crtc_helper_funcs vkms_crtc_helper_funcs = { > .atomic_disable = vkms_crtc_atomic_disable, > }; > > -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) > { > - struct vkms_output *vkms_out = drm_crtc_to_vkms_output(crtc); > + struct vkms_output *vkms_out; > + struct drm_crtc *crtc; > int ret; > > - ret = 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 = 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; > } > > + crtc = &vkms_out->crtc; > + > drm_crtc_helper_add(crtc, &vkms_crtc_helper_funcs); > > ret = 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); > } > > 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_crtc *crtc, > > vkms_out->composer_workq = drmm_alloc_ordered_workqueue(dev, "vkms_composer", 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); > > - return ret; > + return vkms_out; > } > diff --git a/drivers/gpu/drm/vkms/vkms_drv.h b/drivers/gpu/drm/vkms/vkms_drv.h > index 333983bcf8d46ef85101e7c344e256df57551b78..abbb652be2b5389f96cec78837117ceb9acef656 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; > }; > > @@ -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); > > /** > * vkms_output_init() - Initialize all sub-components needed for a VKMS device. > @@ -274,6 +274,6 @@ void vkms_set_composer(struct vkms_output *out, bool enabled); > void vkms_writeback_row(struct vkms_writeback_job *wb, const struct line_buffer *src_buffer, int y); > > /* Writeback */ > -int vkms_enable_writeback_connector(struct vkms_device *vkmsdev, struct drm_crtc *crtc); > +int vkms_enable_writeback_connector(struct vkms_device *vkmsdev, struct vkms_output *vkms_out); > > #endif /* _VKMS_DRV_H_ */ > diff --git a/drivers/gpu/drm/vkms/vkms_output.c b/drivers/gpu/drm/vkms/vkms_output.c > index 21ca975e424d148b0669b87784d86f5da2a8b333..22f0d678af3ac8177e43c4ea730af3f2109de5f3 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_conn_helper_funcs = { > > int vkms_output_init(struct vkms_device *vkmsdev) > { > - struct vkms_output *output = &vkmsdev->output; > struct drm_device *dev = &vkmsdev->drm; > struct drm_connector *connector; > struct drm_encoder *encoder; > - struct drm_crtc *crtc = &output->crtc; > + struct vkms_output *output; > struct vkms_plane *primary, *overlay, *cursor = NULL; > int ret; > int writeback; > @@ -56,9 +55,12 @@ int vkms_output_init(struct vkms_device *vkmsdev) > return PTR_ERR(cursor); > } > > - ret = vkms_crtc_init(dev, crtc, &primary->base, &cursor->base); > - if (ret) > - return ret; > + output = 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); > + } > > if (vkmsdev->config->overlay) { > for (n = 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 = drm_crtc_mask(crtc); > + overlay->base.possible_crtcs = drm_crtc_mask(&output->crtc); > } > } > > @@ -97,23 +99,23 @@ int vkms_output_init(struct vkms_device *vkmsdev) > DRM_ERROR("Failed to init encoder\n"); > return ret; > } > - encoder->possible_crtcs = drm_crtc_mask(crtc); > + encoder->possible_crtcs = drm_crtc_mask(&output->crtc); > > + /* Attach the encoder and the connector */ > ret = drm_connector_attach_encoder(connector, encoder); > if (ret) { > DRM_ERROR("Failed to attach connector to encoder\n"); > return ret; > } > > + /* Initialize the writeback component */ > if (vkmsdev->config->writeback) { > - writeback = vkms_enable_writeback_connector(vkmsdev, crtc); > + writeback = vkms_enable_writeback_connector(vkmsdev, output); > if (writeback) > DRM_ERROR("Failed to init writeback connector\n"); > } Hi Louis, Thanks for fixing this error condition. I have been working and running automated tests on top of this series and I haven't found any other issue. Reviewed-by: José Expósito > > drm_mode_config_reset(dev); > > - return 0; > - > return ret; > } > diff --git a/drivers/gpu/drm/vkms/vkms_writeback.c b/drivers/gpu/drm/vkms/vkms_writeback.c > index 981975c2b0a0c75e4a3aceca2a965f5876ae0a8f..e9b5c74d7c58e7faed870a4368decbd67dab23d2 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_connector *connector, > struct drm_writeback_job *job) > { > struct vkms_writeback_job *vkmsjob = job->priv; > - struct vkms_device *vkmsdev; > + struct vkms_output *vkms_output = container_of(connector, > + struct vkms_output, > + wb_connector); > > if (!job->fb) > return; > @@ -114,8 +116,7 @@ static void vkms_wb_cleanup_job(struct drm_writeback_connector *connector, > > drm_framebuffer_put(vkmsjob->wb_frame_info.fb); > > - vkmsdev = drm_device_to_vkms_device(job->fb->dev); > - vkms_set_composer(&vkmsdev->output, false); > + vkms_set_composer(vkms_output, false); > kfree(vkmsjob); > } > > @@ -124,8 +125,7 @@ static void vkms_wb_atomic_commit(struct drm_connector *conn, > { > struct drm_connector_state *connector_state = drm_atomic_get_new_connector_state(state, > conn); > - struct vkms_device *vkmsdev = drm_device_to_vkms_device(conn->dev); > - struct vkms_output *output = &vkmsdev->output; > + struct vkms_output *output = drm_crtc_to_vkms_output(connector_state->crtc); > struct drm_writeback_connector *wb_conn = &output->wb_connector; > struct drm_connector_state *conn_state = wb_conn->base.state; > struct vkms_crtc_state *crtc_state = output->composer_state; > @@ -139,7 +139,7 @@ static void vkms_wb_atomic_commit(struct drm_connector *conn, > if (!conn_state) > return; > > - vkms_set_composer(&vkmsdev->output, true); > + vkms_set_composer(output, true); > > active_wb = conn_state->writeback_job->priv; > wb_frame_info = &active_wb->wb_frame_info; > @@ -162,22 +162,23 @@ static const struct drm_connector_helper_funcs vkms_wb_conn_helper_funcs = { > .atomic_check = vkms_wb_atomic_check, > }; > > -int vkms_enable_writeback_connector(struct vkms_device *vkmsdev, struct drm_crtc *crtc) > +int vkms_enable_writeback_connector(struct vkms_device *vkmsdev, > + struct vkms_output *vkms_output) > { > - struct drm_writeback_connector *wb = &vkmsdev->output.wb_connector; > + struct drm_writeback_connector *wb = &vkms_output->wb_connector; > int ret; > > - ret = drmm_encoder_init(&vkmsdev->drm, &vkmsdev->output.wb_encoder, > + ret = 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 |= drm_crtc_mask(crtc); > + vkms_output->wb_encoder.possible_crtcs |= drm_crtc_mask(&vkms_output->crtc); > > drm_connector_helper_add(&wb->base, &vkms_wb_conn_helper_funcs); > > 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)); > } >