From: Hans Verkuil <hverkuil@xs4all.nl>
To: Corentin Labbe <clabbe@baylibre.com>,
gregkh@linuxfoundation.org, mchehab@kernel.org
Cc: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org,
linux-staging@lists.linux.dev, mjpeg-users@lists.sourceforge.net
Subject: Re: [PATCH 4/8] staging: media: zoran: add debugfs
Date: Mon, 6 Sep 2021 12:20:43 +0200 [thread overview]
Message-ID: <e6b6affa-278a-5ef8-1cb1-b111a0756ea8@xs4all.nl> (raw)
In-Reply-To: <20210903191540.3052775-5-clabbe@baylibre.com>
On 03/09/2021 21:15, Corentin Labbe wrote:
> Add debugfs for displaying zoran debug and stats information.
>
> Signed-off-by: Corentin Labbe <clabbe@baylibre.com>
> ---
> drivers/staging/media/zoran/Kconfig | 10 ++++++
> drivers/staging/media/zoran/zoran.h | 5 +++
> drivers/staging/media/zoran/zoran_card.c | 39 ++++++++++++++++++++++++
> 3 files changed, 54 insertions(+)
>
> diff --git a/drivers/staging/media/zoran/Kconfig b/drivers/staging/media/zoran/Kconfig
> index 7874842033ca..7d2d3c2431b1 100644
> --- a/drivers/staging/media/zoran/Kconfig
> +++ b/drivers/staging/media/zoran/Kconfig
> @@ -74,3 +74,13 @@ config VIDEO_ZORAN_AVS6EYES
> select VIDEO_KS0127 if MEDIA_SUBDRV_AUTOSELECT
> help
> Support for the AverMedia 6 Eyes video surveillance card.
> +
> +config VIDEO_ZORAN_DEBUG
> + bool "Enable zoran debugfs"
> + depends on VIDEO_ZORAN
> + depends on DEBUG_FS
> + help
> + Say y to enable zoran debug file.
> + This will create /sys/kernel/debug/CARD_NAME/debug for displaying
> + stats and debug information.
> +
> diff --git a/drivers/staging/media/zoran/zoran.h b/drivers/staging/media/zoran/zoran.h
> index b1ad2a2b914c..8c271005f14d 100644
> --- a/drivers/staging/media/zoran/zoran.h
> +++ b/drivers/staging/media/zoran/zoran.h
> @@ -18,6 +18,7 @@
> #ifndef _BUZ_H_
> #define _BUZ_H_
>
> +#include <linux/debugfs.h>
> #include <media/v4l2-device.h>
> #include <media/v4l2-ctrls.h>
> #include <media/videobuf2-core.h>
> @@ -295,6 +296,10 @@ struct zoran {
> struct list_head queued_bufs;
> spinlock_t queued_bufs_lock; /* Protects queued_bufs */
> struct zr_buffer *inuse[BUZ_NUM_STAT_COM * 2];
> +#ifdef CONFIG_VIDEO_ZORAN_DEBUG
> + struct dentry *dbgfs_dir;
> + struct dentry *dbgfs_file;
> +#endif
> };
>
> static inline struct zoran *to_zoran(struct v4l2_device *v4l2_dev)
> diff --git a/drivers/staging/media/zoran/zoran_card.c b/drivers/staging/media/zoran/zoran_card.c
> index f1465fbf98af..1ed8ed2f4f7f 100644
> --- a/drivers/staging/media/zoran/zoran_card.c
> +++ b/drivers/staging/media/zoran/zoran_card.c
> @@ -1051,6 +1051,39 @@ static const struct v4l2_ctrl_ops zoran_video_ctrl_ops = {
> .s_ctrl = zoran_video_set_ctrl,
> };
>
> +#ifdef CONFIG_VIDEO_ZORAN_DEBUG
> +static int zoran_debugfs_show(struct seq_file *seq, void *v)
> +{
> + struct zoran *zr = seq->private;
> +
> + seq_printf(seq, "Running mode %x\n", zr->running);
> + seq_printf(seq, "Codec mode %x\n", zr->codec_mode);
> + seq_printf(seq, "Norm %x\n", zr->norm);
This should be %llx, otherwise you get a compile warning.
Regards,
Hans
> + seq_printf(seq, "Input %d\n", zr->input);
> + seq_printf(seq, "Buffersize %d\n", zr->buffer_size);
> +
> + seq_printf(seq, "V4L width %dx%d\n", zr->v4l_settings.width, zr->v4l_settings.height);
> + seq_printf(seq, "V4L bytesperline %d\n", zr->v4l_settings.bytesperline);
> +
> + seq_printf(seq, "JPG decimation %u\n", zr->jpg_settings.decimation);
> + seq_printf(seq, "JPG hor_dcm %u\n", zr->jpg_settings.hor_dcm);
> + seq_printf(seq, "JPG ver_dcm %u\n", zr->jpg_settings.ver_dcm);
> + seq_printf(seq, "JPG tmp_dcm %u\n", zr->jpg_settings.tmp_dcm);
> + seq_printf(seq, "JPG odd_even %u\n", zr->jpg_settings.odd_even);
> + seq_printf(seq, "JPG crop %dx%d %d %d\n",
> + zr->jpg_settings.img_x,
> + zr->jpg_settings.img_y,
> + zr->jpg_settings.img_width,
> + zr->jpg_settings.img_height);
> +
> + seq_printf(seq, "Prepared %u\n", zr->prepared);
> + seq_printf(seq, "Queued %u\n", zr->queued);
> + return 0;
> +}
> +
> +DEFINE_SHOW_ATTRIBUTE(zoran_debugfs);
> +#endif
> +
> /*
> * Scan for a Buz card (actually for the PCI controller ZR36057),
> * request the irq and map the io memory
> @@ -1286,6 +1319,12 @@ static int zoran_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
>
> zr->map_mode = ZORAN_MAP_MODE_RAW;
>
> +#ifdef CONFIG_VIDEO_ZORAN_DEBUG
> + zr->dbgfs_dir = debugfs_create_dir(ZR_DEVNAME(zr), NULL);
> + zr->dbgfs_file = debugfs_create_file("debug", 0444,
> + zr->dbgfs_dir, zr,
> + &zoran_debugfs_fops);
> +#endif
> return 0;
>
> zr_detach_vfe:
>
next prev parent reply other threads:[~2021-09-06 10:21 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-03 19:15 [PATCH 0/8] staging: media: zoran: fusion in one module Corentin Labbe
2021-09-03 19:15 ` [PATCH 1/8] staging: media: zoran: move module parameter checks to zoran_probe Corentin Labbe
2021-09-03 19:15 ` [PATCH 2/8] staging: media: zoran: use module_pci_driver Corentin Labbe
2021-09-03 19:15 ` [PATCH 3/8] staging: media: zoran: rename debug module parameter Corentin Labbe
2021-09-03 19:15 ` [PATCH 4/8] staging: media: zoran: add debugfs Corentin Labbe
2021-09-03 23:28 ` kernel test robot
2021-09-04 5:53 ` Greg KH
2021-09-06 13:36 ` LABBE Corentin
2021-09-04 6:42 ` kernel test robot
2021-09-06 10:20 ` Hans Verkuil [this message]
2021-09-03 19:15 ` [PATCH 5/8] staging: media: zoran: videocode: remove procfs Corentin Labbe
2021-09-03 19:15 ` [PATCH 6/8] staging: media: zoran: fusion all modules Corentin Labbe
2021-09-06 10:41 ` Hans Verkuil
2021-09-06 13:40 ` LABBE Corentin
2021-09-03 19:15 ` [PATCH 7/8] staging: media: zoran: remove vidmem Corentin Labbe
2021-09-03 19:15 ` [PATCH 8/8] staging: media: zoran: move videodev alloc Corentin Labbe
2021-09-06 11:03 ` [PATCH 0/8] staging: media: zoran: fusion in one module Hans Verkuil
2021-09-06 13:49 ` LABBE Corentin
2021-09-06 14:11 ` Hans Verkuil
2021-09-06 14:56 ` LABBE Corentin
2021-09-06 15:06 ` Hans Verkuil
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=e6b6affa-278a-5ef8-1cb1-b111a0756ea8@xs4all.nl \
--to=hverkuil@xs4all.nl \
--cc=clabbe@baylibre.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
--cc=mchehab@kernel.org \
--cc=mjpeg-users@lists.sourceforge.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).