From nobody Mon Feb 9 16:45:58 2026 Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) (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 F1371199230 for ; Wed, 29 Jan 2025 11:01:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738148469; cv=none; b=U/zhUX/J2XkhZZ88BoMM3PPiGYVckjQTI/VPyPcRKSL8on8Yp6Od8gFK3zRhoIguB/KFSrxu30+dhMEjPGa6tdS5/eRqadN+rSSA2q3jVCaBqNEqHoP4RT0sv5FEtbxAItOUT13b3WRVajSjisDVnciI3yvB0kRouIvKhJMUYew= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738148469; c=relaxed/simple; bh=jTWvVXKK9XDaJbYor54RHRHgA8EphIDA4CQFEt1p2yk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=KCpQuJOXZesG0DImKZm6jtJK2n9ktwWWRMu9Ku6tINlRFm/sUvPi3CHOyhDLdf2n2NhkqMkN16iQgwXiDbMCyZazNLlNXGitZe6PbaxC2TbMStMsBQyIQTdXtZHbzg5Hek0O+G84VWFXwGuzWZI5iPx6c/x2u/ncuCYpp+1lNQM= 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=lY02aCiN; arc=none smtp.client-ip=209.85.128.51 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="lY02aCiN" Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-436341f575fso74033045e9.1 for ; Wed, 29 Jan 2025 03:01:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1738148466; x=1738753266; 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=9S+7C5eQRPWzuHKFjKrS6n1FuYqDvplaGUQ2TD3AN7Y=; b=lY02aCiNKnor4Ew3heylyzh+c+JzoMWqDKYmXFw988ZUjQbpOatCX6rC9xA9xhM9gh wew4Tjqf6t2LRKR3XROv5q/F9id4Ya1sD/mXc8eIoh9ystO32DK0Ds5B1zuplq4Yt/BN 5FCL47l9kEl+vz1vFaPU29mIv0Ckp3IzOt7JahKme8YzPqQqO2X2vV+cexyTBaMCdfNN jeo4dqJdPsBE2YdLne7EYxHkdCw35kIPZBpcsjZ8SiQXVyNKummHQ1cetIjcOuMm1v8o PdT7ScCPVMcMwa7OpSogjTgF1orvYvOj7Z0CFJsQ9Uw59sDkrgGRQ9PeaLMbG8NGNKn2 mbIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738148466; x=1738753266; 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=9S+7C5eQRPWzuHKFjKrS6n1FuYqDvplaGUQ2TD3AN7Y=; b=RIuBxX9svw+HWK2t61ccARFYlMGLFlZ6kOYsdxThTxjebPx66Rt4AnW7Yc6IABU0pN STpp2KZUyUZNEiVc3PB083yy2Qbck2ZNG7ZPO/5aCU0Mh8TOVsoRFDMsAjRC/3fRAVxp xD30YabNVSlu+Ejfvh7xIAwnSR01JT37vpHEHbB7Yc8Ge+lOvLL8ujX0hFj2QmS3yEvg RAvFRBgjTCojKJ8+XOR0/ZRVk7hOILv0Szu3U7Hb5cdBOv+ot17yxbKQtlVeVHIGbFOQ WUMEowner6xm5G+Xo8JoJumIUYvWetu6AO4BT21q7MbTbOOUwb5jjq2XDAmlyQLxDQpt oRTg== X-Forwarded-Encrypted: i=1; AJvYcCWywvRf6az9pWlIzXmRJlk7ZsPmfjyvnTACoBmTIbxuMcDwQBKtjc1SRHbhe3X1nAaQJ0b+vUG9IDwhBCU=@vger.kernel.org X-Gm-Message-State: AOJu0Yyt+UMPY2bcpQRzkyIdZXHqV7aWbnaAyuK4/U+jHFS+kZSfO1kT kdqjKsD/GHmEcz3kxDME9xCaqT6LIZf2cNdKEJTikTXgDRFoQaUb X-Gm-Gg: ASbGnctn7dxDdcJE97Bbs1Bv9i7PM8YMrazgtpEHE+g87WBEwYoNRjEvBhAqrAF6GoQ faH9dtIco6g5bk7r+qJbOUcoIXdxt/GCSS2uKlHDT/v1vSJQb4G7FH+Mi17GawiiRYYB+C0Ie/l AtVKi6AmomBJwQ7pMU8EEfFDls6ETTyYPy4lQE79EQHplb0Lug68FQ3RyP8anCgbF1+bjFTc3jp RlUAieD7MbgcMpQ7k/XMXmbuE3OJrQGslaf4h70ZlpoGZ0h6IPYSI4NsFhaR5FqgzGU6BCsrszu +Z3t1Hg/SJIhwlPX X-Google-Smtp-Source: AGHT+IGHXcYWBGVD149ms+rmsIFUA7ZyRH6Ih7lsGoiLaHzrNT56I8mZyx+mQ+eMvA8IwLloDChjhg== X-Received: by 2002:a05:600c:3b94:b0:434:ff45:cbbe with SMTP id 5b1f17b1804b1-438dc3cba35mr22656875e9.18.1738148465987; Wed, 29 Jan 2025 03:01:05 -0800 (PST) Received: from fedora.. ([94.73.37.161]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38c2a176434sm16947113f8f.13.2025.01.29.03.01.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Jan 2025 03:01:05 -0800 (PST) From: =?UTF-8?q?Jos=C3=A9=20Exp=C3=B3sito?= To: louis.chauvet@bootlin.com Cc: hamohammed.sa@gmail.com, simona@ffwll.ch, melissa.srw@gmail.com, maarten.lankhorst@linux.intel.com, mripard@kernel.org, tzimmermann@suse.de, airlied@gmail.com, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, =?UTF-8?q?Jos=C3=A9=20Exp=C3=B3sito?= Subject: [PATCH 01/13] drm/vkms: Extract vkms_connector header Date: Wed, 29 Jan 2025 12:00:47 +0100 Message-ID: <20250129110059.12199-2-jose.exposito89@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250129110059.12199-1-jose.exposito89@gmail.com> References: <20250129110059.12199-1-jose.exposito89@gmail.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: quoted-printable Up until now, the logic to manage connectors was in vkms_output.c. Since more options will be added to connectors in the future, extract the code to its own file. Refactor, no functional changes. Signed-off-by: Jos=C3=A9 Exp=C3=B3sito Reviewed-by: Louis Chauvet --- drivers/gpu/drm/vkms/Makefile | 3 +- drivers/gpu/drm/vkms/vkms_connector.c | 50 +++++++++++++++++++++++++++ drivers/gpu/drm/vkms/vkms_connector.h | 26 ++++++++++++++ drivers/gpu/drm/vkms/vkms_output.c | 45 ++++-------------------- 4 files changed, 84 insertions(+), 40 deletions(-) create mode 100644 drivers/gpu/drm/vkms/vkms_connector.c create mode 100644 drivers/gpu/drm/vkms/vkms_connector.h diff --git a/drivers/gpu/drm/vkms/Makefile b/drivers/gpu/drm/vkms/Makefile index 1b28a6a32948..6b0615c424f2 100644 --- a/drivers/gpu/drm/vkms/Makefile +++ b/drivers/gpu/drm/vkms/Makefile @@ -6,6 +6,7 @@ vkms-y :=3D \ vkms_formats.o \ vkms_crtc.o \ vkms_composer.o \ - vkms_writeback.o + vkms_writeback.o \ + vkms_connector.o =20 obj-$(CONFIG_DRM_VKMS) +=3D vkms.o diff --git a/drivers/gpu/drm/vkms/vkms_connector.c b/drivers/gpu/drm/vkms/v= kms_connector.c new file mode 100644 index 000000000000..ab8b52a84151 --- /dev/null +++ b/drivers/gpu/drm/vkms/vkms_connector.c @@ -0,0 +1,50 @@ +// SPDX-License-Identifier: GPL-2.0+ + +#include +#include +#include +#include + +#include "vkms_connector.h" + +static const struct drm_connector_funcs vkms_connector_funcs =3D { + .fill_modes =3D drm_helper_probe_single_connector_modes, + .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, +}; + +static int vkms_conn_get_modes(struct drm_connector *connector) +{ + int count; + + /* Use the default modes list from DRM */ + count =3D drm_add_modes_noedid(connector, XRES_MAX, YRES_MAX); + drm_set_preferred_mode(connector, XRES_DEF, YRES_DEF); + + return count; +} + +static const struct drm_connector_helper_funcs vkms_conn_helper_funcs =3D { + .get_modes =3D vkms_conn_get_modes, +}; + +struct vkms_connector *vkms_connector_init(struct vkms_device *vkmsdev) +{ + struct drm_device *dev =3D &vkmsdev->drm; + struct vkms_connector *connector; + int ret; + + connector =3D drmm_kzalloc(dev, sizeof(*connector), GFP_KERNEL); + if (!connector) + return ERR_PTR(-ENOMEM); + + ret =3D drmm_connector_init(dev, &connector->base, &vkms_connector_funcs, + DRM_MODE_CONNECTOR_VIRTUAL, NULL); + if (ret) + return ERR_PTR(ret); + + drm_connector_helper_add(&connector->base, &vkms_conn_helper_funcs); + + return connector; +} diff --git a/drivers/gpu/drm/vkms/vkms_connector.h b/drivers/gpu/drm/vkms/v= kms_connector.h new file mode 100644 index 000000000000..c9149c1b7af0 --- /dev/null +++ b/drivers/gpu/drm/vkms/vkms_connector.h @@ -0,0 +1,26 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ + +#ifndef _VKMS_CONNECTOR_H_ +#define _VKMS_CONNECTOR_H_ + +#include "vkms_drv.h" + +/** + * struct vkms_connector - VKMS custom type wrapping around the DRM connec= tor + * + * @drm: Base DRM connector + */ +struct vkms_connector { + struct drm_connector base; +}; + +/** + * vkms_connector_init() - Initialize a connector + * @vkmsdev: VKMS device containing the connector + * + * Returns: + * The connector or an error on failure. + */ +struct vkms_connector *vkms_connector_init(struct vkms_device *vkmsdev); + +#endif /* _VKMS_CONNECTOR_H_ */ diff --git a/drivers/gpu/drm/vkms/vkms_output.c b/drivers/gpu/drm/vkms/vkms= _output.c index 22f0d678af3a..4b5abe159add 100644 --- a/drivers/gpu/drm/vkms/vkms_output.c +++ b/drivers/gpu/drm/vkms/vkms_output.c @@ -1,37 +1,13 @@ // SPDX-License-Identifier: GPL-2.0+ =20 +#include "vkms_connector.h" #include "vkms_drv.h" -#include -#include #include -#include - -static const struct drm_connector_funcs vkms_connector_funcs =3D { - .fill_modes =3D drm_helper_probe_single_connector_modes, - .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, -}; - -static int vkms_conn_get_modes(struct drm_connector *connector) -{ - int count; - - /* Use the default modes list from DRM */ - count =3D drm_add_modes_noedid(connector, XRES_MAX, YRES_MAX); - drm_set_preferred_mode(connector, XRES_DEF, YRES_DEF); - - return count; -} - -static const struct drm_connector_helper_funcs vkms_conn_helper_funcs =3D { - .get_modes =3D vkms_conn_get_modes, -}; =20 int vkms_output_init(struct vkms_device *vkmsdev) { struct drm_device *dev =3D &vkmsdev->drm; - struct drm_connector *connector; + struct vkms_connector *connector; struct drm_encoder *encoder; struct vkms_output *output; struct vkms_plane *primary, *overlay, *cursor =3D NULL; @@ -73,21 +49,12 @@ int vkms_output_init(struct vkms_device *vkmsdev) } } =20 - connector =3D drmm_kzalloc(dev, sizeof(*connector), GFP_KERNEL); - if (!connector) { - DRM_ERROR("Failed to allocate connector\n"); - return -ENOMEM; - } - - ret =3D drmm_connector_init(dev, connector, &vkms_connector_funcs, - DRM_MODE_CONNECTOR_VIRTUAL, NULL); - if (ret) { + connector =3D vkms_connector_init(vkmsdev); + if (IS_ERR(connector)) { DRM_ERROR("Failed to init connector\n"); - return ret; + return PTR_ERR(connector); } =20 - drm_connector_helper_add(connector, &vkms_conn_helper_funcs); - encoder =3D drmm_kzalloc(dev, sizeof(*encoder), GFP_KERNEL); if (!encoder) { DRM_ERROR("Failed to allocate encoder\n"); @@ -102,7 +69,7 @@ int vkms_output_init(struct vkms_device *vkmsdev) encoder->possible_crtcs =3D drm_crtc_mask(&output->crtc); =20 /* Attach the encoder and the connector */ - ret =3D drm_connector_attach_encoder(connector, encoder); + ret =3D drm_connector_attach_encoder(&connector->base, encoder); if (ret) { DRM_ERROR("Failed to attach connector to encoder\n"); return ret; --=20 2.48.1