drm/vc4: Add a debugfs entry to disable/enable the load tracker
Subsystems (3)
PATCH 1/1 drm/vc4: Add a debugfs entry to disable/enable the load tracker
In order to test whether the load tracker is working as expected, we need the ability to compare the commit result with the underrun indication. With the load tracker always enabled, commits that are expected to trigger an underrun are always rejected, so userspace cannot get the actual underrun indication from the hardware.
Add a debugfs entry to disable/enable the load tracker, so that a DRM commit expected to trigger an underrun can go through with the load tracker disabled. The underrun indication is then available to userspace and can be checked against the commit result with the load tracker enabled.
---
This patch is based on Boris Brezillion's series: drm/vc4: Add a load tracker.
drivers/gpu/drm/vc4/vc4_debugfs.c | 8 +++++ drivers/gpu/drm/vc4/vc4_drv.c | 52 +++++++++++++++++++++++++++++++ drivers/gpu/drm/vc4/vc4_drv.h | 3 ++ drivers/gpu/drm/vc4/vc4_kms.c | 6 +++- 4 files changed, 68 insertions(+), 1 deletion(-)
drivers/gpu/drm/vc4/vc4_debugfs.c +8 -0
@@ -35,6 +35,14 @@ static const struct drm_info_list vc4_debugfs_list[] = {int vc4_debugfs_init (struct drm_minor *minor) { +struct dentry *dentry; + + dentry =debugfs_create_file ("load_tracker" ,S_IRUGO |S_IWUSR , + minor->debugfs_root, minor->dev, + &vc4_debugfs_load_tracker_fops); +if (!dentry) +return -ENOMEM ; +return drm_debugfs_create_files (vc4_debugfs_list,VC4_DEBUGFS_ENTRIES , minor->debugfs_root, minor); }
drivers/gpu/drm/vc4/vc4_drv.c +52 -0
64 lines not on this page · raw message
drivers/gpu/drm/vc4/vc4_drv.h +3 -0
@@ -188,6 +188,8 @@ struct vc4_dev {int power_refcount; +bool load_tracker_enabled; +/* Mutex controlling the power refcount. */ struct mutex power_lock;
@@ -717,6 +719,7 @@ void vc4_crtc_txp_armed(struct drm_crtc_state *state);int vc4_debugfs_init (struct drm_minor *minor);/* vc4_drv.c */ +extern const struct file_operations vc4_debugfs_load_tracker_fops;void __iomem *vc4_ioremap_regs (struct platform_device *dev,int index);/* vc4_dpi.c */
drivers/gpu/drm/vc4/vc4_kms.c +5 -1
@@ -473,6 +473,7 @@ static const struct drm_private_state_funcs vc4_load_tracker_state_funcs = {static int vc4_atomic_check (struct drm_device *dev,struct drm_atomic_state *state) { +struct vc4_dev *vc4 =to_vc4_dev (dev);int ret; ret =vc4_ctm_atomic_check (dev, state);
@@ -483,7 +484,10 @@ vc4_atomic_check(struct drm_device *dev, struct drm_atomic_state *state)if (ret)return ret; -return vc4_load_tracker_atomic_check (state); +if (vc4->load_tracker_enabled) +return vc4_load_tracker_atomic_check (state); + +return 0 ; }static const struct drm_mode_config_funcs vc4_mode_funcs = {
Signature · 6 lines
2.19.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Hi Paul,
Quoted 48 lines · On Fri, 30 Nov 2018 10:56:58 +0100 Paul Kocialkowski…
drivers/gpu/drm/vc4/vc4_drv.c +40
-0@@ -46,6 +46,56 @@#define DRIVER_MINOR 0#define DRIVER_PATCHLEVEL 0 +static int vc4_debugfs_load_tracker_get (struct seq_file *m,void *data) +{ +struct drm_device *dev = m->private; +struct vc4_dev *vc4 =to_vc4_dev (dev); + +if (vc4->load_tracker_enabled) +seq_printf (m,"enabled\n" ); +else +seq_printf (m,"disabled\n" ); + +return 0 ; +} + +static ssize_t vc4_debugfs_load_tracker_set (struct file *file, +const char __user *ubuf, +size_t len,loff_t *offp) +{ +struct seq_file *m = file->private_data; +struct drm_device *dev = m->private; +struct vc4_dev *vc4 =to_vc4_dev (dev); +char buf[32 ] = {}; + +if (len >=sizeof (buf)) +return -EINVAL ; + +if (copy_from_user (buf, ubuf, len)) +return -EFAULT ; + +if (!strncasecmp (buf,"enable" ,6 )) + vc4->load_tracker_enabled = true; +else if (!strncasecmp (buf,"disable" ,7 )) + vc4->load_tracker_enabled = false; +else +return -EINVAL ; + +return len; +} + +static int vc4_debugfs_load_tracker_open (struct inode *inode,struct file *file) +{
drivers/gpu/drm/vc4/vc4_drv.c line 98
Quoted 10 lines
drivers/gpu/drm/vc4/vc4_drv.c +10
-0+return single_open (file, vc4_debugfs_load_tracker_get, inode->i_private); +} + +const struct file_operations vc4_debugfs_load_tracker_fops = { + .owner =THIS_MODULE , + .open = vc4_debugfs_load_tracker_open, + .read = seq_read, + .write = vc4_debugfs_load_tracker_set, +}; +
I'd put this code directly in vc4_debugfs.c so you can make vc4_debugfs_load_tracker_fops static and you don't need the extern ... definition in vc4_drv.h. But maybe you have a good reason to do that.
Regards,
Boris
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Hi,
Quoted 59 lines · Boris Brezillon
Hi Paul,
Quoted 54 lines · On Fri, 30 Nov 2018 10:56:58 +0100 Paul Kocialkowski…
drivers/gpu/drm/vc4/vc4_drv.c +46
-0@@ -46,6 +46,56 @@#define DRIVER_MINOR 0#define DRIVER_PATCHLEVEL 0 +static int vc4_debugfs_load_tracker_get (struct seq_file *m,void *data) +{ +struct drm_device *dev = m->private; +struct vc4_dev *vc4 =to_vc4_dev (dev); + +if (vc4->load_tracker_enabled) +seq_printf (m,"enabled\n" ); +else +seq_printf (m,"disabled\n" ); + +return 0 ; +} + +static ssize_t vc4_debugfs_load_tracker_set (struct file *file, +const char __user *ubuf, +size_t len,loff_t *offp) +{ +struct seq_file *m = file->private_data; +struct drm_device *dev = m->private; +struct vc4_dev *vc4 =to_vc4_dev (dev); +char buf[32 ] = {}; + +if (len >=sizeof (buf)) +return -EINVAL ; + +if (copy_from_user (buf, ubuf, len)) +return -EFAULT ; + +if (!strncasecmp (buf,"enable" ,6 )) + vc4->load_tracker_enabled = true; +else if (!strncasecmp (buf,"disable" ,7 )) + vc4->load_tracker_enabled = false; +else +return -EINVAL ; + +return len; +} + +static int vc4_debugfs_load_tracker_open (struct inode *inode,struct file *file) +{ +return single_open (file, vc4_debugfs_load_tracker_get, inode->i_private); +} + +const struct file_operations vc4_debugfs_load_tracker_fops = { + .owner =THIS_MODULE , + .open = vc4_debugfs_load_tracker_open,
Quoted 8 lines
drivers/gpu/drm/vc4/vc4_drv.c line 98
Quoted 4 lines
drivers/gpu/drm/vc4/vc4_drv.c +4
-0+ .read = seq_read, + .write = vc4_debugfs_load_tracker_set, +}; +I'd put this code directly in
vc4_debugfs.cso you can makevc4_debugfs_load_tracker_fopsstatic and you don't need the extern ... definition invc4_drv.h. But maybe you have a good reason to do that.
You're right, it would be better that way. There is indeed no particular constraint for having this in vc4_drv.
Cheers,
Paul
Signature · 3 lines
Paul Kocialkowski, Bootlin (formerly Free Electrons) Embedded Linux and kernel engineering https://bootlin.com