From nobody Mon Feb 9 16:45:49 2026 Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.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 A03461B87CE for ; Wed, 29 Jan 2025 11:01:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738148473; cv=none; b=HNy6sSlE8tr2aua97BCmb6gChdMYocHjD0sMOBMpC/6/rAlWHU3nOVykWr1JpjgubHbd8CFgxmlPFdHLIjgpwZscgcW2C50DKOQ7+w9lo0F+uyNERKejuX4cvhHT45brtmRcbVA8bg7czlywOFxt9wU19jjWMVA6/G9W4b2D4mI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738148473; c=relaxed/simple; bh=HAk0pU6WHZBvScogqj5WoFQyT43pHDnPUqwdiCUpdXc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=SnwI7iz+iEntS1AeQobuGzvlJCvFN1m0Hmevv8QrxzBPh4omPu8MGxj9wcgbYNEvjaAl2rotnM3IvXkJfEEKbgp5GtsP6J8GP1yvBKuI5ENZqqjR8PzdlSh58ywPM036DvcclJ5kUwgFi3lB66uxuewG8gD1ZT57PxN9A3Vx1fQ= 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=RPQLOnUT; arc=none smtp.client-ip=209.85.221.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="RPQLOnUT" Received: by mail-wr1-f51.google.com with SMTP id ffacd0b85a97d-38a8b35e168so350193f8f.1 for ; Wed, 29 Jan 2025 03:01:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1738148470; x=1738753270; 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=FjL+ZAAo0YHDYt7gQTJ/b5ubGw71F7Pu1taWojvFhk4=; b=RPQLOnUTmAtDRJTgoqM0Qa3GoWjlm9aBSJCWduDxL3mDJFp8GxjClNPqoxi7QMNSXb Ba56W86wN1EMdjw/ZBYQ0ICAWdiQPL7UI9GO9j/xQbaGNaOgsewApwDCOtymBuBjngJr 7ZTuhA/5v/F+sTvfcZjTukKMhHR8tDAY2dlXdy0m/Ew0oSCZdRiuFztD32dE5/WLDGon QGg9zM7cnbWPsdeEIWVNdpyvCJJc/x2zulYi31tAsfrT+pez1TiN5UEcQY5F62gkDLsS XWJEdy4tBj6t+hdIoW/XtNby6omkr85Osoa1HZ+ezO0McDhFTh+FWMN8RaZC/mEWqA64 NbRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738148470; x=1738753270; 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=FjL+ZAAo0YHDYt7gQTJ/b5ubGw71F7Pu1taWojvFhk4=; b=GXDmfVwdYOdugyhTMRsZAvVd+ojxceyJWtS98XcFihVrqGMkSfOTUuQX8zsCkhQw+w D7xj8J6cq2l69J40gpDOtF39o9GgNIlc8lCV4W0i1FJFF1ful2pAFC/4Z0oOQRdBYaVS xQdOqBAwaqbtXUP62SDMjCY3CPBnsUS4VO/S2PQgt7lPeKhZHNCKjb0bnbYY1U3yENOV cQvRQoRABkzKiLF2DM6WM/iuP5J0L49vIthsHWWiTjrJLS/JRHSOsKEid7RnIIUcxxov XnRN29wRu0FfvcY0EcTWg+EY/I3ZorwS2i0rRrtiQ8zoeLIoGNZXdhmE395gbTexNsA+ f93g== X-Forwarded-Encrypted: i=1; AJvYcCUsZg/GVpfTksancmnmmwdnBWfGVAnNzbTjAdR5Qgv6hvjof0jrzeEzyUpINyW4K2vEuQ9UtfKuaZsKkBo=@vger.kernel.org X-Gm-Message-State: AOJu0YxfYF/Z50h9tvqU3moAsw/Puf5R6q2kxgTwalXQdmYqmqocXa02 RVhTSlKPYFTljAcUHXO1KIQ5BhE2+lGDUbMVupIJDGXWP4B5nD39 X-Gm-Gg: ASbGncuUJuXUnG95dtf9KRixP0WJHgbKrmwSqPbW5tUaQPbGqycxeSy54eWYwBbR2e5 pwrrYK7ey0pwmyMXIwKvS0Xkvj8jtJQVLrFtBV69V8UrGCstY6korxLOpKjvYyWLCNJtZEea76L Lanm3PXFtwo9bSG5BZ7a5w2atIogmfxoaEmQoyiBwDdLMV+nsGOWQYZK6zeEO3/JxRjeTu0aQyh 6kPjrHlwJlRYXKQ4VdZEJwb2E+Rr9fOdkWuVUNZXela8o0QGhnJ0+lETwKMKWlsR8mT/l0ez7HU lj+v6WMFJxhxTmg8 X-Google-Smtp-Source: AGHT+IGM65LZ6HAHnzroF2O3ycdsns+/7UUPzidfbU/yRI5s3eUChQJUUJRV3aYPtOLqqIewACxIzg== X-Received: by 2002:a05:6000:4011:b0:38b:ee9f:52d5 with SMTP id ffacd0b85a97d-38c50ff1713mr2361965f8f.16.1738148469669; Wed, 29 Jan 2025 03:01:09 -0800 (PST) Received: from fedora.. ([94.73.37.161]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38c2a176434sm16947113f8f.13.2025.01.29.03.01.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Jan 2025 03:01:09 -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 04/13] drm/vkms: Move default_config creation to its own function Date: Wed, 29 Jan 2025 12:00:50 +0100 Message-ID: <20250129110059.12199-5-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 Extract the initialization of the default configuration to a function. Refactor, no functional changes. Signed-off-by: Louis Chauvet Signed-off-by: Jos=C3=A9 Exp=C3=B3sito Reviewed-by: Louis Chauvet --- drivers/gpu/drm/vkms/tests/vkms_config_test.c | 38 +++++++++++++++++++ drivers/gpu/drm/vkms/vkms_config.c | 17 +++++++++ drivers/gpu/drm/vkms/vkms_config.h | 14 +++++++ drivers/gpu/drm/vkms/vkms_drv.c | 6 +-- 4 files changed, 70 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/vkms/tests/vkms_config_test.c b/drivers/gpu/dr= m/vkms/tests/vkms_config_test.c index a7060504f3dc..d8644a1e3e18 100644 --- a/drivers/gpu/drm/vkms/tests/vkms_config_test.c +++ b/drivers/gpu/drm/vkms/tests/vkms_config_test.c @@ -6,6 +6,12 @@ =20 MODULE_IMPORT_NS("EXPORTED_FOR_KUNIT_TESTING"); =20 +struct default_config_case { + bool enable_cursor; + bool enable_writeback; + bool enable_overlay; +}; + static void vkms_config_test_empty_config(struct kunit *test) { struct vkms_config *config; @@ -16,8 +22,40 @@ static void vkms_config_test_empty_config(struct kunit *= test) vkms_config_destroy(config); } =20 +static struct default_config_case default_config_cases[] =3D { + { false, false, false }, + { true, false, false }, + { true, true, false }, + { true, false, true }, + { false, true, false }, + { false, true, true }, + { false, false, true }, + { true, true, true }, +}; + +KUNIT_ARRAY_PARAM(default_config, default_config_cases, NULL); + +static void vkms_config_test_default_config(struct kunit *test) +{ + const struct default_config_case *params =3D test->param_value; + struct vkms_config *config; + + config =3D vkms_config_default_create(params->enable_cursor, + params->enable_writeback, + params->enable_overlay); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, config); + + KUNIT_EXPECT_EQ(test, config->cursor, params->enable_cursor); + KUNIT_EXPECT_EQ(test, config->writeback, params->enable_writeback); + KUNIT_EXPECT_EQ(test, config->overlay, params->enable_overlay); + + 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, + default_config_gen_params), {} }; =20 diff --git a/drivers/gpu/drm/vkms/vkms_config.c b/drivers/gpu/drm/vkms/vkms= _config.c index 152b2ecd6aef..30ce4b23553f 100644 --- a/drivers/gpu/drm/vkms/vkms_config.c +++ b/drivers/gpu/drm/vkms/vkms_config.c @@ -18,6 +18,23 @@ struct vkms_config *vkms_config_create(void) return config; } =20 +struct vkms_config *vkms_config_default_create(bool enable_cursor, + bool enable_writeback, + bool enable_overlay) +{ + struct vkms_config *config; + + config =3D vkms_config_create(); + if (IS_ERR(config)) + return config; + + config->cursor =3D enable_cursor; + config->writeback =3D enable_writeback; + config->overlay =3D enable_overlay; + + return config; +} + void vkms_config_destroy(struct vkms_config *config) { kfree(config); diff --git a/drivers/gpu/drm/vkms/vkms_config.h b/drivers/gpu/drm/vkms/vkms= _config.h index ced10f56a812..d0868750826a 100644 --- a/drivers/gpu/drm/vkms/vkms_config.h +++ b/drivers/gpu/drm/vkms/vkms_config.h @@ -31,6 +31,20 @@ struct vkms_config { */ struct vkms_config *vkms_config_create(void); =20 +/** + * vkms_config_default_create() - Create the configuration for the default= device + * @enable_cursor: Create or not a cursor plane + * @enable_writeback: Create or not a writeback connector + * @enable_overlay: Create or not overlay planes + * + * Returns: + * The default vkms_config or an error. Call vkms_config_destroy() to free= the + * returned configuration. + */ +struct vkms_config *vkms_config_default_create(bool enable_cursor, + bool enable_writeback, + bool enable_overlay); + /** * vkms_config_destroy() - Free a VKMS configuration * @config: vkms_config to free diff --git a/drivers/gpu/drm/vkms/vkms_drv.c b/drivers/gpu/drm/vkms/vkms_dr= v.c index b19f76f902b3..700cf43389b7 100644 --- a/drivers/gpu/drm/vkms/vkms_drv.c +++ b/drivers/gpu/drm/vkms/vkms_drv.c @@ -211,16 +211,12 @@ static int __init vkms_init(void) int ret; struct vkms_config *config; =20 - config =3D vkms_config_create(); + config =3D vkms_config_default_create(enable_cursor, enable_writeback, en= able_overlay); if (IS_ERR(config)) return PTR_ERR(config); =20 default_config =3D config; =20 - config->cursor =3D enable_cursor; - config->writeback =3D enable_writeback; - config->overlay =3D enable_overlay; - ret =3D vkms_create(config); if (ret) vkms_config_destroy(config); --=20 2.48.1