From nobody Mon Feb 9 19:26:32 2026 Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) (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 1582C1BEF87 for ; Wed, 29 Jan 2025 11:01:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738148475; cv=none; b=gOAUeYShRl5FE77m6sKn9LcgLS6nImL71PeJznx+J18tgO8bUPa6XzjXaTe6os/au32w0OWCjjLcZqHZmBAfEMQ6vq067bTJzNT4E8ic063JjeNhD/R3ZDNq/CXWYfgchem/eBPmuHQNzrFvfLNayGSeKGuaGCOxO7gL/cMXrnQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738148475; c=relaxed/simple; bh=YIwpSyiUXb+Mxx78WqhM3Du/1Ol6vEVO/mtkWJkhoME=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=m6LN/LDtZOC5KltbcykOO/1X4Co/SEcy1iRpxRfD7z4qfNVANrIpbO2unyAHkIlpcm7rCzUE7oRC89cjDWVNyFPdSbaIVn4U4LgxO3Ygy6HWfghi9/lMK48M3CHInOR7YNH/QJ2GK2I5teJRUd+TkBIuEz+F5cpOLfhxXHgvUsU= 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=Gk3hCU36; arc=none smtp.client-ip=209.85.221.42 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="Gk3hCU36" Received: by mail-wr1-f42.google.com with SMTP id ffacd0b85a97d-38632b8ae71so5228827f8f.0 for ; Wed, 29 Jan 2025 03:01:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1738148471; x=1738753271; 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=3Jdlaybe4dLW4Pxw5Cu5C4SOJCAFhex6WH7zjUJEIng=; b=Gk3hCU36TWeDq4s3aenFO+Tf2VH3zfdT7xMSLmDT2e5F0JPuXLZKlvcECuSB0pAFFF 52praSMMv80yyqDZPc32HQlbldioUqfbnxK7urLEYzVm2NOEIxfCmzuEuL84Qcoxf+Z3 dBfQgZiQQWnFELGZKsJkKlR5bCk02lv4UOJfkDe/IBGlCbGcdOAmH2fdwj/HKo5efwqp TNVHAaFBRdhNbeDKW4Cc35qA6dUx4ZTWkwKCr1HRB4mfVjFfxg49HZ//ckCmU31WNDC7 uGt4BJPydWXTrH9XDqocM+l+qAr3COsq4x1OD9mMtvyFyVNDkIxbMjrgEvDqBmkWUzcz Nwlg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738148471; x=1738753271; 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=3Jdlaybe4dLW4Pxw5Cu5C4SOJCAFhex6WH7zjUJEIng=; b=p8etwyrWWlQpC8gfxTeAknKBpxKuP4ISFiZlI6gDyUlFq+wzZLdEknG+3gfqYpAzxI JzJx35ACpeiq9apxupFdo/gmkvCQ+vFSr1Ma8cO5Jqsl4JK7bwsnoHFYk+tXsZLeMV9O dU4wyz4Y/ofxreL63DdK41AubQJ9cS01SMNe7Yq+8n/tHueIFYpnNHr5kfgj3Cc+c5+Q k6BUYgoXeTREgl91bLv6bWa6vJg1ABswU9dTekrKis9d4xwib+zZalkXQF4cWZc/BFQl HeCfxD8EApk54NiU01pT9PI3bhNriQZSkOsbPiSGHxOTW/UtCDZ4tul8KWd50i1INwDK Ruow== X-Forwarded-Encrypted: i=1; AJvYcCW9AB4R90HzFtsWnT1SOdo6YGyjmRGcTut4WzTOJopoxXYWbMqAxmntAvHKhyxaXffo8gqBCyzf+juAZ34=@vger.kernel.org X-Gm-Message-State: AOJu0Ywozpc6GVne4+fDneLwyKDk6mj6Tbu2hCxgpZvBkNCrrvraxaqH 0FeIBMgb4mdkaIp+v21yEzSAjjQ28OHyQSazhBKSELqw0IX7hvUf X-Gm-Gg: ASbGncsNfUnrizhgo/myaxwrLRCG+SB8cIeBWNJ1aIOaLyNOW/3M8WfGi1F6RnXP+E6 DUrOWladSVck9xQHdnY5z1KDJ2dWm4UB105EJUq+ZcwmZM3SX7p1cmiLgxlK8Pu8ZTPbSjMOf0W S89tnAHSzeRd6F3PeFOY1wRh2nn0GZtuUlL8joocexz3KeybUWr2WVBEDlD3Yb8muklqJHAdlUv ENfpcbs6zvPEfx8yOOvtswNVCkZKHdpRVRsuPXEc4pNJh9u4H1l7Xpp8v0XhotRL7MhQ86jqbv0 0a3OboLEaO4NT/67+nsVrO+fKRo= X-Google-Smtp-Source: AGHT+IF8ZlTcVpl9sITm6XddqK7H71VOTly30mhKNuiqqkEfAUFNz4gd4TU2PHgDJf555zpXIlbBUQ== X-Received: by 2002:a05:6000:194b:b0:38a:418e:1171 with SMTP id ffacd0b85a97d-38c52097117mr1431760f8f.37.1738148470894; Wed, 29 Jan 2025 03:01:10 -0800 (PST) Received: from fedora.. ([94.73.37.161]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38c2a176434sm16947113f8f.13.2025.01.29.03.01.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Jan 2025 03:01:10 -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 05/13] drm/vkms: Set device name from vkms_config Date: Wed, 29 Jan 2025 12:00:51 +0100 Message-ID: <20250129110059.12199-6-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 In order to be able to create multiple devices, the device name needs to be unique. Allow to set it in the VKMS configuration. Signed-off-by: Jos=C3=A9 Exp=C3=B3sito Reviewed-by: Louis Chauvet --- drivers/gpu/drm/vkms/tests/vkms_config_test.c | 7 ++++++- drivers/gpu/drm/vkms/vkms_config.c | 14 ++++++++++++-- drivers/gpu/drm/vkms/vkms_config.h | 15 ++++++++++++++- drivers/gpu/drm/vkms/vkms_drv.c | 4 +++- drivers/gpu/drm/vkms/vkms_drv.h | 2 ++ 5 files changed, 37 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 d8644a1e3e18..526800b1afb4 100644 --- a/drivers/gpu/drm/vkms/tests/vkms_config_test.c +++ b/drivers/gpu/drm/vkms/tests/vkms_config_test.c @@ -15,10 +15,15 @@ struct default_config_case { static void vkms_config_test_empty_config(struct kunit *test) { struct vkms_config *config; + const char *dev_name =3D "test"; =20 - config =3D vkms_config_create(); + config =3D vkms_config_create(dev_name); KUNIT_ASSERT_NOT_ERR_OR_NULL(test, config); =20 + /* The dev_name string and the config have different live times */ + dev_name =3D NULL; + KUNIT_EXPECT_STREQ(test, vkms_config_get_device_name(config), "test"); + vkms_config_destroy(config); } =20 diff --git a/drivers/gpu/drm/vkms/vkms_config.c b/drivers/gpu/drm/vkms/vkms= _config.c index 30ce4b23553f..11b0e539920b 100644 --- a/drivers/gpu/drm/vkms/vkms_config.c +++ b/drivers/gpu/drm/vkms/vkms_config.c @@ -7,7 +7,7 @@ =20 #include "vkms_config.h" =20 -struct vkms_config *vkms_config_create(void) +struct vkms_config *vkms_config_create(const char *dev_name) { struct vkms_config *config; =20 @@ -15,6 +15,12 @@ struct vkms_config *vkms_config_create(void) if (!config) return ERR_PTR(-ENOMEM); =20 + config->dev_name =3D kstrdup_const(dev_name, GFP_KERNEL); + if (!config->dev_name) { + kfree(config); + return ERR_PTR(-ENOMEM); + } + return config; } =20 @@ -24,7 +30,7 @@ struct vkms_config *vkms_config_default_create(bool enabl= e_cursor, { struct vkms_config *config; =20 - config =3D vkms_config_create(); + config =3D vkms_config_create(DEFAULT_DEVICE_NAME); if (IS_ERR(config)) return config; =20 @@ -37,6 +43,7 @@ struct vkms_config *vkms_config_default_create(bool enabl= e_cursor, =20 void vkms_config_destroy(struct vkms_config *config) { + kfree_const(config->dev_name); kfree(config); } =20 @@ -45,7 +52,10 @@ static int vkms_config_show(struct seq_file *m, void *da= ta) struct drm_debugfs_entry *entry =3D m->private; struct drm_device *dev =3D entry->dev; struct vkms_device *vkmsdev =3D drm_device_to_vkms_device(dev); + const char *dev_name; =20 + dev_name =3D vkms_config_get_device_name((struct vkms_config *)vkmsdev->c= onfig); + seq_printf(m, "dev_name=3D%s\n", dev_name); seq_printf(m, "writeback=3D%d\n", vkmsdev->config->writeback); seq_printf(m, "cursor=3D%d\n", vkmsdev->config->cursor); seq_printf(m, "overlay=3D%d\n", vkmsdev->config->overlay); diff --git a/drivers/gpu/drm/vkms/vkms_config.h b/drivers/gpu/drm/vkms/vkms= _config.h index d0868750826a..3e4f39cbe2e2 100644 --- a/drivers/gpu/drm/vkms/vkms_config.h +++ b/drivers/gpu/drm/vkms/vkms_config.h @@ -10,12 +10,14 @@ /** * struct vkms_config - General configuration for VKMS driver * + * @dev_name: Name of the device * @writeback: If true, a writeback buffer can be attached to the CRTC * @cursor: If true, a cursor plane is created in the VKMS device * @overlay: If true, NUM_OVERLAY_PLANES will be created for the VKMS devi= ce * @dev: Used to store the current VKMS device. Only set when the device i= s instantiated. */ struct vkms_config { + const char *dev_name; bool writeback; bool cursor; bool overlay; @@ -24,12 +26,13 @@ struct vkms_config { =20 /** * vkms_config_create() - Create a new VKMS configuration + * @dev_name: Name of the device * * Returns: * The new vkms_config or an error. Call vkms_config_destroy() to free the * returned configuration. */ -struct vkms_config *vkms_config_create(void); +struct vkms_config *vkms_config_create(const char *dev_name); =20 /** * vkms_config_default_create() - Create the configuration for the default= device @@ -51,6 +54,16 @@ struct vkms_config *vkms_config_default_create(bool enab= le_cursor, */ void vkms_config_destroy(struct vkms_config *config); =20 +/** + * vkms_config_get_device_name() - Return the name of the device + * @config: Configuration to get the device name from + */ +static inline const char * +vkms_config_get_device_name(struct vkms_config *config) +{ + return config->dev_name; +} + /** * vkms_config_register_debugfs() - Register a debugfs file to show the de= vice's * configuration diff --git a/drivers/gpu/drm/vkms/vkms_drv.c b/drivers/gpu/drm/vkms/vkms_dr= v.c index 700cf43389b7..f23ee1a053e9 100644 --- a/drivers/gpu/drm/vkms/vkms_drv.c +++ b/drivers/gpu/drm/vkms/vkms_drv.c @@ -151,8 +151,10 @@ static int vkms_create(struct vkms_config *config) int ret; struct platform_device *pdev; struct vkms_device *vkms_device; + const char *dev_name; =20 - pdev =3D platform_device_register_simple(DRIVER_NAME, -1, NULL, 0); + dev_name =3D vkms_config_get_device_name(config); + pdev =3D platform_device_register_simple(dev_name, -1, NULL, 0); if (IS_ERR(pdev)) return PTR_ERR(pdev); =20 diff --git a/drivers/gpu/drm/vkms/vkms_drv.h b/drivers/gpu/drm/vkms/vkms_dr= v.h index af7081c940d6..a74a7fc3a056 100644 --- a/drivers/gpu/drm/vkms/vkms_drv.h +++ b/drivers/gpu/drm/vkms/vkms_drv.h @@ -12,6 +12,8 @@ #include #include =20 +#define DEFAULT_DEVICE_NAME "vkms" + #define XRES_MIN 10 #define YRES_MIN 10 =20 --=20 2.48.1