From nobody Fri Dec 19 12:06:23 2025 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 383542C184 for ; Tue, 27 Aug 2024 10:01:55 +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=1724752918; cv=none; b=glEbgS1lmkWKyTfy/1H4xvVumzPL8O76ohS0d+2aHwjZgZQC/wmgm1kdG1mRF8x/1JUHifWSX3Qxux6Gbn7eJuOpCX29TCYsbOoeJsoLNM5iqiVUe4ZLToTd9KxmOaQedzcEOg2HZStVs4k/Rlwh6v6IvAtdFOKPYVwmwXnkps4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724752918; c=relaxed/simple; bh=W99THVqBFNss3oEOGdwAJKCTqWPosBK54HEsLK2bqEE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ioMKeiF6yOhWivxKYjEVAXJzagoK/jO95b44pajc/tO0Qzan/lQQxMCCBV/bpspG7XM1uYhHWwe5Vn60LaBGFZo/Ib2SO0rkDpCI+y9SEWe/2Cn7AF79hiqIwpzE1W+ECnct3srdVbQtsirbF3+fitbLBKvtI7Hd/9Rud3yNRiA= 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=iNQMO4rP; 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="iNQMO4rP" Received: by mail.gandi.net (Postfix) with ESMTPSA id B48891C0010; Tue, 27 Aug 2024 10:01:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1724752914; 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=udjlBWpBAoHgcvxq2FWPI0e0+WGK0V/eXeydXau3BLE=; b=iNQMO4rPmhWpbZ2czv7N+SZ9vEmWWw3K5NKL8jz3tKkaYlCUW7SHQN8lnsnhYq6A4zddbY 0E/xHgu68Rx/Va0CXrVvugEuU41PvhxaCxeLlg/8JYt/rObTq4pHVHAUHiR8PzsMt8I3VF sZgFYGj+Rbi57UKUB31yr5sy2ywtSAquMrNM2Veuhl/uAAN84NZI6jZssGasl/fcvTErZ+ nwI7Utmt6Ow+Z4lJYyb34PtdtOQNFLZp9DQu26iaL5PfpPJNV3b/2tr8uMrr+iewhLfk5Y HZrEoUHKhE6KN5kYDoeRGn0S/5EVuzNGZZnZ8jf5jl9HbzsxSCn+2COc6fgPTQ== From: Louis Chauvet Date: Tue, 27 Aug 2024 11:57:36 +0200 Subject: [PATCH v2 1/6] drm/vkms: Switch to managed for connector 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: <20240827-google-vkms-managed-v2-1-f41104553aeb@bootlin.com> References: <20240827-google-vkms-managed-v2-0-f41104553aeb@bootlin.com> In-Reply-To: <20240827-google-vkms-managed-v2-0-f41104553aeb@bootlin.com> 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, nicolejadeyee@google.com, Louis Chauvet X-Mailer: b4 0.15-dev X-Developer-Signature: v=1; a=openpgp-sha256; l=3176; i=louis.chauvet@bootlin.com; h=from:subject:message-id; bh=W99THVqBFNss3oEOGdwAJKCTqWPosBK54HEsLK2bqEE=; b=owEBbQKS/ZANAwAIASCtLsZbECziAcsmYgBmzaQOLZuf9vXRrfntkM0wA3KlX4Nd0aP7AtuC6 c/2o/80pMCJAjMEAAEIAB0WIQRPj7g/vng8MQxQWQQgrS7GWxAs4gUCZs2kDgAKCRAgrS7GWxAs 4rzdD/458Vuz+7NzBObxe/IKrJppUiYa+qkvIC+MWFWUc8SJccX24a0awNgXZBKN8aasNQX5HLf 2po3mKI1qlwwYUAG7kST7QvZc4x4lvMnci+AXrOF5+Q2G2hATcfnIOrg0PZaeE46Vvxtwhjz/EY DEPZV9wkxyl5wp3frq21g0DobV17A7//w9tFBtjUcyk28J13IZQh5nxMvwXxBTOKcPuoNuC/bjI /DjKFX2CironzBrdgcaaizDmqPJP8B+LksOqUSWO4EXAUxHzSgjR+lgNF/f1DiYo2Kgz/SUL7so c0rF/RXawc06hwma7GkIE4Duj/bCdF25m8o7RSBDnVunNRHHZNKvifc0wTMT+Ehldrx4aHt/9NG VKcOL2dgvD2I0XLZcGo7JmrfHbiPM3GVFLh1LKap9tD0Dcwslj9nP0nYX5QwgOupGtqM3mDP+6j Q01y6q9mM3qnyKBGRXZKtO4YldFAxlYRnPC8mvwkXtWSRj9qsy8cZyjqKcPAju26k333IUyWeG0 JemBDV+EpyQ+JHxFEsHxwMZ4mC1Fe1HIie1FyZ5XOa79iiTSFkDAMZ5Bh9gSLI3kytU+BPCKK2q Ay9fE88ruq8TvL2WZOMpsS9DjLolipyy2FatQA4wa26tja7Iu7CR5NZ8LiFJtNarOc9i7il0i4q N8qaMxtOg+eVd7g== X-Developer-Key: i=louis.chauvet@bootlin.com; a=openpgp; fpr=8B7104AE9A272D6693F527F2EC1883F55E0B40A5 X-GND-Sasl: louis.chauvet@bootlin.com The current VKMS driver uses non-managed function to create connectors. It is not an issue yet, but in order to support multiple devices easily, convert this code to use drm and device managed helpers. Signed-off-by: Louis Chauvet --- drivers/gpu/drm/vkms/vkms_drv.h | 1 - drivers/gpu/drm/vkms/vkms_output.c | 22 ++++++++++++---------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/drivers/gpu/drm/vkms/vkms_drv.h b/drivers/gpu/drm/vkms/vkms_dr= v.h index 5e46ea5b96dc..9a3c6c34d1f6 100644 --- a/drivers/gpu/drm/vkms/vkms_drv.h +++ b/drivers/gpu/drm/vkms/vkms_drv.h @@ -99,7 +99,6 @@ struct vkms_crtc_state { struct vkms_output { struct drm_crtc crtc; struct drm_encoder encoder; - struct drm_connector connector; struct drm_writeback_connector wb_connector; struct hrtimer vblank_hrtimer; ktime_t period_ns; diff --git a/drivers/gpu/drm/vkms/vkms_output.c b/drivers/gpu/drm/vkms/vkms= _output.c index 5ce70dd946aa..4fe6b88e8081 100644 --- a/drivers/gpu/drm/vkms/vkms_output.c +++ b/drivers/gpu/drm/vkms/vkms_output.c @@ -3,11 +3,11 @@ #include "vkms_drv.h" #include #include +#include #include =20 static const struct drm_connector_funcs vkms_connector_funcs =3D { .fill_modes =3D drm_helper_probe_single_connector_modes, - .destroy =3D drm_connector_cleanup, .reset =3D drm_atomic_helper_connector_reset, .atomic_duplicate_state =3D drm_atomic_helper_connector_duplicate_state, .atomic_destroy_state =3D drm_atomic_helper_connector_destroy_state, @@ -50,7 +50,7 @@ int vkms_output_init(struct vkms_device *vkmsdev, int ind= ex) { struct vkms_output *output =3D &vkmsdev->output; struct drm_device *dev =3D &vkmsdev->drm; - struct drm_connector *connector =3D &output->connector; + struct drm_connector *connector; struct drm_encoder *encoder =3D &output->encoder; struct drm_crtc *crtc =3D &output->crtc; struct vkms_plane *primary, *cursor =3D NULL; @@ -80,8 +80,15 @@ int vkms_output_init(struct vkms_device *vkmsdev, int in= dex) if (ret) return ret; =20 - ret =3D drm_connector_init(dev, connector, &vkms_connector_funcs, - DRM_MODE_CONNECTOR_VIRTUAL); + connector =3D drmm_kzalloc(dev, sizeof(*connector), GFP_KERNEL); + if (!connector) { + DRM_ERROR("Failed to allocate connector\n"); + ret =3D -ENOMEM; + goto err_connector; + } + + ret =3D drmm_connector_init(dev, connector, &vkms_connector_funcs, + DRM_MODE_CONNECTOR_VIRTUAL, NULL); if (ret) { DRM_ERROR("Failed to init connector\n"); goto err_connector; @@ -93,7 +100,7 @@ int vkms_output_init(struct vkms_device *vkmsdev, int in= dex) DRM_MODE_ENCODER_VIRTUAL, NULL); if (ret) { DRM_ERROR("Failed to init encoder\n"); - goto err_encoder; + return ret; } encoder->possible_crtcs =3D 1; =20 @@ -115,12 +122,7 @@ int vkms_output_init(struct vkms_device *vkmsdev, int = index) =20 err_attach: drm_encoder_cleanup(encoder); - -err_encoder: - drm_connector_cleanup(connector); - err_connector: drm_crtc_cleanup(crtc); - return ret; } --=20 2.44.2 From nobody Fri Dec 19 12:06:23 2025 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 F1844149E0E for ; Tue, 27 Aug 2024 10:01:56 +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=1724752918; cv=none; b=fLsKMlrDTj2KCZdgyK38j2nqpaQ7Q/Yycj4lsqU3WoCgdoGxfJkgHWUBD05AoBSkeeXqZGHW6dZxcBFF67dMPtvEyHzv9aouZ28zANAK7l/NdcVHJolUnYgeNiILRU5U2qd2h7CrWvSQdhnLoDl2WIaWSsDpzdqWKrDmyyM6INo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724752918; c=relaxed/simple; bh=675tGI9t4siyekAGAqTdIzTYThmUt23EspEKi2jqEUw=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=b8T3FVAE5Tg8LSlqgxU75dmR0wfe8twbJ8ZXvbveuCxQboF55R2YPoWb5bdpSDbVt5mfjFPya6ZxObNEjTodWs7qaLyuKciCPdi+gvTpvBaQ4CHVjx+dv+sfwY20v7tsZXITJBsxenlQ9tYhoNWOfnyjJUhcRfyAuWlp+MEGekc= 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=FjX0fvnt; 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="FjX0fvnt" Received: by mail.gandi.net (Postfix) with ESMTPSA id A6F761C0005; Tue, 27 Aug 2024 10:01:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1724752915; 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=cLpzZikRAqTA1AgFL9mPE5QtLpuXTGeDfy/jMnIuw64=; b=FjX0fvntQgDahP26SR8gjVd42xgLvnQ8DsjWD6u/wmDfUvdRi7fPfpij3CzYsArNUgysuK mt2FA+ccXy5uzyLTAbqrtukkLlz/+ZD+qVYwVE/erBXkzwIga2hI/0b3oWjaW5WVnyrRW/ kAkChvg10h1HubMgyw8bc7Htu1TTZ5E21p8udRDoYnDjW8JchDSBqAmZR16kPDiBhp3Sx1 TR9zqmm6hSRpFRQOTq9vE9/xGdJUV8EAEn8RlfBRU/i2N7/+8uUzxLmXRepkNGKDMk96Qu O66ZWEZQGUOE2vFnJwXQKm8Zko4abrT6R+AsqD1jHcehKEmnSNChbpARNYv1wg== From: Louis Chauvet Date: Tue, 27 Aug 2024 11:57:37 +0200 Subject: [PATCH v2 2/6] drm/vkms: Switch to managed for encoder 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: <20240827-google-vkms-managed-v2-2-f41104553aeb@bootlin.com> References: <20240827-google-vkms-managed-v2-0-f41104553aeb@bootlin.com> In-Reply-To: <20240827-google-vkms-managed-v2-0-f41104553aeb@bootlin.com> 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, nicolejadeyee@google.com, Louis Chauvet X-Mailer: b4 0.15-dev X-Developer-Signature: v=1; a=openpgp-sha256; l=2908; i=louis.chauvet@bootlin.com; h=from:subject:message-id; bh=675tGI9t4siyekAGAqTdIzTYThmUt23EspEKi2jqEUw=; b=owEBbQKS/ZANAwAIASCtLsZbECziAcsmYgBmzaQPxh3W6g4AWc2LFokZazuLTgBmg1bYlS+Ko v5T3sq4YrOJAjMEAAEIAB0WIQRPj7g/vng8MQxQWQQgrS7GWxAs4gUCZs2kDwAKCRAgrS7GWxAs 4uiYEACB/OXTMAKcYDyZjpKrC6FIWGqvtuGYe0kXaCjLSbrkHA7HznuMNLYaY8z0yfNfU0874fz Wb5w46Ezg2kP16PYnom7EG2H+fdsuUWdQXGvouML/1QNFvk+FTh1Wh/1dRLTFN4XGvOkL4H0Gi4 ha/x/an9EUIbmGwtmIMfwcVzGrsLbkpmjussTI9o7/FEtRHEnUaBr4h5/Gb8rS4CqJOSWD28T0J jZZPDhFcxgRVLqVk4yqS2GYeePnfVw3+hL1QYtgDA8ATwqO/53U4SgQOD1iAJzSaQI+aAV123p9 8EYXWS+h7OIYYNk/70lpkmn/8weKY9CbWsOvow2GIXusv91w/zXNdtNOPHu/ZceswjAECquT+4V +CH084GoyDtYWxdZp+mz1Z+1QlgTxmLcX8Irf8ejZyfOM9PwGZoxQ8DTIxfyP26TKHQa8/eniwa 5VkkA3d8pTse4r0dOJCuVzJ7tVGorZa4j00agSZlOLHXj3ZfAsNOuJZlJrEZNEOeAyBNllXpmv4 kqpM3KnxFsD0qhGhPvioz3WvrqTMrN0zM71nli1Bwell6+GuJp0sUDQG+1eAkLxu+ZUj6EoPXoW Fyx05511zL8P2WCKto23+8iI4Dq+iiLIs9ekHQyDO1tWJ/Y0tiqkpumDwPPP1ylIrPj3ZXuTeUu Wiqfi/3gxKpbmZw== X-Developer-Key: i=louis.chauvet@bootlin.com; a=openpgp; fpr=8B7104AE9A272D6693F527F2EC1883F55E0B40A5 X-GND-Sasl: louis.chauvet@bootlin.com The current VKMS driver uses non-managed function to create encoders. It is not an issue yet, but in order to support multiple devices easily, convert this code to use drm and device managed helpers. Signed-off-by: Louis Chauvet --- drivers/gpu/drm/vkms/vkms_drv.h | 1 - drivers/gpu/drm/vkms/vkms_output.c | 22 +++++++++++----------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/drivers/gpu/drm/vkms/vkms_drv.h b/drivers/gpu/drm/vkms/vkms_dr= v.h index 9a3c6c34d1f6..101993378b49 100644 --- a/drivers/gpu/drm/vkms/vkms_drv.h +++ b/drivers/gpu/drm/vkms/vkms_drv.h @@ -98,7 +98,6 @@ struct vkms_crtc_state { =20 struct vkms_output { struct drm_crtc crtc; - struct drm_encoder encoder; struct drm_writeback_connector wb_connector; struct hrtimer vblank_hrtimer; ktime_t period_ns; diff --git a/drivers/gpu/drm/vkms/vkms_output.c b/drivers/gpu/drm/vkms/vkms= _output.c index 4fe6b88e8081..bbec7c14229c 100644 --- a/drivers/gpu/drm/vkms/vkms_output.c +++ b/drivers/gpu/drm/vkms/vkms_output.c @@ -13,10 +13,6 @@ static const struct drm_connector_funcs vkms_connector_f= uncs =3D { .atomic_destroy_state =3D drm_atomic_helper_connector_destroy_state, }; =20 -static const struct drm_encoder_funcs vkms_encoder_funcs =3D { - .destroy =3D drm_encoder_cleanup, -}; - static int vkms_conn_get_modes(struct drm_connector *connector) { int count; @@ -51,7 +47,7 @@ int vkms_output_init(struct vkms_device *vkmsdev, int ind= ex) struct vkms_output *output =3D &vkmsdev->output; struct drm_device *dev =3D &vkmsdev->drm; struct drm_connector *connector; - struct drm_encoder *encoder =3D &output->encoder; + struct drm_encoder *encoder; struct drm_crtc *crtc =3D &output->crtc; struct vkms_plane *primary, *cursor =3D NULL; int ret; @@ -96,18 +92,24 @@ int vkms_output_init(struct vkms_device *vkmsdev, int i= ndex) =20 drm_connector_helper_add(connector, &vkms_conn_helper_funcs); =20 - ret =3D drm_encoder_init(dev, encoder, &vkms_encoder_funcs, - DRM_MODE_ENCODER_VIRTUAL, NULL); + encoder =3D drmm_kzalloc(dev, sizeof(*encoder), GFP_KERNEL); + if (!encoder) { + DRM_ERROR("Failed to allocate encoder\n"); + ret =3D -ENOMEM; + goto err_connector; + } + + ret =3D drmm_encoder_init(dev, encoder, NULL, DRM_MODE_ENCODER_VIRTUAL, N= ULL); if (ret) { DRM_ERROR("Failed to init encoder\n"); - return ret; + goto err_connector; } encoder->possible_crtcs =3D 1; =20 ret =3D drm_connector_attach_encoder(connector, encoder); if (ret) { DRM_ERROR("Failed to attach connector to encoder\n"); - goto err_attach; + return ret; } =20 if (vkmsdev->config->writeback) { @@ -120,8 +122,6 @@ int vkms_output_init(struct vkms_device *vkmsdev, int i= ndex) =20 return 0; =20 -err_attach: - drm_encoder_cleanup(encoder); err_connector: drm_crtc_cleanup(crtc); return ret; --=20 2.44.2 From nobody Fri Dec 19 12:06:23 2025 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 08AAC19CCE8 for ; Tue, 27 Aug 2024 10:01:57 +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=1724752920; cv=none; b=apRD+u97Mm5aKXYRPzCVA7gcqBL7LE5g6SULMlPq3ybSw2O3bS48rTX9lPo+uZan5nUG3VEKMw3/0/YWLIs8ezG+rq1aKLwxWLx+B6DfVvi85Uk4Mpp0/ZJ2lkR/HVaO66jiGyzJsEnrmedqJ62yVVfOiy6aDIXugJ7RFjlGqgc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724752920; c=relaxed/simple; bh=MUXfMrHoYe99yLBLEUvLfqlRRqfmv9js/PWQccOW9kg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=SGs6FtW51nNNuiYomHwSboTnAyVada589+efPCbsWj4XImyKPg2V1ECmva1NjYNerWy2KVvGBpWUOlKDWkbUHsMvuJx0nRzYhBuQCl4BO8Af3Gwv2MUhyhyhq4C32Jf7LiMgNsqZfd9dVMPyj3Wk2mJ9lAg+ePcLz/zQLHA0Ouw= 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=laygfAVs; 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="laygfAVs" Received: by mail.gandi.net (Postfix) with ESMTPSA id 934801C0007; Tue, 27 Aug 2024 10:01:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1724752916; 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=VLDA3mjNmG2t3rLv4Yud8tnGeWo3weAPMyHv+ylyq8A=; b=laygfAVstHot3z+UpU31/HvFyOr3NsAruzTvola2rbh1hXhFh1/hVIR7T73/E+MMTN7lqI mmwbCIGiqLHF26R8zwfnKy4g00V0bki6rCOVFHkhRD6WdEykoS2ddBEV0pQoNJKtPapwrh hlJncjDM+DF/pM/x7NRqejHTMBAeu7jvwMVsSwhECU3i6VXINorAaBvuPgu1BQCbb/0T2x yaXjUId3sQmdSch8PdMXBxwiHOX47AcqkmotGwK/woDSAkBNGpHIASRnB6UiANYvfRBfhh xPZkje2WNa4B394SWwePzr66dwvfu0WluEJa3iszbb3jp/rjzyZJy9fjqkz/7Q== From: Louis Chauvet Date: Tue, 27 Aug 2024 11:57:38 +0200 Subject: [PATCH v2 3/6] drm/vkms: Rename vkms_output to vkms_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: <20240827-google-vkms-managed-v2-3-f41104553aeb@bootlin.com> References: <20240827-google-vkms-managed-v2-0-f41104553aeb@bootlin.com> In-Reply-To: <20240827-google-vkms-managed-v2-0-f41104553aeb@bootlin.com> 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, nicolejadeyee@google.com, Louis Chauvet X-Mailer: b4 0.15-dev X-Developer-Signature: v=1; a=openpgp-sha256; l=15063; i=louis.chauvet@bootlin.com; h=from:subject:message-id; bh=MUXfMrHoYe99yLBLEUvLfqlRRqfmv9js/PWQccOW9kg=; b=owEBbQKS/ZANAwAIASCtLsZbECziAcsmYgBmzaQPV2dWXTebHFW5wDzFJ/JRZi1+zZPvXLyeu 7fYY6tmzC6JAjMEAAEIAB0WIQRPj7g/vng8MQxQWQQgrS7GWxAs4gUCZs2kDwAKCRAgrS7GWxAs 4lFkEADKrNo8dTfNRM+LmvZ6isuNEwijxuwjtWCHNezdyrehImGzGzv5idOChMEU0DRfRMA0D5O H8HhJU6IJYSRxMyV+HF5TbkDRdMXiE34GuQved0Ty76WCFxiy3aLjqmbOEqbVHnlygcMIcaNmhf ExAUr79og3l2flBrAYGBHD0o8hDPkCIXKDlsIHmpHQij+FrRiCGUugoaIYrpZbCn3lUutigsbOc 80exB4YHYC8x51t6KNVAR315gXhbtBG2eN+dJ0t4xXkZw6iEzx2eOpRI72jicKjg/3UUXfO5fVr HbkoN+gj8M3YAtEN3z4DWpF6XO0FFPn8gxAB8QvWZddGh9rcrOg1miREADzy8NeORQFaLmfPEZA myKRMBAQV/tcYgoA/i9yvuwz2OFItgzU0HO9wrMC4t+Oj290eRxpLT7Nz8bJiAVv/PAmT+2hJw8 P5qPTd64hqfb9TdYhJ0smRchel1M+Zfw+6mqZIWXPp1lF3mtkdMbhctnReeGSl2hMgZceJYlAaY xrT3Yb8ieK0TJenEpATPL9cpa1Z5Ayb/rSgOAn4x3xb364NglEOPZuaAYX+ZOI+cY+NBUyf0RjA HnHJn7TQwnAP0Bad8mcPQwFaPNq77w9yPtaF2W7OzFRdzStHmcgVX1E3sY06D0/0P3g32o9GmUY oPn8/bzZ6SaJb3g== X-Developer-Key: i=louis.chauvet@bootlin.com; a=openpgp; fpr=8B7104AE9A272D6693F527F2EC1883F55E0B40A5 X-GND-Sasl: louis.chauvet@bootlin.com The current vkms_output structure only contains crtc-related members. In preparation of the migration to drmm for crtc and to avoid confusion, rename this structure and all its usage to vkms_crtc. Signed-off-by: Louis Chauvet --- drivers/gpu/drm/vkms/vkms_composer.c | 30 +++++++++---------- drivers/gpu/drm/vkms/vkms_crtc.c | 54 +++++++++++++++++--------------= ---- drivers/gpu/drm/vkms/vkms_drv.c | 4 +-- drivers/gpu/drm/vkms/vkms_drv.h | 12 ++++---- drivers/gpu/drm/vkms/vkms_output.c | 4 +-- drivers/gpu/drm/vkms/vkms_writeback.c | 16 +++++------ 6 files changed, 59 insertions(+), 61 deletions(-) diff --git a/drivers/gpu/drm/vkms/vkms_composer.c b/drivers/gpu/drm/vkms/vk= ms_composer.c index e7441b227b3c..b1723cf02ed3 100644 --- a/drivers/gpu/drm/vkms/vkms_composer.c +++ b/drivers/gpu/drm/vkms/vkms_composer.c @@ -306,13 +306,13 @@ void vkms_composer_worker(struct work_struct *work) composer_work); struct drm_crtc *crtc =3D crtc_state->base.crtc; struct vkms_writeback_job *active_wb =3D crtc_state->active_writeback; - struct vkms_output *out =3D drm_crtc_to_vkms_output(crtc); + struct vkms_crtc *vkms_crtc =3D drm_crtc_to_vkms_crtc(crtc); bool crc_pending, wb_pending; u64 frame_start, frame_end; u32 crc32 =3D 0; int ret; =20 - spin_lock_irq(&out->composer_lock); + spin_lock_irq(&vkms_crtc->composer_lock); frame_start =3D crtc_state->frame_start; frame_end =3D crtc_state->frame_end; crc_pending =3D crtc_state->crc_pending; @@ -336,7 +336,7 @@ void vkms_composer_worker(struct work_struct *work) crtc_state->gamma_lut.base =3D NULL; } =20 - spin_unlock_irq(&out->composer_lock); + spin_unlock_irq(&vkms_crtc->composer_lock); =20 /* * We raced with the vblank hrtimer and previous work already computed @@ -354,10 +354,10 @@ void vkms_composer_worker(struct work_struct *work) return; =20 if (wb_pending) { - drm_writeback_signal_completion(&out->wb_connector, 0); - spin_lock_irq(&out->composer_lock); + drm_writeback_signal_completion(&vkms_crtc->wb_connector, 0); + spin_lock_irq(&vkms_crtc->composer_lock); crtc_state->wb_pending =3D false; - spin_unlock_irq(&out->composer_lock); + spin_unlock_irq(&vkms_crtc->composer_lock); } =20 /* @@ -407,31 +407,31 @@ int vkms_verify_crc_source(struct drm_crtc *crtc, con= st char *src_name, return 0; } =20 -void vkms_set_composer(struct vkms_output *out, bool enabled) +void vkms_set_composer(struct vkms_crtc *vkms_crtc, bool enabled) { bool old_enabled; =20 if (enabled) - drm_crtc_vblank_get(&out->crtc); + drm_crtc_vblank_get(&vkms_crtc->base); =20 - spin_lock_irq(&out->lock); - old_enabled =3D out->composer_enabled; - out->composer_enabled =3D enabled; - spin_unlock_irq(&out->lock); + spin_lock_irq(&vkms_crtc->lock); + old_enabled =3D vkms_crtc->composer_enabled; + vkms_crtc->composer_enabled =3D enabled; + spin_unlock_irq(&vkms_crtc->lock); =20 if (old_enabled) - drm_crtc_vblank_put(&out->crtc); + drm_crtc_vblank_put(&vkms_crtc->base); } =20 int vkms_set_crc_source(struct drm_crtc *crtc, const char *src_name) { - struct vkms_output *out =3D drm_crtc_to_vkms_output(crtc); + struct vkms_crtc *vkms_crtc =3D drm_crtc_to_vkms_crtc(crtc); bool enabled =3D false; int ret =3D 0; =20 ret =3D vkms_crc_parse_source(src_name, &enabled); =20 - vkms_set_composer(out, enabled); + vkms_set_composer(vkms_crtc, enabled); =20 return ret; } diff --git a/drivers/gpu/drm/vkms/vkms_crtc.c b/drivers/gpu/drm/vkms/vkms_c= rtc.c index 40b4d084e3ce..013bf8336b54 100644 --- a/drivers/gpu/drm/vkms/vkms_crtc.c +++ b/drivers/gpu/drm/vkms/vkms_crtc.c @@ -11,35 +11,35 @@ =20 static enum hrtimer_restart vkms_vblank_simulate(struct hrtimer *timer) { - struct vkms_output *output =3D container_of(timer, struct vkms_output, + struct vkms_crtc *vkms_crtc =3D container_of(timer, struct vkms_crtc, vblank_hrtimer); - struct drm_crtc *crtc =3D &output->crtc; + struct drm_crtc *crtc =3D &vkms_crtc->base; struct vkms_crtc_state *state; u64 ret_overrun; bool ret, fence_cookie; =20 fence_cookie =3D dma_fence_begin_signalling(); =20 - ret_overrun =3D hrtimer_forward_now(&output->vblank_hrtimer, - output->period_ns); + ret_overrun =3D hrtimer_forward_now(&vkms_crtc->vblank_hrtimer, + vkms_crtc->period_ns); if (ret_overrun !=3D 1) pr_warn("%s: vblank timer overrun\n", __func__); =20 - spin_lock(&output->lock); + spin_lock(&vkms_crtc->lock); ret =3D drm_crtc_handle_vblank(crtc); if (!ret) DRM_ERROR("vkms failure on handling vblank"); =20 - state =3D output->composer_state; - spin_unlock(&output->lock); + state =3D vkms_crtc->composer_state; + spin_unlock(&vkms_crtc->lock); =20 - if (state && output->composer_enabled) { + if (state && vkms_crtc->composer_enabled) { u64 frame =3D drm_crtc_accurate_vblank_count(crtc); =20 /* update frame_start only if a queued vkms_composer_worker() * has read the data */ - spin_lock(&output->composer_lock); + spin_lock(&vkms_crtc->composer_lock); if (!state->crc_pending) state->frame_start =3D frame; else @@ -47,9 +47,9 @@ static enum hrtimer_restart vkms_vblank_simulate(struct h= rtimer *timer) state->frame_start, frame); state->frame_end =3D frame; state->crc_pending =3D true; - spin_unlock(&output->composer_lock); + spin_unlock(&vkms_crtc->composer_lock); =20 - ret =3D queue_work(output->composer_workq, &state->composer_work); + ret =3D queue_work(vkms_crtc->composer_workq, &state->composer_work); if (!ret) DRM_DEBUG_DRIVER("Composer worker already queued\n"); } @@ -62,7 +62,7 @@ static enum hrtimer_restart vkms_vblank_simulate(struct h= rtimer *timer) static int vkms_enable_vblank(struct drm_crtc *crtc) { struct drm_vblank_crtc *vblank =3D drm_crtc_vblank_crtc(crtc); - struct vkms_output *out =3D drm_crtc_to_vkms_output(crtc); + struct vkms_crtc *out =3D drm_crtc_to_vkms_crtc(crtc); =20 drm_calc_timestamping_constants(crtc, &crtc->mode); =20 @@ -76,7 +76,7 @@ static int vkms_enable_vblank(struct drm_crtc *crtc) =20 static void vkms_disable_vblank(struct drm_crtc *crtc) { - struct vkms_output *out =3D drm_crtc_to_vkms_output(crtc); + struct vkms_crtc *out =3D drm_crtc_to_vkms_crtc(crtc); =20 hrtimer_cancel(&out->vblank_hrtimer); } @@ -85,9 +85,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_crtc *vkms_crtc =3D drm_crtc_to_vkms_crtc(crtc); struct drm_vblank_crtc *vblank =3D drm_crtc_vblank_crtc(crtc); =20 if (!READ_ONCE(vblank->enabled)) { @@ -95,7 +93,7 @@ static bool vkms_get_vblank_timestamp(struct drm_crtc *cr= tc, return true; } =20 - *vblank_time =3D READ_ONCE(output->vblank_hrtimer.node.expires); + *vblank_time =3D READ_ONCE(vkms_crtc->vblank_hrtimer.node.expires); =20 if (WARN_ON(*vblank_time =3D=3D vblank->time)) return true; @@ -107,7 +105,7 @@ static bool vkms_get_vblank_timestamp(struct drm_crtc *= crtc, * the vblank core expects. Therefore we need to always correct the * timestampe by one frame. */ - *vblank_time -=3D output->period_ns; + *vblank_time -=3D vkms_crtc->period_ns; =20 return true; } @@ -233,18 +231,18 @@ static void vkms_crtc_atomic_disable(struct drm_crtc = *crtc, static void vkms_crtc_atomic_begin(struct drm_crtc *crtc, struct drm_atomic_state *state) { - struct vkms_output *vkms_output =3D drm_crtc_to_vkms_output(crtc); + struct vkms_crtc *vkms_crtc =3D drm_crtc_to_vkms_crtc(crtc); =20 /* This lock is held across the atomic commit to block vblank timer * from scheduling vkms_composer_worker until the composer is updated */ - spin_lock_irq(&vkms_output->lock); + spin_lock_irq(&vkms_crtc->lock); } =20 static void vkms_crtc_atomic_flush(struct drm_crtc *crtc, struct drm_atomic_state *state) { - struct vkms_output *vkms_output =3D drm_crtc_to_vkms_output(crtc); + struct vkms_crtc *vkms_crtc =3D drm_crtc_to_vkms_crtc(crtc); =20 if (crtc->state->event) { spin_lock(&crtc->dev->event_lock); @@ -259,9 +257,9 @@ static void vkms_crtc_atomic_flush(struct drm_crtc *crt= c, crtc->state->event =3D NULL; } =20 - vkms_output->composer_state =3D to_vkms_crtc_state(crtc->state); + vkms_crtc->composer_state =3D to_vkms_crtc_state(crtc->state); =20 - spin_unlock_irq(&vkms_output->lock); + spin_unlock_irq(&vkms_crtc->lock); } =20 static const struct drm_crtc_helper_funcs vkms_crtc_helper_funcs =3D { @@ -275,7 +273,7 @@ static const struct drm_crtc_helper_funcs vkms_crtc_hel= per_funcs =3D { int vkms_crtc_init(struct drm_device *dev, struct drm_crtc *crtc, struct drm_plane *primary, struct drm_plane *cursor) { - struct vkms_output *vkms_out =3D drm_crtc_to_vkms_output(crtc); + struct vkms_crtc *vkms_crtc =3D drm_crtc_to_vkms_crtc(crtc); int ret; =20 ret =3D drmm_crtc_init_with_planes(dev, crtc, primary, cursor, @@ -290,11 +288,11 @@ int vkms_crtc_init(struct drm_device *dev, struct drm= _crtc *crtc, drm_mode_crtc_set_gamma_size(crtc, VKMS_LUT_SIZE); drm_crtc_enable_color_mgmt(crtc, 0, false, VKMS_LUT_SIZE); =20 - spin_lock_init(&vkms_out->lock); - spin_lock_init(&vkms_out->composer_lock); + spin_lock_init(&vkms_crtc->lock); + spin_lock_init(&vkms_crtc->composer_lock); =20 - vkms_out->composer_workq =3D alloc_ordered_workqueue("vkms_composer", 0); - if (!vkms_out->composer_workq) + vkms_crtc->composer_workq =3D alloc_ordered_workqueue("vkms_composer", 0); + if (!vkms_crtc->composer_workq) return -ENOMEM; =20 return ret; diff --git a/drivers/gpu/drm/vkms/vkms_drv.c b/drivers/gpu/drm/vkms/vkms_dr= v.c index 0c1a713b7b7b..d1ed6bbe9559 100644 --- a/drivers/gpu/drm/vkms/vkms_drv.c +++ b/drivers/gpu/drm/vkms/vkms_drv.c @@ -57,8 +57,8 @@ static void vkms_release(struct drm_device *dev) { struct vkms_device *vkms =3D drm_device_to_vkms_device(dev); =20 - if (vkms->output.composer_workq) - destroy_workqueue(vkms->output.composer_workq); + if (vkms->crtc.composer_workq) + destroy_workqueue(vkms->crtc.composer_workq); } =20 static void vkms_atomic_commit_tail(struct drm_atomic_state *old_state) diff --git a/drivers/gpu/drm/vkms/vkms_drv.h b/drivers/gpu/drm/vkms/vkms_dr= v.h index 101993378b49..c55ab45ccb20 100644 --- a/drivers/gpu/drm/vkms/vkms_drv.h +++ b/drivers/gpu/drm/vkms/vkms_drv.h @@ -96,8 +96,8 @@ struct vkms_crtc_state { u64 frame_end; }; =20 -struct vkms_output { - struct drm_crtc crtc; +struct vkms_crtc { + struct drm_crtc base; struct drm_writeback_connector wb_connector; struct hrtimer vblank_hrtimer; ktime_t period_ns; @@ -126,12 +126,12 @@ struct vkms_config { struct vkms_device { struct drm_device drm; struct platform_device *platform; - struct vkms_output output; + struct vkms_crtc crtc; const struct vkms_config *config; }; =20 -#define drm_crtc_to_vkms_output(target) \ - container_of(target, struct vkms_output, crtc) +#define drm_crtc_to_vkms_crtc(target) \ + container_of(target, struct vkms_crtc, base) =20 #define drm_device_to_vkms_device(target) \ container_of(target, struct vkms_device, drm) @@ -160,7 +160,7 @@ int vkms_verify_crc_source(struct drm_crtc *crtc, const= char *source_name, =20 /* Composer Support */ void vkms_composer_worker(struct work_struct *work); -void vkms_set_composer(struct vkms_output *out, bool enabled); +void vkms_set_composer(struct vkms_crtc *out, bool enabled); void vkms_compose_row(struct line_buffer *stage_buffer, struct vkms_plane_= state *plane, int y); void vkms_writeback_row(struct vkms_writeback_job *wb, const struct line_b= uffer *src_buffer, int y); =20 diff --git a/drivers/gpu/drm/vkms/vkms_output.c b/drivers/gpu/drm/vkms/vkms= _output.c index bbec7c14229c..cd506dcfd50f 100644 --- a/drivers/gpu/drm/vkms/vkms_output.c +++ b/drivers/gpu/drm/vkms/vkms_output.c @@ -44,11 +44,11 @@ static int vkms_add_overlay_plane(struct vkms_device *v= kmsdev, int index, =20 int vkms_output_init(struct vkms_device *vkmsdev, int index) { - struct vkms_output *output =3D &vkmsdev->output; + struct vkms_crtc *vkms_crtc =3D &vkmsdev->crtc; struct drm_device *dev =3D &vkmsdev->drm; struct drm_connector *connector; struct drm_encoder *encoder; - struct drm_crtc *crtc =3D &output->crtc; + struct drm_crtc *crtc =3D &vkms_crtc->base; struct vkms_plane *primary, *cursor =3D NULL; int ret; int writeback; diff --git a/drivers/gpu/drm/vkms/vkms_writeback.c b/drivers/gpu/drm/vkms/v= kms_writeback.c index bc724cbd5e3a..e055ad41241b 100644 --- a/drivers/gpu/drm/vkms/vkms_writeback.c +++ b/drivers/gpu/drm/vkms/vkms_writeback.c @@ -116,7 +116,7 @@ static void vkms_wb_cleanup_job(struct drm_writeback_co= nnector *connector, 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(&vkmsdev->crtc, false); kfree(vkmsjob); } =20 @@ -126,10 +126,10 @@ static void vkms_wb_atomic_commit(struct drm_connecto= r *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 drm_writeback_connector *wb_conn =3D &output->wb_connector; + struct vkms_crtc *vkms_crtc =3D &vkmsdev->crtc; + struct drm_writeback_connector *wb_conn =3D &vkms_crtc->wb_connector; struct drm_connector_state *conn_state =3D wb_conn->base.state; - struct vkms_crtc_state *crtc_state =3D output->composer_state; + struct vkms_crtc_state *crtc_state =3D vkms_crtc->composer_state; struct drm_framebuffer *fb =3D connector_state->writeback_job->fb; u16 crtc_height =3D crtc_state->base.crtc->mode.vdisplay; u16 crtc_width =3D crtc_state->base.crtc->mode.hdisplay; @@ -140,15 +140,15 @@ static void vkms_wb_atomic_commit(struct drm_connecto= r *conn, if (!conn_state) return; =20 - vkms_set_composer(&vkmsdev->output, true); + vkms_set_composer(&vkmsdev->crtc, true); =20 active_wb =3D conn_state->writeback_job->priv; wb_frame_info =3D &active_wb->wb_frame_info; =20 - spin_lock_irq(&output->composer_lock); + spin_lock_irq(&vkms_crtc->composer_lock); crtc_state->active_writeback =3D active_wb; crtc_state->wb_pending =3D true; - spin_unlock_irq(&output->composer_lock); + spin_unlock_irq(&vkms_crtc->composer_lock); =20 wb_frame_info->offset =3D fb->offsets[0]; wb_frame_info->pitch =3D fb->pitches[0]; @@ -170,7 +170,7 @@ static const struct drm_connector_helper_funcs vkms_wb_= conn_helper_funcs =3D { =20 int vkms_enable_writeback_connector(struct vkms_device *vkmsdev) { - struct drm_writeback_connector *wb =3D &vkmsdev->output.wb_connector; + struct drm_writeback_connector *wb =3D &vkmsdev->crtc.wb_connector; =20 drm_connector_helper_add(&wb->base, &vkms_wb_conn_helper_funcs); =20 --=20 2.44.2 From nobody Fri Dec 19 12:06:23 2025 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 1D70C19DF65 for ; Tue, 27 Aug 2024 10:01:58 +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=1724752921; cv=none; b=UxBOuCSV1Q5egqPtGg1iLZ/VXwZ2bKsruxu3tVm1LuA5vc2TD52WD0LovWvOnT3CTYLeplFD1DPMIsrqHLzrvP9E31GlX09q9rr9IQekzv+wX/Tklq4yTmmJ3A+UbXrb9q7MfXzDXpdOzF22bbVxy3N7is6krZiV1CZtLLssB2Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724752921; c=relaxed/simple; bh=+9EVfrWGXweMRhdpWJLhgyFdBP6idc+nFpzOoZsSppQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=psvpG5/8FEmTO1K8TnJLmoVNANdOojEX+wu28jW+Eo6iYozdH4Sa6bJNh6yCI56K1/ckncbeR9Cl8bZXHPgiErk56sa1SggiZtDtEdzQXaWiRaexiPLbY2eXGeZVNfN9OMrmUrNsc/nrJWAjthrQpf/5rnCA793BWo/NUiVcrUs= 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=p1nJVXQ0; 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="p1nJVXQ0" Received: by mail.gandi.net (Postfix) with ESMTPSA id 8CE231C000C; Tue, 27 Aug 2024 10:01:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1724752917; 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=7I4yjRM+EAGk8OmRLAB0yWxupKT0rtc7RgTC0k07aOc=; b=p1nJVXQ0ZHRoDKZt427xeQRxPBojvSF+oz4++jfpIazlyRI9cU7Dmg6/ms6VX8JOnzcIM+ rcHUp6qmDu3UVPkRpu1nAzEhieGoevJALIeAFzLXg2GGF2akQ1xRILapKp8tZ/xWjco8F9 HU3bEDJJXf6EMhbgA83/MIo1xdY6TljCuBxJJvQYa3om3+u/mSKYLIOjVzrcPSjsxmo9UR BiDQ3kiepDywO361YtrYdmc08vfR3ibSq2n4rW2KnuaUOHbNSrzO4ah3YDVS6zRhnemJto qN5/2mnfv7SMDQ+rlhV/iTcn9GuVfHKAQp7fd83bvBVK3P3r/P+LL58kbeaiWw== From: Louis Chauvet Date: Tue, 27 Aug 2024 11:57:39 +0200 Subject: [PATCH v2 4/6] drm/vkms: rename to_vkms_crtc_state to drm_crtc_state_to_vkms_crtc_state to avoid confusion 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: <20240827-google-vkms-managed-v2-4-f41104553aeb@bootlin.com> References: <20240827-google-vkms-managed-v2-0-f41104553aeb@bootlin.com> In-Reply-To: <20240827-google-vkms-managed-v2-0-f41104553aeb@bootlin.com> 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, nicolejadeyee@google.com, Louis Chauvet X-Mailer: b4 0.15-dev X-Developer-Signature: v=1; a=openpgp-sha256; l=2791; i=louis.chauvet@bootlin.com; h=from:subject:message-id; bh=+9EVfrWGXweMRhdpWJLhgyFdBP6idc+nFpzOoZsSppQ=; b=owEBbQKS/ZANAwAIASCtLsZbECziAcsmYgBmzaQPuNM20rjRpZD7nSUpPweO7ZcP+gjwczjjc 3gojL+9YGaJAjMEAAEIAB0WIQRPj7g/vng8MQxQWQQgrS7GWxAs4gUCZs2kDwAKCRAgrS7GWxAs 4qKID/9nz7XMygblI4ARivSoC0zr8EI1wnWrgFrT/tdSCA8CSeQCU5IF4gubapo16WY/hYgIq6e aQWsp0zCN/uM6uA6WwKIQ9LW3aBmC3cBDIQ7tR4hUO0qxovxiHsbpLYbnVF5J1dqx7N1tgOfqEU Fzvsm2DUmWCCain8nxX6c+Tg+XWA6iJQr+Qq7KoTX8kvoCT/6KWOH05FUZ3YKfbEqKOVpP+0aT7 Zcn4OhyQ0meYoILFPIPviYTVcGJtLmbwpLzmP895OcrohHZYKuCQMP36/bDC9VZax49TVYc9hps V81E7s+aW/GVdZn6PhPFDNqKV2sTzHdILFD5MFKXuNd8v1ZXiq5ppe8eo95vm6+84I+dsEBnbpS GnxPh6jSnHYDk59cKDKlWerdgDzNaiipAhMgA8Y/QkP5gdkm9Cv+KoGhtHj7gSsM8rwi58f1Dbk cl40RVFpg74Wnv9V6krqLNSl57a2IdrxgTpSjNRzG77YndkloXIubWcdMa1qsZLnoSqG7EbuKdP hnwdn5LjQwHCMcxWN5zJhnoYHDGMSEfw5zB2iVsVRs6nnNo/5WZtAkdRGalBgg1N+NLq4qTrWA5 O4ZDTFjXeILYM6Z8fpHsdgzbEDpTBU1BvMzcXuQx5iZk349+hUqhKoQaQv8OqDeqIyZDPkj5fPn l0Vn0Kz0ROmVv/Q== X-Developer-Key: i=louis.chauvet@bootlin.com; a=openpgp; fpr=8B7104AE9A272D6693F527F2EC1883F55E0B40A5 X-GND-Sasl: louis.chauvet@bootlin.com To avoid confusion in macro, rename to_vkms_crtc_state to a more explicit name drm_crtc_state_to_vkms_crtc_state Signed-off-by: Louis Chauvet --- drivers/gpu/drm/vkms/vkms_crtc.c | 6 +++--- drivers/gpu/drm/vkms/vkms_drv.c | 2 +- drivers/gpu/drm/vkms/vkms_drv.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/vkms/vkms_crtc.c b/drivers/gpu/drm/vkms/vkms_c= rtc.c index 013bf8336b54..2bf733a1b9f0 100644 --- a/drivers/gpu/drm/vkms/vkms_crtc.c +++ b/drivers/gpu/drm/vkms/vkms_crtc.c @@ -132,7 +132,7 @@ vkms_atomic_crtc_duplicate_state(struct drm_crtc *crtc) static void vkms_atomic_crtc_destroy_state(struct drm_crtc *crtc, struct drm_crtc_state *state) { - struct vkms_crtc_state *vkms_state =3D to_vkms_crtc_state(state); + struct vkms_crtc_state *vkms_state =3D drm_crtc_state_to_vkms_crtc_state(= state); =20 __drm_atomic_helper_crtc_destroy_state(state); =20 @@ -173,7 +173,7 @@ static int vkms_crtc_atomic_check(struct drm_crtc *crtc, { struct drm_crtc_state *crtc_state =3D drm_atomic_get_new_crtc_state(state, crtc); - struct vkms_crtc_state *vkms_state =3D to_vkms_crtc_state(crtc_state); + struct vkms_crtc_state *vkms_state =3D drm_crtc_state_to_vkms_crtc_state(= crtc_state); struct drm_plane *plane; struct drm_plane_state *plane_state; int i =3D 0, ret; @@ -257,7 +257,7 @@ static void vkms_crtc_atomic_flush(struct drm_crtc *crt= c, crtc->state->event =3D NULL; } =20 - vkms_crtc->composer_state =3D to_vkms_crtc_state(crtc->state); + vkms_crtc->composer_state =3D drm_crtc_state_to_vkms_crtc_state(crtc->sta= te); =20 spin_unlock_irq(&vkms_crtc->lock); } diff --git a/drivers/gpu/drm/vkms/vkms_drv.c b/drivers/gpu/drm/vkms/vkms_dr= v.c index d1ed6bbe9559..f2818374f5c9 100644 --- a/drivers/gpu/drm/vkms/vkms_drv.c +++ b/drivers/gpu/drm/vkms/vkms_drv.c @@ -82,7 +82,7 @@ static void vkms_atomic_commit_tail(struct drm_atomic_sta= te *old_state) =20 for_each_old_crtc_in_state(old_state, crtc, old_crtc_state, i) { struct vkms_crtc_state *vkms_state =3D - to_vkms_crtc_state(old_crtc_state); + drm_crtc_state_to_vkms_crtc_state(old_crtc_state); =20 flush_work(&vkms_state->composer_work); } diff --git a/drivers/gpu/drm/vkms/vkms_drv.h b/drivers/gpu/drm/vkms/vkms_dr= v.h index c55ab45ccb20..3501cd9401d5 100644 --- a/drivers/gpu/drm/vkms/vkms_drv.h +++ b/drivers/gpu/drm/vkms/vkms_drv.h @@ -136,7 +136,7 @@ struct vkms_device { #define drm_device_to_vkms_device(target) \ container_of(target, struct vkms_device, drm) =20 -#define to_vkms_crtc_state(target)\ +#define drm_crtc_state_to_vkms_crtc_state(target)\ container_of(target, struct vkms_crtc_state, base) =20 #define to_vkms_plane_state(target)\ --=20 2.44.2 From nobody Fri Dec 19 12:06:23 2025 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 D19E319DFA3 for ; Tue, 27 Aug 2024 10:01:59 +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=1724752922; cv=none; b=YjwwPNI0GZYiF6aejC72X5qU32+YyIOpt8Hzm4gVJ2dGQStlQHowrr4CS0bIE2AraY2tek2HW6P91dlZMq4GERBkTn/+gahGe7rF13k8XJpEqSVWEvG5J+reG7kj4D05zlf/ggvVeRhLZR4QVj0dvHIGj+G5saEg/tRcwCb6xeA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724752922; c=relaxed/simple; bh=b5zfZhgdJRj84RHHwh0TEbI8bfN8VfBp90V91fl07Zo=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=YOgJvlQ3sIY/Bo20t7AaBWJCbQlUvdIRFvpLQg+4LJHBux4zbZqmCoSFsJqFw7n55z/qYfEID8DuzrTytGAnyYO0UPH90LHscERf14IJ9rmTIKgBd0/umaCPyceulQg2aTN1tcIXuZrxSZLTYy8QNHosREQ7FWUKgdjEn4xR7zY= 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=nTDuvTTw; 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="nTDuvTTw" Received: by mail.gandi.net (Postfix) with ESMTPSA id 7D3271C0012; Tue, 27 Aug 2024 10:01:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1724752918; 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=nab9sxyGuNbJf2fwXC6yPovjq0ddYSUOgBR9X9KtRm4=; b=nTDuvTTwoNbNg3wmmrqgX3ZD1O3vmeezJ0k+zGjlDJWHO0ezmi9BqvLFZt7+XamE33qeCU kYPfNprPBPXBKHt8ZjBkG1jTE8SoRnCriHPtvX1rhbuoLNUAySFxkug4b5EzeFW9Lp4jD1 0mrY3OfRbU50vxuOfOzshnifsGkYXHKiR5lCl6Cfk9V/to8eyhUfByWZGmpUAc1qKep5T2 kYqCREYFZzO7nHAeTx8GXCEeDr8jzCl5mC3d42fEvzjZ+DONaZfgvsCz/Idn8C8SQTlvJ7 UU++oJjOc3LKLfuh+8BKQsMyy4wdX48HCiygbFa9bMRpB/nNT4Np5vbfNeqjkA== From: Louis Chauvet Date: Tue, 27 Aug 2024 11:57:40 +0200 Subject: [PATCH v2 5/6] drm/vkms: Switch to managed 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: <20240827-google-vkms-managed-v2-5-f41104553aeb@bootlin.com> References: <20240827-google-vkms-managed-v2-0-f41104553aeb@bootlin.com> In-Reply-To: <20240827-google-vkms-managed-v2-0-f41104553aeb@bootlin.com> 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, nicolejadeyee@google.com, Louis Chauvet X-Mailer: b4 0.15-dev X-Developer-Signature: v=1; a=openpgp-sha256; l=11461; i=louis.chauvet@bootlin.com; h=from:subject:message-id; bh=b5zfZhgdJRj84RHHwh0TEbI8bfN8VfBp90V91fl07Zo=; b=owEBbQKS/ZANAwAIASCtLsZbECziAcsmYgBmzaQP430g6cQamYKLckg34XmmAfEpSxn3+QXD4 /dBo9spv6iJAjMEAAEIAB0WIQRPj7g/vng8MQxQWQQgrS7GWxAs4gUCZs2kDwAKCRAgrS7GWxAs 4vDGD/9RVHCp3789th6qbz6hd8Y+12n1amBCApowq8uw6H9VWOxh1KJhcxV/U1a8Wwu8mRSEFYl PGh3m/RQG0eYsY+evQLXed1Tc3T78KFV36f/Oiz1XydM7r4UenTrkG4VP4QmXKwJ32XZ6O2UtQR Le+ddAW2U9edfU3xp+1XkmfTp5EUnF99AJChL435qBvb6Gke69Cm+sl5407esUlBCyrC0HXjEPz vpk3P2JTSdp0W1hCJsrYM71vPyUILyBfl0sKHSTVJQe0VMVdgCPixIeFBHHXk65wkli2l4xvtQ0 AgoxULVWxdXplEesG2RrYVyvRcqWcN093hsKsyRTqjw/N6j8LiFVGjCKD/CcAbzaacArL8dQKLO nWrHDzbUEENfrhc9DEHTzX2zeJn5YrsDcDmbJG7F4uD3HpcYajXePuxJdGNfitDq+Wr3HMHBsn7 /YmoHrfrtRkgXKvZrKVMRuIkD70k/w5vLtwDnw4s3fDtBTJMS3qgyaa+qqYb/jwlwfB0ZWbtubu RvUhDYknjWOAu+DzZUOpE9+EKHrujFDSU8IVEHBsR9N8DPl0vSdNxa8ln1RNgi+p6tAvf7j4Jwx Xwn/Pv4Ev2kGOVo+jgGhTwBFjADhinczioqfBhqZK/KG/rSIFf2JOKvZvOb488M79RibTPwReLt L9kLLpxKgitF9IQ== X-Developer-Key: i=louis.chauvet@bootlin.com; a=openpgp; fpr=8B7104AE9A272D6693F527F2EC1883F55E0B40A5 X-GND-Sasl: louis.chauvet@bootlin.com The current VKMS driver uses non-managed function to create CRTCs. It is not an issue yet, but in order to support multiple devices easily, convert this code to use drm and device managed helpers. Signed-off-by: Louis Chauvet --- drivers/gpu/drm/vkms/vkms_crtc.c | 40 +++++++++++++------- drivers/gpu/drm/vkms/vkms_drv.c | 9 ----- drivers/gpu/drm/vkms/vkms_drv.h | 7 ++-- drivers/gpu/drm/vkms/vkms_output.c | 69 +++++++++++++++----------------= ---- drivers/gpu/drm/vkms/vkms_writeback.c | 14 +++---- 5 files changed, 65 insertions(+), 74 deletions(-) diff --git a/drivers/gpu/drm/vkms/vkms_crtc.c b/drivers/gpu/drm/vkms/vkms_c= rtc.c index 2bf733a1b9f0..ff55099c86ce 100644 --- a/drivers/gpu/drm/vkms/vkms_crtc.c +++ b/drivers/gpu/drm/vkms/vkms_crtc.c @@ -6,6 +6,7 @@ #include #include #include +#include =20 #include "vkms_drv.h" =20 @@ -270,30 +271,41 @@ 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) +static void vkms_crtc_destroy_workqueue(struct drm_device *dev, void *raw_= vkms_crtc) { - struct vkms_crtc *vkms_crtc =3D drm_crtc_to_vkms_crtc(crtc); + struct vkms_crtc *vkms_crtc =3D raw_vkms_crtc; + + destroy_workqueue(vkms_crtc->composer_workq); +} + +struct vkms_crtc *vkms_crtc_init(struct vkms_device *vkmsdev, struct drm_p= lane *primary, + struct drm_plane *cursor) +{ + struct drm_device *dev =3D &vkmsdev->drm; + struct vkms_crtc *vkms_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_crtc =3D drmm_crtc_alloc_with_planes(dev, struct vkms_crtc, base, pr= imary, cursor, + &vkms_crtc_funcs, NULL); + if (IS_ERR(vkms_crtc)) { + DRM_DEV_ERROR(vkmsdev->drm.dev, "Failed to init CRTC\n"); + return vkms_crtc; } + drm_crtc_helper_add(&vkms_crtc->base, &vkms_crtc_helper_funcs); =20 - drm_crtc_helper_add(crtc, &vkms_crtc_helper_funcs); - - drm_mode_crtc_set_gamma_size(crtc, VKMS_LUT_SIZE); - drm_crtc_enable_color_mgmt(crtc, 0, false, VKMS_LUT_SIZE); + drm_mode_crtc_set_gamma_size(&vkms_crtc->base, VKMS_LUT_SIZE); + drm_crtc_enable_color_mgmt(&vkms_crtc->base, 0, false, VKMS_LUT_SIZE); =20 spin_lock_init(&vkms_crtc->lock); spin_lock_init(&vkms_crtc->composer_lock); =20 vkms_crtc->composer_workq =3D alloc_ordered_workqueue("vkms_composer", 0); if (!vkms_crtc->composer_workq) - return -ENOMEM; + return ERR_PTR(-ENOMEM); + + ret =3D drmm_add_action_or_reset(dev, vkms_crtc_destroy_workqueue, vkms_c= rtc); + if (ret) + return ERR_PTR(ret); =20 - return ret; + return vkms_crtc; } diff --git a/drivers/gpu/drm/vkms/vkms_drv.c b/drivers/gpu/drm/vkms/vkms_dr= v.c index f2818374f5c9..5282f71b50a6 100644 --- a/drivers/gpu/drm/vkms/vkms_drv.c +++ b/drivers/gpu/drm/vkms/vkms_drv.c @@ -53,14 +53,6 @@ MODULE_PARM_DESC(enable_overlay, "Enable/Disable overlay= support"); =20 DEFINE_DRM_GEM_FOPS(vkms_driver_fops); =20 -static void vkms_release(struct drm_device *dev) -{ - struct vkms_device *vkms =3D drm_device_to_vkms_device(dev); - - if (vkms->crtc.composer_workq) - destroy_workqueue(vkms->crtc.composer_workq); -} - static void vkms_atomic_commit_tail(struct drm_atomic_state *old_state) { struct drm_device *dev =3D old_state->dev; @@ -109,7 +101,6 @@ static const struct drm_debugfs_info vkms_config_debugf= s_list[] =3D { =20 static const struct drm_driver vkms_driver =3D { .driver_features =3D DRIVER_MODESET | DRIVER_ATOMIC | DRIVER_GEM, - .release =3D vkms_release, .fops =3D &vkms_driver_fops, DRM_GEM_SHMEM_DRIVER_OPS, =20 diff --git a/drivers/gpu/drm/vkms/vkms_drv.h b/drivers/gpu/drm/vkms/vkms_dr= v.h index 3501cd9401d5..cff2e0686c04 100644 --- a/drivers/gpu/drm/vkms/vkms_drv.h +++ b/drivers/gpu/drm/vkms/vkms_drv.h @@ -126,7 +126,6 @@ struct vkms_config { struct vkms_device { struct drm_device drm; struct platform_device *platform; - struct vkms_crtc crtc; const struct vkms_config *config; }; =20 @@ -143,8 +142,8 @@ struct vkms_device { container_of(target, struct vkms_plane_state, base.base) =20 /* CRTC */ -int vkms_crtc_init(struct drm_device *dev, struct drm_crtc *crtc, - struct drm_plane *primary, struct drm_plane *cursor); +struct vkms_crtc *vkms_crtc_init(struct vkms_device *vkmsdev, struct drm_p= lane *primary, + struct drm_plane *cursor); =20 int vkms_output_init(struct vkms_device *vkmsdev, int index); =20 @@ -165,6 +164,6 @@ void vkms_compose_row(struct line_buffer *stage_buffer,= struct vkms_plane_state 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 vk= ms_crtc *vkms_crtc); =20 #endif /* _VKMS_DRV_H_ */ diff --git a/drivers/gpu/drm/vkms/vkms_output.c b/drivers/gpu/drm/vkms/vkms= _output.c index cd506dcfd50f..0c585e48fa01 100644 --- a/drivers/gpu/drm/vkms/vkms_output.c +++ b/drivers/gpu/drm/vkms/vkms_output.c @@ -27,42 +27,31 @@ static const struct drm_connector_helper_funcs vkms_con= n_helper_funcs =3D { .get_modes =3D vkms_conn_get_modes, }; =20 -static int vkms_add_overlay_plane(struct vkms_device *vkmsdev, int index, - struct drm_crtc *crtc) -{ - struct vkms_plane *overlay; - - overlay =3D vkms_plane_init(vkmsdev, DRM_PLANE_TYPE_OVERLAY, index); - if (IS_ERR(overlay)) - return PTR_ERR(overlay); - - if (!overlay->base.possible_crtcs) - overlay->base.possible_crtcs =3D drm_crtc_mask(crtc); - - return 0; -} - int vkms_output_init(struct vkms_device *vkmsdev, int index) { - struct vkms_crtc *vkms_crtc =3D &vkmsdev->crtc; + struct vkms_plane *primary, *cursor, *overlay =3D NULL; struct drm_device *dev =3D &vkmsdev->drm; struct drm_connector *connector; struct drm_encoder *encoder; - struct drm_crtc *crtc =3D &vkms_crtc->base; - struct vkms_plane *primary, *cursor =3D NULL; - int ret; - int writeback; + struct vkms_crtc *crtc; unsigned int n; + int ret; =20 + /* + * Initialize used plane. One primary plane is required to perform the co= mposition. + * + * The overlay and cursor planes are not mandatory, but can be used to pe= rform complex + * composition. + */ primary =3D vkms_plane_init(vkmsdev, DRM_PLANE_TYPE_PRIMARY, index); if (IS_ERR(primary)) return PTR_ERR(primary); =20 if (vkmsdev->config->overlay) { for (n =3D 0; n < NUM_OVERLAY_PLANES; n++) { - ret =3D vkms_add_overlay_plane(vkmsdev, index, crtc); - if (ret) - return ret; + overlay =3D vkms_plane_init(vkmsdev, DRM_PLANE_TYPE_OVERLAY, index); + if (IS_ERR(overlay)) + return PTR_ERR(overlay); } } =20 @@ -72,22 +61,24 @@ int vkms_output_init(struct vkms_device *vkmsdev, int i= ndex) return PTR_ERR(cursor); } =20 - ret =3D vkms_crtc_init(dev, crtc, &primary->base, &cursor->base); - if (ret) - return ret; + crtc =3D vkms_crtc_init(vkmsdev, &primary->base, + cursor ? &cursor->base : NULL); + if (IS_ERR(crtc)) { + DRM_ERROR("Failed to allocate CRTC\n"); + return PTR_ERR(crtc); + } =20 connector =3D drmm_kzalloc(dev, sizeof(*connector), GFP_KERNEL); if (!connector) { DRM_ERROR("Failed to allocate connector\n"); - ret =3D -ENOMEM; - goto err_connector; + return -ENOMEM; } =20 ret =3D drmm_connector_init(dev, connector, &vkms_connector_funcs, DRM_MODE_CONNECTOR_VIRTUAL, NULL); if (ret) { DRM_ERROR("Failed to init connector\n"); - goto err_connector; + return ret; } =20 drm_connector_helper_add(connector, &vkms_conn_helper_funcs); @@ -95,34 +86,34 @@ int vkms_output_init(struct vkms_device *vkmsdev, int i= ndex) encoder =3D drmm_kzalloc(dev, sizeof(*encoder), GFP_KERNEL); if (!encoder) { DRM_ERROR("Failed to allocate encoder\n"); - ret =3D -ENOMEM; - goto err_connector; + return -ENOMEM; } =20 ret =3D drmm_encoder_init(dev, encoder, NULL, DRM_MODE_ENCODER_VIRTUAL, N= ULL); if (ret) { DRM_ERROR("Failed to init encoder\n"); - goto err_connector; + return ret; } - encoder->possible_crtcs =3D 1; =20 + encoder->possible_crtcs =3D drm_crtc_mask(&crtc->base); + + /* 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) + ret =3D vkms_enable_writeback_connector(vkmsdev, crtc); + if (ret) { DRM_ERROR("Failed to init writeback connector\n"); + return ret; + } } =20 drm_mode_config_reset(dev); =20 return 0; - -err_connector: - drm_crtc_cleanup(crtc); - return ret; } diff --git a/drivers/gpu/drm/vkms/vkms_writeback.c b/drivers/gpu/drm/vkms/v= kms_writeback.c index e055ad41241b..18aed20cd733 100644 --- a/drivers/gpu/drm/vkms/vkms_writeback.c +++ b/drivers/gpu/drm/vkms/vkms_writeback.c @@ -106,7 +106,7 @@ 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_crtc *vkms_crtc =3D container_of(connector, struct vkms_crtc,= wb_connector); =20 if (!job->fb) return; @@ -115,8 +115,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->crtc, false); + vkms_set_composer(vkms_crtc, false); kfree(vkmsjob); } =20 @@ -125,8 +124,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_crtc *vkms_crtc =3D &vkmsdev->crtc; + struct vkms_crtc *vkms_crtc =3D drm_crtc_to_vkms_crtc(connector_state->cr= tc); struct drm_writeback_connector *wb_conn =3D &vkms_crtc->wb_connector; struct drm_connector_state *conn_state =3D wb_conn->base.state; struct vkms_crtc_state *crtc_state =3D vkms_crtc->composer_state; @@ -140,7 +138,7 @@ static void vkms_wb_atomic_commit(struct drm_connector = *conn, if (!conn_state) return; =20 - vkms_set_composer(&vkmsdev->crtc, true); + vkms_set_composer(vkms_crtc, true); =20 active_wb =3D conn_state->writeback_job->priv; wb_frame_info =3D &active_wb->wb_frame_info; @@ -168,9 +166,9 @@ 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 vk= ms_crtc *vkms_crtc) { - struct drm_writeback_connector *wb =3D &vkmsdev->crtc.wb_connector; + struct drm_writeback_connector *wb =3D &vkms_crtc->wb_connector; =20 drm_connector_helper_add(&wb->base, &vkms_wb_conn_helper_funcs); =20 --=20 2.44.2 From nobody Fri Dec 19 12:06:23 2025 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 C186519E7E4 for ; Tue, 27 Aug 2024 10:02:00 +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=1724752922; cv=none; b=FNgqmgQiUsBPZsaL7KZHepVMX4j2h6hyYfJuIvC4zvKMrny3HTOl7hqZ9BiIy5Gdn/NVHCIxCD4dmKaU1vj04m4nmeNkhNY/Fr5nh5fTzufGXEqZB9u8upKeHU8Q03bWqUY56LMXPraLeVA1WeG3b626N0WCsdKqTXkWQv4sIIs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724752922; c=relaxed/simple; bh=eon9nKAT8aprMkogaxLTrCwGM6rlkI2aZ3rSwA+swpU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=J6d0FBf8ikMvhty4PzHoLngI1hz0nJOU8SuSwJBnmN/V62Lsarh0PgN7XaNPG+PUkcS2axxRVJcUKA0cRyZN8sjbmt33G0RUYIF63dCsINv7YgS0+nWFW2V2ryJQGEsN9aoUKJqh10WrfhAquBGzew8IQWgGoYVhUcNxKQ5ukJw= 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=f/UHflwO; 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="f/UHflwO" Received: by mail.gandi.net (Postfix) with ESMTPSA id 7667C1C0002; Tue, 27 Aug 2024 10:01:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1724752919; 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=QXbrQYbwu05I9QcdP0EOzRyW3VmbUgQZEfA/b5hJq/c=; b=f/UHflwOwNjX3GLS9YGAaiQzzbpHgXjZD2iKJxHwfggRH236UQ+HPVCJrjoFw5d3ryrdYt UGfDhaQg72qAQ7eepZub2VOUG+P/qmD8NNgVlad7B9nZ9HO0iCxTHp8RbDuhso7J7XGXhj MEErdzUe0CdmiOdZiw8lQaGFhLzQMsV+pTU4duPycmHj0YciJsl468heZGR/7vFU4xG0fp tT9X0z5qV1s2nNx2dI4NZebpldrhYxYF3Pt3Ng1p6HRx6mMd/i7duXlUm4Kk1hhE68D7nl DFwitAm/TWZc4jnvRYXatENvxI/Op82NoK64JJKrqu+BUmzurHxuGrhgMPhn2w== From: Louis Chauvet Date: Tue, 27 Aug 2024 11:57:41 +0200 Subject: [PATCH v2 6/6] drm/vkms: Add missing check for CRTC initialization 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: <20240827-google-vkms-managed-v2-6-f41104553aeb@bootlin.com> References: <20240827-google-vkms-managed-v2-0-f41104553aeb@bootlin.com> In-Reply-To: <20240827-google-vkms-managed-v2-0-f41104553aeb@bootlin.com> 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, nicolejadeyee@google.com, Louis Chauvet X-Mailer: b4 0.15-dev X-Developer-Signature: v=1; a=openpgp-sha256; l=1030; i=louis.chauvet@bootlin.com; h=from:subject:message-id; bh=eon9nKAT8aprMkogaxLTrCwGM6rlkI2aZ3rSwA+swpU=; b=owEBbQKS/ZANAwAIASCtLsZbECziAcsmYgBmzaQPRDVNlHwwkHSIsyM3580wfuLwKuybATZ3e f1fTFkk8FaJAjMEAAEIAB0WIQRPj7g/vng8MQxQWQQgrS7GWxAs4gUCZs2kDwAKCRAgrS7GWxAs 4q3VD/9O53/2TSWKz6e2kcpm9dLhofqv1w+m5klIZ8QHKUHuTMyrKFAtsz1h8R4ElpWZXr1sXAc ncPE46mxY559k5KaL+fEwK9mtU9XRbD6OczzCmiRCTCU0BJKCDa/KMJgd6F63ITacdZF5JcuFkR Xv9M1hgHh92mTXp+XdZwTKOoVsDMWtXIJW9xYQp9cLTd4kfAkkzqaK3D6/0Ql+9sPN8oPHSkZfs /0NDi55NfeUllmYA9I+EeKjqp25WxLxmbj+JrWgmVjZ9aVYXvfmazK3bnMXWIEMDG6pj8+Uexf+ qVjJ4JqtmYOlDsKGWdWUz91jgWQH3Z1pI5wg6XvKAI12bL1p3+2t0T2np0+LyrdqxJr4phgT2SA jtgP6gKCABQaoE9Eqmfn0YSGqjQ+O2esSfx5+xUb6bCFDY5LB/bBpyJbrJ1244ZHVN9FPxvukb5 NraOGZ+CTOFSx6mbdC1clO6qfIKgzwqQ7SARti31N+crDKbzvHlfdjmp/U9m2AvlOzQc1bwrgUZ ZgUou1GjYGxQGxAmKCay9KupgL/3FoKFL6CJ5x11dwoN9GNjvXz+3kxtbHyaSDFJN62TtEmpNwS /0Kih70wh2BRmK81LRVMjhj5k6oHVuwbr3Ge7Ra+TnoBg+w8S7kSm9g0CTIrBgehCCskkoQ5SdH qC3+Dhf6xAYwRDA== X-Developer-Key: i=louis.chauvet@bootlin.com; a=openpgp; fpr=8B7104AE9A272D6693F527F2EC1883F55E0B40A5 X-GND-Sasl: louis.chauvet@bootlin.com CRTC initialization call drm_mode_crtc_set_gamma_size without the proper checks, introduce this check. Signed-off-by: Louis Chauvet --- drivers/gpu/drm/vkms/vkms_crtc.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/vkms/vkms_crtc.c b/drivers/gpu/drm/vkms/vkms_c= rtc.c index ff55099c86ce..39802c928bdf 100644 --- a/drivers/gpu/drm/vkms/vkms_crtc.c +++ b/drivers/gpu/drm/vkms/vkms_crtc.c @@ -293,7 +293,12 @@ struct vkms_crtc *vkms_crtc_init(struct vkms_device *v= kmsdev, struct drm_plane * } drm_crtc_helper_add(&vkms_crtc->base, &vkms_crtc_helper_funcs); =20 - drm_mode_crtc_set_gamma_size(&vkms_crtc->base, VKMS_LUT_SIZE); + ret =3D drm_mode_crtc_set_gamma_size(&vkms_crtc->base, VKMS_LUT_SIZE); + if (ret) { + DRM_DEV_ERROR(vkmsdev->drm.dev, "Failed to set gamma size\n"); + return ERR_PTR(ret); + } + drm_crtc_enable_color_mgmt(&vkms_crtc->base, 0, false, VKMS_LUT_SIZE); =20 spin_lock_init(&vkms_crtc->lock); --=20 2.44.2