media: staging: media: zoran: add debugfs

Add debugfs for displaying zoran debug and stats information.

Signed-off-by: Corentin Labbe <clabbe@baylibre.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>

diff --git a/drivers/staging/media/zoran/Kconfig b/drivers/staging/media/zoran/Kconfig
index 7874842033ca1ec568f13b361a2d581506cf0438..6d6e4c93f8734e65fa7b1835536992bf3d84edfa 100644 (file)
--- a/drivers/staging/media/zoran/Kconfig
+++ b/drivers/staging/media/zoran/Kconfig
@@ -2,6 +2,7 @@ config VIDEO_ZORAN
        tristate "Zoran ZR36057/36067 Video For Linux (Deprecated)"
        depends on PCI && I2C_ALGOBIT && VIDEO_V4L2
        depends on !ALPHA
+       depends on DEBUG_FS
        select VIDEOBUF2_DMA_CONTIG
        help
          Say Y for support for MJPEG capture cards based on the Zoran

diff --git a/drivers/staging/media/zoran/zoran.h b/drivers/staging/media/zoran/zoran.h
index b1ad2a2b914cd024567c391a18bb5d76d8aa0268..981cb63ac9af528982c389e342b69d9748ba904e 100644 (file)
--- 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,7 @@ struct zoran {
        struct list_head queued_bufs;
        spinlock_t queued_bufs_lock; /* Protects queued_bufs */
        struct zr_buffer *inuse[BUZ_NUM_STAT_COM * 2];
+       struct dentry *dbgfs_dir;
 };
 
 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 f1465fbf98af21239a9bbc87a822869cc78f255b..54e9ea03b88cf3a25064cb3297a8bff62d497525 100644 (file)
--- a/drivers/staging/media/zoran/zoran_card.c
+++ b/drivers/staging/media/zoran/zoran_card.c
@@ -945,6 +945,8 @@ static void zoran_remove(struct pci_dev *pdev)
        if (!zr->initialized)
                goto exit_free;
 
+       debugfs_remove_recursive(zr->dbgfs_dir);
+
        zoran_queue_exit(zr);
 
        /* unregister videocodec bus */
@@ -1051,6 +1053,37 @@ static const struct v4l2_ctrl_ops zoran_video_ctrl_ops = {
        .s_ctrl = zoran_video_set_ctrl,
 };
 
+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 %llx\n", zr->norm);
+       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);
+
 /*
  *   Scan for a Buz card (actually for the PCI controller ZR36057),
  *   request the irq and map the io memory
@@ -1286,6 +1319,9 @@ static int zoran_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 
        zr->map_mode = ZORAN_MAP_MODE_RAW;
 
+       zr->dbgfs_dir = debugfs_create_dir(ZR_DEVNAME(zr), NULL);
+       debugfs_create_file("debug", 0444, zr->dbgfs_dir, zr,
+                           &zoran_debugfs_fops);
        return 0;
 
 zr_detach_vfe: