From nobody Sun Feb 8 16:32:01 2026 Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) (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 6A38519A2AE for ; Tue, 13 Aug 2024 10:51:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723546304; cv=none; b=m1O81GqXFYqrbLAkbLoXh7oZdP67O75UcZ8Of3+EaCLiYXoH804W86QJVQip50q6ELNqBJtPZ4yW8FQ2a2pUXgdZUBB4trCF7y7hSxQfky/VWzwBnN4O6QSU9AHLZRaAIT59QkUjW6WKa1A8Ffkx4aqJMNcA795+7T7JaPfgI5E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723546304; c=relaxed/simple; bh=h2aKLywDcxrx26bSDGNDkwfKp70bfyQsuzWfZ9E5phs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=hFRZer8N0XOYXkELl7LNTD7NaFQzDGJkXoqVp1xAC61smBkcSf0IKoiLA2B7bnteZ1llfSEI6KUn0YBGisDoMcp/kP5LmWwhk6HQbQ9up1yIkcsobBP3ul7DecMscA4o/FzW720FKwE7uQQtepin8oOMrXvX1jgJwG2YVecaNSY= 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=mTllW5BX; arc=none smtp.client-ip=209.85.128.41 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="mTllW5BX" Received: by mail-wm1-f41.google.com with SMTP id 5b1f17b1804b1-4280c55e488so31074825e9.0 for ; Tue, 13 Aug 2024 03:51:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1723546300; x=1724151100; 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=aX42+dlGnq5Uu/bZprAtS71gyG2lrM/6mSZ/7RZ5Qm0=; b=mTllW5BXcB3mTeSxkVBTv1529AafTOBR+m/geJ9LbPNaCDUrwmWE6zGZVNdbarH5C0 rwr2ZBbtg12OzknpaCnat0PTu+TN5PdXa0wXcKME5svrfgEM0a6bLUp3ZYKCa9lbkUMv Y4aTGXzXPzyLvt0k1Enwhdy/iFR7mAUjCgIEkAz9IB0bdfBCi58dOkU0NG1sKj/gNpww EKxQ+dJKszHcKpJPUabsdVc0wjdmEfWtcSVFWTHx25S35a2mrAIdfCAJCNPDorCKb4/i U1ZqJUn3S1EE78R3krHjwPvHBeCNnC6qq5E27YLGz2IVD6dVH3u9jl4yO9P+X/coGdKZ X6Ug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723546300; x=1724151100; 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=aX42+dlGnq5Uu/bZprAtS71gyG2lrM/6mSZ/7RZ5Qm0=; b=OXYR9DzyVE7rZDqtZfY6z9nvJnGiXJZy/1bWpj+iO+iXsozQ8G7XMmY9f6NUJ6Ty98 GB5x4HWlNKqm8EhDByptl86gxZ0cqhvTLLGD7PYte5e+jTSed9b907gla0gkCxgHYnwa qSUn5KI3Zhozg5bYSLx9UjVKX7UbZmW+f85CIz0313DlhYFGXRx6ghoB9WUd+4YnGeKJ wsT0/l4rHyc08UL5/4lQPkO0jpgu2XPiK5OkoCwifNOrVPUymwzvrEajHtNwHbm9jKQN zTbOLH5Cxzx9of2FRt6hys4nlOS3F/so2WO1J3sGTW35vTlSKPKBQSHg4vdo3NwSk1E5 2kjg== X-Forwarded-Encrypted: i=1; AJvYcCUaPFgvbkkTpAKjHtJM2E30ZH5aDVZBfxuvj5lEfFSk4xurTSR70prSL/gp0qxFsf5oXZy9ynwm9hn2TX3IFI7/zN1A+Hz4XscMaq1o X-Gm-Message-State: AOJu0YyB13yvz4okGS2WqICl/K9wPi2Gk68oib+X4fNVnrFqImLztgGQ 1yyk9Py+c5EH+b2pIPqKHIKS577EndfBvfNySr5YX8Bg5eNQSx7+ X-Google-Smtp-Source: AGHT+IFnztvBdTmZK2l5Gnaz08NvYB3FWKUb0WnOFAD4K52NsHAruw7MbK8ufdnmNtvFmrN1DFmdNw== X-Received: by 2002:a05:600c:1552:b0:427:ee01:ebf0 with SMTP id 5b1f17b1804b1-429d62b74c7mr20852325e9.8.1723546299553; Tue, 13 Aug 2024 03:51:39 -0700 (PDT) Received: from fedora.. ([213.94.26.172]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-429d877e066sm17290785e9.1.2024.08.13.03.51.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Aug 2024 03:51:39 -0700 (PDT) From: =?UTF-8?q?Jos=C3=A9=20Exp=C3=B3sito?= To: rodrigosiqueiramelo@gmail.com Cc: melissa.srw@gmail.com, mairacanal@riseup.net, hamohammed.sa@gmail.com, daniel@ffwll.ch, maarten.lankhorst@linux.intel.com, mripard@kernel.org, tzimmermann@suse.de, airlied@gmail.com, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, louis.chauvet@bootlin.com, =?UTF-8?q?Jos=C3=A9=20Exp=C3=B3sito?= Subject: [RFC PATCH 01/17] drm/vkms: Extract vkms_config header Date: Tue, 13 Aug 2024 12:44:12 +0200 Message-ID: <20240813105134.17439-2-jose.exposito89@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240813105134.17439-1-jose.exposito89@gmail.com> References: <20240813105134.17439-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 Creating a new vkms_config structure will be more complex once we start adding more options. Extract the vkms_config structure to its own header and source files and add functions to create and delete a vkms_config and to initialize debugfs. Refactor, no functional changes. Signed-off-by: Jos=C3=A9 Exp=C3=B3sito --- drivers/gpu/drm/vkms/Makefile | 3 +- drivers/gpu/drm/vkms/vkms_config.c | 48 ++++++++++++++++++++++++++++++ drivers/gpu/drm/vkms/vkms_config.h | 25 ++++++++++++++++ drivers/gpu/drm/vkms/vkms_drv.c | 34 +++++---------------- drivers/gpu/drm/vkms/vkms_drv.h | 10 +------ drivers/gpu/drm/vkms/vkms_output.c | 1 + 6 files changed, 84 insertions(+), 37 deletions(-) create mode 100644 drivers/gpu/drm/vkms/vkms_config.c create mode 100644 drivers/gpu/drm/vkms/vkms_config.h diff --git a/drivers/gpu/drm/vkms/Makefile b/drivers/gpu/drm/vkms/Makefile index 1b28a6a32948..b371b5d70ee3 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_config.o =20 obj-$(CONFIG_DRM_VKMS) +=3D vkms.o diff --git a/drivers/gpu/drm/vkms/vkms_config.c b/drivers/gpu/drm/vkms/vkms= _config.c new file mode 100644 index 000000000000..c58eda76c238 --- /dev/null +++ b/drivers/gpu/drm/vkms/vkms_config.c @@ -0,0 +1,48 @@ +// SPDX-License-Identifier: GPL-2.0+ + +#include + +#include +#include + +#include "vkms_config.h" +#include "vkms_drv.h" + +struct vkms_config *vkms_config_create(void) +{ + struct vkms_config *config; + + config =3D kzalloc(sizeof(*config), GFP_KERNEL); + if (!config) + return ERR_PTR(-ENOMEM); + + return config; +} + +void vkms_config_destroy(struct vkms_config *config) +{ + kfree(config); +} + +static int vkms_config_show(struct seq_file *m, void *data) +{ + 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); + + 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); + + return 0; +} + +static const struct drm_debugfs_info vkms_config_debugfs_list[] =3D { + { "vkms_config", vkms_config_show, 0 }, +}; + +void vkms_config_debugfs_init(struct vkms_device *vkms_device) +{ + drm_debugfs_add_files(&vkms_device->drm, vkms_config_debugfs_list, + ARRAY_SIZE(vkms_config_debugfs_list)); +} diff --git a/drivers/gpu/drm/vkms/vkms_config.h b/drivers/gpu/drm/vkms/vkms= _config.h new file mode 100644 index 000000000000..65da8cd6ff96 --- /dev/null +++ b/drivers/gpu/drm/vkms/vkms_config.h @@ -0,0 +1,25 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ + +#ifndef _VKMS_CONFIG_H_ +#define _VKMS_CONFIG_H_ + +#include + +struct vkms_device; + +struct vkms_config { + bool writeback; + bool cursor; + bool overlay; + /* only set when instantiated */ + struct vkms_device *dev; +}; + +/* VKMS Config */ +struct vkms_config *vkms_config_create(void); +void vkms_config_destroy(struct vkms_config *config); + +/* DebugFS */ +void vkms_config_debugfs_init(struct vkms_device *vkms_device); + +#endif /* _VKMS_CONFIG_H_ */ diff --git a/drivers/gpu/drm/vkms/vkms_drv.c b/drivers/gpu/drm/vkms/vkms_dr= v.c index 8dc9dc13896e..6bf462985731 100644 --- a/drivers/gpu/drm/vkms/vkms_drv.c +++ b/drivers/gpu/drm/vkms/vkms_drv.c @@ -26,11 +26,9 @@ #include #include =20 +#include "vkms_config.h" #include "vkms_drv.h" =20 -#include -#include - #define DRIVER_NAME "vkms" #define DRIVER_DESC "Virtual Kernel Mode Setting" #define DRIVER_DATE "20180514" @@ -90,23 +88,6 @@ static void vkms_atomic_commit_tail(struct drm_atomic_st= ate *old_state) drm_atomic_helper_cleanup_planes(dev, old_state); } =20 -static int vkms_config_show(struct seq_file *m, void *data) -{ - 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); - - 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); - - return 0; -} - -static const struct drm_debugfs_info vkms_config_debugfs_list[] =3D { - { "vkms_config", vkms_config_show, 0 }, -}; - static const struct drm_driver vkms_driver =3D { .driver_features =3D DRIVER_MODESET | DRIVER_ATOMIC | DRIVER_GEM, .release =3D vkms_release, @@ -216,8 +197,7 @@ static int vkms_create(struct vkms_config *config) if (ret) goto out_devres; =20 - drm_debugfs_add_files(&vkms_device->drm, vkms_config_debugfs_list, - ARRAY_SIZE(vkms_config_debugfs_list)); + vkms_config_debugfs_init(vkms_device); =20 ret =3D drm_dev_register(&vkms_device->drm, 0); if (ret) @@ -239,9 +219,9 @@ static int __init vkms_init(void) int ret; struct vkms_config *config; =20 - config =3D kmalloc(sizeof(*config), GFP_KERNEL); - if (!config) - return -ENOMEM; + config =3D vkms_config_create(); + if (IS_ERR(config)) + return PTR_ERR(config); =20 default_config =3D config; =20 @@ -251,7 +231,7 @@ static int __init vkms_init(void) =20 ret =3D vkms_create(config); if (ret) - kfree(config); + vkms_config_destroy(config); =20 return ret; } @@ -280,7 +260,7 @@ static void __exit vkms_exit(void) if (default_config->dev) vkms_destroy(default_config); =20 - kfree(default_config); + vkms_config_destroy(default_config); } =20 module_init(vkms_init); diff --git a/drivers/gpu/drm/vkms/vkms_drv.h b/drivers/gpu/drm/vkms/vkms_dr= v.h index 5e46ea5b96dc..5c523ca27f22 100644 --- a/drivers/gpu/drm/vkms/vkms_drv.h +++ b/drivers/gpu/drm/vkms/vkms_drv.h @@ -115,15 +115,7 @@ struct vkms_output { spinlock_t composer_lock; }; =20 -struct vkms_device; - -struct vkms_config { - bool writeback; - bool cursor; - bool overlay; - /* only set when instantiated */ - struct vkms_device *dev; -}; +struct vkms_config; =20 struct vkms_device { struct drm_device drm; diff --git a/drivers/gpu/drm/vkms/vkms_output.c b/drivers/gpu/drm/vkms/vkms= _output.c index 5ce70dd946aa..afe3945c1962 100644 --- a/drivers/gpu/drm/vkms/vkms_output.c +++ b/drivers/gpu/drm/vkms/vkms_output.c @@ -1,5 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ =20 +#include "vkms_config.h" #include "vkms_drv.h" #include #include --=20 2.46.0