media: vsp1: Use lockdep assertions to enforce documented conventions

A few functions have documented locking conventions. Documentation is
nice, but runtime checks are better. Enforce the conventions with
lockdep assertions.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>

diff --git a/drivers/media/platform/renesas/vsp1/vsp1_dl.c b/drivers/media/platform/renesas/vsp1/vsp1_dl.c
index c660f8539ff566d610f1f641b51b93bfc0d51e6e..d732b4ed11807b9fc43d531892b8a54dc7620318 100644 (file)
--- a/drivers/media/platform/renesas/vsp1/vsp1_dl.c
+++ b/drivers/media/platform/renesas/vsp1/vsp1_dl.c
@@ -10,6 +10,7 @@
 #include <linux/device.h>
 #include <linux/dma-mapping.h>
 #include <linux/gfp.h>
+#include <linux/lockdep.h>
 #include <linux/refcount.h>
 #include <linux/slab.h>
 #include <linux/workqueue.h>
@@ -612,6 +613,8 @@ struct vsp1_dl_list *vsp1_dl_list_get(struct vsp1_dl_manager *dlm)
        struct vsp1_dl_list *dl = NULL;
        unsigned long flags;
 
+       lockdep_assert_not_held(&dlm->lock);
+
        spin_lock_irqsave(&dlm->lock, flags);
 
        if (!list_empty(&dlm->free)) {
@@ -639,6 +642,8 @@ static void __vsp1_dl_list_put(struct vsp1_dl_list *dl)
        if (!dl)
                return;
 
+       lockdep_assert_held(&dl->dlm->lock);
+
        /*
         * Release any linked display-lists which were chained for a single
         * hardware operation.

diff --git a/drivers/media/platform/renesas/vsp1/vsp1_pipe.c b/drivers/media/platform/renesas/vsp1/vsp1_pipe.c
index 3cbb768cf6adc8cb182d8d31c5b9a9d3565785e7..5d769cc42fe1a389281c07929a9064457594347d 100644 (file)
--- a/drivers/media/platform/renesas/vsp1/vsp1_pipe.c
+++ b/drivers/media/platform/renesas/vsp1/vsp1_pipe.c
@@ -9,6 +9,7 @@
 
 #include <linux/delay.h>
 #include <linux/list.h>
+#include <linux/lockdep.h>
 #include <linux/sched.h>
 #include <linux/wait.h>
 
@@ -473,6 +474,8 @@ void vsp1_pipeline_run(struct vsp1_pipeline *pipe)
 {
        struct vsp1_device *vsp1 = pipe->output->entity.vsp1;
 
+       lockdep_assert_held(&pipe->irqlock);
+
        if (pipe->state == VSP1_PIPELINE_STOPPED) {
                vsp1_write(vsp1, VI6_CMD(pipe->output->entity.index),
                           VI6_CMD_STRCMD);