From nobody Wed Dec 17 06:32:21 2025 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 D85EF21D00B for ; Tue, 11 Feb 2025 11:09:39 +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=1739272182; cv=none; b=tMP7rz03cHHTSbhetLb6YMkPlzPTFs5Hm8TFqX7cQejrRKjE2lnDYeTjQ9vq2Ui8btToEZ1mpMv1smhLtAVb6YleY3oZaYtZSVtHjGS6UiiuTNtSS9DVKIZf1eM1zLe29HeHOUTUEyO8FJ5FHb9uN9vaWJAFcp77kS1qrrwaE+g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739272182; c=relaxed/simple; bh=ZTj9POfW0r2v891dVioEm/LvxgBX96ByWwuDI/SqhRc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=OIrtRAhx7SIU5t5Snt6F0EYokmj6giihRflRY4TDYVKm2T0qb616gzKlgYh0Ili7UkNhwS2x3wAXNBRe/ogbUhn2h+/+QbPCM3ImPPlPXsd2EZMMC/cH8VznUGvVCy6x5Fdle6Zgz/2EJ7iM9kPVrVA9n0eigHcqsLBVi0j1n0A= 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=P3hZy0SF; 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="P3hZy0SF" Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-4394829ef0fso10152635e9.0 for ; Tue, 11 Feb 2025 03:09:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739272178; x=1739876978; 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=uGUdgw2ywsEOYDg6PxJGKHCOLJS2s2ya/ph3EyRFJVM=; b=P3hZy0SFInf12gWHqCoUoOwpATfNupSAUqCBxEroTyuorqTJNhMdqzbjsqo0drrBbB sF8U2dVlU1rqpAvMrqfZiRkXbrZHF0u3oTysrIPbHdIsfmnxvyfPMl16Hs5DdaAi9z/T pQYVKr7tGPisb36kN39JY1YJy/J2Mk10e+iSkOrEWXAaBWYawAHISKpk+FDe3n8vhkv1 zmbpZ79Kphv7mTbion+bqb77bnrSqq90+yJd5DUjGNnCotCXEBNNDkV5e9u+KBmx45L0 zCoQHZ5cNckbEMFS/2Nl3XbV8xRBlbRJFLwqmVjhrRMHyD4pQJyzUeyqev2dRrwTjGwo 9dAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739272178; x=1739876978; 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=uGUdgw2ywsEOYDg6PxJGKHCOLJS2s2ya/ph3EyRFJVM=; b=w0ySUMejzOPoxxj4+LgtMcGu/gXZ1OY3qsjp/f0R2tUR848OFXT1mY9fxS1mTu+OAn Vo4xtkDnNcnlVgJOj56npmK/Wr9Y5qhNU+CKzAcuWB/ZmTeD431qlbCFZZbClZD3GqkY ByBjPugnAfWcJd/JflQi4tHZTo+FZcPBysc4oDeRRF70kVUzAlS2O2CQc22emD889IEt CPGMAkLs4cj0H+kR6EIeT9cC5+5rGaQSmbfblnH+MJZ8vojVfbBBdz0g2w8tTiRogleo DSZsTWRYYqj8rpS9nnV3YICLes4uUHTD8LyWK6WnGQQCMtc7taxEg4RjXUcxMDAVi0nB HC0w== X-Forwarded-Encrypted: i=1; AJvYcCUky2fXIPTcbkGof4EcvGBmGQKnhf+pFU+C2hB9NWA4uoIhho7KDwPbQ6TjhOdnea9HRzHrsKd9Al5wFIs=@vger.kernel.org X-Gm-Message-State: AOJu0YzdR4A9To7v3vR6d3IJgWEek2fVyCmrIah/ynH4p9LYaMTJagFw GwXRTg0wVLSo32Owcb6MovcOcR6hhzE20uqYQZJHKcqsovdrtbjm X-Gm-Gg: ASbGncuG9iZf10XfhvKOxWCPEAtiKKjQy25Ax/qZYFrl4s5yEgYu/F+Clz4JXjp0K7k ylhtr+32X8x0KCsl13g+ZniVh5FgkCxypzt1e2/cTCyEsaJ7ZJxQDnPLYsP0YCrTwixJ+PYddW7 de/YHyKHnhmHzP96TP/HvX545t5ZMT9KmxtaTfJNdN16EgWnWdTsqT2oteFFeO4VSPI3s2HVm2s HoqFbsk63Ogp8HwlupPrWQsZZo7c7ZjNabt5cZw7n+y8B8biwuGWlie6Oyrfp5YO49gJQxVoI5/ b9ktuIXYcCxshY6C X-Google-Smtp-Source: AGHT+IEBywQtzeAfqxQNya+FLykWVeF9GchkmCoUu0KPaur3KfXxA5e/gms8QC9wUmsE7b8h69zDmQ== X-Received: by 2002:a5d:64c4:0:b0:38d:c0c0:b3da with SMTP id ffacd0b85a97d-38de438e603mr2334406f8f.2.1739272178153; Tue, 11 Feb 2025 03:09:38 -0800 (PST) Received: from fedora.. ([94.73.37.161]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38dcb55b7a5sm11814417f8f.14.2025.02.11.03.09.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Feb 2025 03:09:37 -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 v2 15/15] drm/vkms: Allow to attach connectors and encoders Date: Tue, 11 Feb 2025 12:09:12 +0100 Message-ID: <20250211110912.15409-16-jose.exposito89@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250211110912.15409-1-jose.exposito89@gmail.com> References: <20250211110912.15409-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 Add a list of possible encoders to the connector configuration and helpers to attach and detach them. Now that the default configuration has its connector and encoder correctly, configure the output following the configuration. Co-developed-by: Louis Chauvet Signed-off-by: Louis Chauvet Signed-off-by: Jos=C3=A9 Exp=C3=B3sito --- .clang-format | 1 + drivers/gpu/drm/vkms/tests/vkms_config_test.c | 94 +++++++++++++++++++ drivers/gpu/drm/vkms/vkms_config.c | 60 ++++++++++++ drivers/gpu/drm/vkms/vkms_config.h | 29 ++++++ drivers/gpu/drm/vkms/vkms_output.c | 33 ++++--- 5 files changed, 204 insertions(+), 13 deletions(-) diff --git a/.clang-format b/.clang-format index ca49832993c5..7630990aa07a 100644 --- a/.clang-format +++ b/.clang-format @@ -694,6 +694,7 @@ ForEachMacros: - 'vkms_config_for_each_crtc' - 'vkms_config_for_each_encoder' - 'vkms_config_for_each_plane' + - 'vkms_config_connector_for_each_possible_encoder' - 'vkms_config_encoder_for_each_possible_crtc' - 'vkms_config_plane_for_each_possible_crtc' - 'while_for_each_ftrace_op' diff --git a/drivers/gpu/drm/vkms/tests/vkms_config_test.c b/drivers/gpu/dr= m/vkms/tests/vkms_config_test.c index cba7e9d2fcad..2d104ecfde3b 100644 --- a/drivers/gpu/drm/vkms/tests/vkms_config_test.c +++ b/drivers/gpu/drm/vkms/tests/vkms_config_test.c @@ -511,6 +511,27 @@ static void vkms_config_test_invalid_connector_number(= struct kunit *test) vkms_config_destroy(config); } =20 +static void vkms_config_test_valid_connector_possible_encoders(struct kuni= t *test) +{ + struct vkms_config *config; + struct vkms_config_encoder *encoder_cfg; + struct vkms_config_connector *connector_cfg; + + config =3D vkms_config_default_create(false, false, false); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, config); + + encoder_cfg =3D list_first_entry(&config->encoders, + typeof(*encoder_cfg), link); + connector_cfg =3D list_first_entry(&config->connectors, + typeof(*connector_cfg), link); + + /* Invalid: Connector without a possible encoder */ + vkms_config_connector_detach_encoder(connector_cfg, encoder_cfg); + KUNIT_EXPECT_FALSE(test, vkms_config_is_valid(config)); + + vkms_config_destroy(config); +} + static void vkms_config_test_plane_attach_crtc(struct kunit *test) { struct vkms_config *config; @@ -700,6 +721,77 @@ static void vkms_config_test_encoder_get_possible_crtc= s(struct kunit *test) vkms_config_destroy(config); } =20 +static void vkms_config_test_connector_get_possible_encoders(struct kunit = *test) +{ + struct vkms_config *config; + struct vkms_config_connector *connector_cfg1, *connector_cfg2; + struct vkms_config_encoder *encoder_cfg1, *encoder_cfg2; + struct vkms_config_encoder *possible_encoder; + unsigned long idx =3D 0; + int n_encoders =3D 0; + int err; + + config =3D vkms_config_create("test"); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, config); + + connector_cfg1 =3D vkms_config_create_connector(config); + connector_cfg2 =3D vkms_config_create_connector(config); + encoder_cfg1 =3D vkms_config_create_encoder(config); + encoder_cfg2 =3D vkms_config_create_encoder(config); + + /* No possible encoders */ + vkms_config_connector_for_each_possible_encoder(connector_cfg1, idx, + possible_encoder) + KUNIT_FAIL(test, "Unexpected possible encoder"); + + vkms_config_connector_for_each_possible_encoder(connector_cfg2, idx, + possible_encoder) + KUNIT_FAIL(test, "Unexpected possible encoder"); + + /* Connector 1 attached to encoders 1 and 2 */ + err =3D vkms_config_connector_attach_encoder(connector_cfg1, encoder_cfg1= ); + KUNIT_EXPECT_EQ(test, err, 0); + err =3D vkms_config_connector_attach_encoder(connector_cfg1, encoder_cfg2= ); + KUNIT_EXPECT_EQ(test, err, 0); + + vkms_config_connector_for_each_possible_encoder(connector_cfg1, idx, + possible_encoder) { + n_encoders++; + if (possible_encoder !=3D encoder_cfg1 && + possible_encoder !=3D encoder_cfg2) + KUNIT_FAIL(test, "Unexpected possible encoder"); + } + KUNIT_ASSERT_EQ(test, n_encoders, 2); + n_encoders =3D 0; + + vkms_config_connector_for_each_possible_encoder(connector_cfg2, idx, + possible_encoder) + KUNIT_FAIL(test, "Unexpected possible encoder"); + + /* Connector 1 attached to encoder 1 and connector 2 to encoder 2 */ + vkms_config_connector_detach_encoder(connector_cfg1, encoder_cfg2); + vkms_config_connector_for_each_possible_encoder(connector_cfg1, idx, + possible_encoder) { + n_encoders++; + if (possible_encoder !=3D encoder_cfg1) + KUNIT_FAIL(test, "Unexpected possible encoder"); + } + KUNIT_ASSERT_EQ(test, n_encoders, 1); + n_encoders =3D 0; + + err =3D vkms_config_connector_attach_encoder(connector_cfg2, encoder_cfg2= ); + KUNIT_EXPECT_EQ(test, err, 0); + vkms_config_connector_for_each_possible_encoder(connector_cfg2, idx, + possible_encoder) { + n_encoders++; + if (possible_encoder !=3D encoder_cfg2) + KUNIT_FAIL(test, "Unexpected possible encoder"); + } + KUNIT_ASSERT_EQ(test, n_encoders, 1); + + vkms_config_destroy(config); +} + static struct kunit_case vkms_config_test_cases[] =3D { KUNIT_CASE(vkms_config_test_empty_config), KUNIT_CASE_PARAM(vkms_config_test_default_config, @@ -715,9 +807,11 @@ static struct kunit_case vkms_config_test_cases[] =3D { KUNIT_CASE(vkms_config_test_invalid_encoder_number), KUNIT_CASE(vkms_config_test_valid_encoder_possible_crtcs), KUNIT_CASE(vkms_config_test_invalid_connector_number), + KUNIT_CASE(vkms_config_test_valid_connector_possible_encoders), KUNIT_CASE(vkms_config_test_plane_attach_crtc), KUNIT_CASE(vkms_config_test_plane_get_possible_crtcs), KUNIT_CASE(vkms_config_test_encoder_get_possible_crtcs), + KUNIT_CASE(vkms_config_test_connector_get_possible_encoders), {} }; =20 diff --git a/drivers/gpu/drm/vkms/vkms_config.c b/drivers/gpu/drm/vkms/vkms= _config.c index d52280d3bbee..3d95dc713151 100644 --- a/drivers/gpu/drm/vkms/vkms_config.c +++ b/drivers/gpu/drm/vkms/vkms_config.c @@ -93,6 +93,9 @@ struct vkms_config *vkms_config_default_create(bool enabl= e_cursor, if (IS_ERR(connector_cfg)) goto err_alloc; =20 + if (vkms_config_connector_attach_encoder(connector_cfg, encoder_cfg)) + goto err_alloc; + return config; =20 err_alloc: @@ -275,6 +278,22 @@ static bool valid_connector_number(struct vkms_config = *config) return true; } =20 +static bool valid_connector_possible_encoders(struct vkms_config *config) +{ + struct drm_device *dev =3D &config->dev->drm; + struct vkms_config_connector *connector_cfg; + + vkms_config_for_each_connector(config, connector_cfg) { + if (xa_empty(&connector_cfg->possible_encoders)) { + drm_info(dev, + "All connectors must have at least one possible encoder\n"); + return false; + } + } + + return true; +} + bool vkms_config_is_valid(struct vkms_config *config) { struct vkms_config_crtc *crtc_cfg; @@ -302,6 +321,9 @@ bool vkms_config_is_valid(struct vkms_config *config) if (!valid_encoder_possible_crtcs(config)) return false; =20 + if (!valid_connector_possible_encoders(config)) + return false; + return true; } =20 @@ -493,6 +515,11 @@ struct vkms_config_encoder *vkms_config_create_encoder= (struct vkms_config *confi void vkms_config_destroy_encoder(struct vkms_config *config, struct vkms_config_encoder *encoder_cfg) { + struct vkms_config_connector *connector_cfg; + + vkms_config_for_each_connector(config, connector_cfg) + vkms_config_connector_detach_encoder(connector_cfg, encoder_cfg); + xa_destroy(&encoder_cfg->possible_crtcs); list_del(&encoder_cfg->link); kfree(encoder_cfg); @@ -534,6 +561,8 @@ struct vkms_config_connector *vkms_config_create_connec= tor(struct vkms_config *c if (!connector_cfg) return ERR_PTR(-ENOMEM); =20 + xa_init_flags(&connector_cfg->possible_encoders, XA_FLAGS_ALLOC); + list_add_tail(&connector_cfg->link, &config->connectors); =20 return connector_cfg; @@ -541,6 +570,37 @@ struct vkms_config_connector *vkms_config_create_conne= ctor(struct vkms_config *c =20 void vkms_config_destroy_connector(struct vkms_config_connector *connector= _cfg) { + xa_destroy(&connector_cfg->possible_encoders); list_del(&connector_cfg->link); kfree(connector_cfg); } + +int __must_check vkms_config_connector_attach_encoder(struct vkms_config_c= onnector *connector_cfg, + struct vkms_config_encoder *encoder_cfg) +{ + struct vkms_config_encoder *possible_encoder; + unsigned long idx =3D 0; + u32 encoder_idx =3D 0; + + vkms_config_connector_for_each_possible_encoder(connector_cfg, idx, + possible_encoder) { + if (possible_encoder =3D=3D encoder_cfg) + return -EINVAL; + } + + return xa_alloc(&connector_cfg->possible_encoders, &encoder_idx, + encoder_cfg, xa_limit_32b, GFP_KERNEL); +} + +void vkms_config_connector_detach_encoder(struct vkms_config_connector *co= nnector_cfg, + struct vkms_config_encoder *encoder_cfg) +{ + struct vkms_config_encoder *possible_encoder; + unsigned long idx =3D 0; + + vkms_config_connector_for_each_possible_encoder(connector_cfg, idx, + possible_encoder) { + if (possible_encoder =3D=3D encoder_cfg) + xa_erase(&connector_cfg->possible_encoders, idx); + } +} diff --git a/drivers/gpu/drm/vkms/vkms_config.h b/drivers/gpu/drm/vkms/vkms= _config.h index 8451c2f127b6..c87513d174f2 100644 --- a/drivers/gpu/drm/vkms/vkms_config.h +++ b/drivers/gpu/drm/vkms/vkms_config.h @@ -92,6 +92,7 @@ struct vkms_config_encoder { * struct vkms_config_connector * * @link: Link to the others connector in vkms_config + * @possible_encoders: Array of encoders that can be used with this connec= tor * @connector: Internal usage. This pointer should never be considered as = valid. * It can be used to store a temporary reference to a VKMS con= nector * during device creation. This pointer is not managed by the @@ -100,6 +101,8 @@ struct vkms_config_encoder { struct vkms_config_connector { struct list_head link; =20 + struct xarray possible_encoders; + /* Internal usage */ struct vkms_connector *connector; }; @@ -156,6 +159,16 @@ struct vkms_config_connector { #define vkms_config_encoder_for_each_possible_crtc(encoder_cfg, idx, possi= ble_crtc) \ xa_for_each(&(encoder_cfg)->possible_crtcs, idx, (possible_crtc)) =20 +/** + * vkms_config_connector_for_each_possible_encoder - Iterate over the + * vkms_config_connector possible encoders + * @connector_cfg: &struct vkms_config_connector pointer + * @idx: Index of the cursor + * @possible_encoder: &struct vkms_config_encoder pointer used as cursor + */ +#define vkms_config_connector_for_each_possible_encoder(connector_cfg, idx= , possible_encoder) \ + xa_for_each(&(connector_cfg)->possible_encoders, idx, (possible_encoder)) + /** * vkms_config_create() - Create a new VKMS configuration * @dev_name: Name of the device @@ -397,4 +410,20 @@ struct vkms_config_connector *vkms_config_create_conne= ctor(struct vkms_config *c */ void vkms_config_destroy_connector(struct vkms_config_connector *connector= _cfg); =20 +/** + * vkms_config_connector_attach_encoder - Attach a connector to an encoder + * @connector_cfg: Connector to attach + * @encoder_cfg: Encoder to attach @connector_cfg to + */ +int __must_check vkms_config_connector_attach_encoder(struct vkms_config_c= onnector *connector_cfg, + struct vkms_config_encoder *encoder_cfg); + +/** + * vkms_config_connector_detach_encoder - Detach a connector from an encod= er + * @connector_cfg: Connector to detach + * @encoder_cfg: Encoder to detach @connector_cfg from + */ +void vkms_config_connector_detach_encoder(struct vkms_config_connector *co= nnector_cfg, + struct vkms_config_encoder *encoder_cfg); + #endif /* _VKMS_CONFIG_H_ */ diff --git a/drivers/gpu/drm/vkms/vkms_output.c b/drivers/gpu/drm/vkms/vkms= _output.c index 8920d6b5d105..8d7ca0cdd79f 100644 --- a/drivers/gpu/drm/vkms/vkms_output.c +++ b/drivers/gpu/drm/vkms/vkms_output.c @@ -8,10 +8,10 @@ int vkms_output_init(struct vkms_device *vkmsdev) { struct drm_device *dev =3D &vkmsdev->drm; - struct vkms_connector *connector; struct vkms_config_plane *plane_cfg; struct vkms_config_crtc *crtc_cfg; struct vkms_config_encoder *encoder_cfg; + struct vkms_config_connector *connector_cfg; int ret; int writeback; =20 @@ -83,22 +83,29 @@ int vkms_output_init(struct vkms_device *vkmsdev) } } =20 - connector =3D vkms_connector_init(vkmsdev); - if (IS_ERR(connector)) { - DRM_ERROR("Failed to init connector\n"); - return PTR_ERR(connector); - } + vkms_config_for_each_connector(vkmsdev->config, connector_cfg) { + struct vkms_config_encoder *possible_encoder; + unsigned long idx =3D 0; =20 - /* Attach the encoder and the connector */ - vkms_config_for_each_encoder(vkmsdev->config, encoder_cfg) { - ret =3D drm_connector_attach_encoder(&connector->base, encoder_cfg->enco= der); - if (ret) { - DRM_ERROR("Failed to attach connector to encoder\n"); - return ret; + connector_cfg->connector =3D vkms_connector_init(vkmsdev); + if (IS_ERR(connector_cfg->connector)) { + DRM_ERROR("Failed to init connector\n"); + return PTR_ERR(connector_cfg->connector); + } + + vkms_config_connector_for_each_possible_encoder(connector_cfg, + idx, + possible_encoder) { + ret =3D drm_connector_attach_encoder(&connector_cfg->connector->base, + possible_encoder->encoder); + if (ret) { + DRM_ERROR("Failed to attach connector to encoder\n"); + return ret; + } } } =20 drm_mode_config_reset(dev); =20 - return ret; + return 0; } --=20 2.48.1