[media] davinci: vpif: capture/display: fix race condition

channel_first_int[][] variable is used as a flag for the ISR,
This flag was being set after enabling the interrupts, There
where situations when the isr occurred even before the flag was set
dues to which it was causing the application hang.
This patch sets  channel_first_int[][] flag just before enabling the
interrupt.

Reported-by: David Oleszkiewicz <doleszki@adsyscontrols.com>
Signed-off-by: Lad, Prabhakar <prabhakar.lad@ti.com>
Signed-off-by: Manjunath Hadli <manjunath.hadli@ti.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

2 files changed, 2 insertions, 2 deletions

diff --git a/drivers/media/platform/davinci/vpif_capture.c b/drivers/media/platform/davinci/vpif_capture.c
index 13aa46dc2f33..0bafecac4923 100644
--- a/drivers/media/platform/davinci/vpif_capture.c
+++ b/drivers/media/platform/davinci/vpif_capture.c
@@ -339,6 +339,7 @@ static int vpif_start_streaming(struct vb2_queue *vq, unsigned int count)
          * Set interrupt for both the fields in VPIF Register enable channel in
          * VPIF register
          */
+        channel_first_int[VPIF_VIDEO_INDEX][ch->channel_id] = 1;
         if ((VPIF_CHANNEL0_VIDEO == ch->channel_id)) {
                 channel0_intr_assert();
                 channel0_intr_enable(1);
@@ -350,7 +351,6 @@ static int vpif_start_streaming(struct vb2_queue *vq, unsigned int count)
                 channel1_intr_enable(1);
                 enable_channel1(1);
         }
-        channel_first_int[VPIF_VIDEO_INDEX][ch->channel_id] = 1;
 
         return 0;
 }
diff --git a/drivers/media/platform/davinci/vpif_display.c b/drivers/media/platform/davinci/vpif_display.c
index 8003c56487bb..a5b88689abad 100644
--- a/drivers/media/platform/davinci/vpif_display.c
+++ b/drivers/media/platform/davinci/vpif_display.c
@@ -302,6 +302,7 @@ static int vpif_start_streaming(struct vb2_queue *vq, unsigned int count)
 
         /* Set interrupt for both the fields in VPIF
             Register enable channel in VPIF register */
+        channel_first_int[VPIF_VIDEO_INDEX][ch->channel_id] = 1;
         if (VPIF_CHANNEL2_VIDEO == ch->channel_id) {
                 channel2_intr_assert();
                 channel2_intr_enable(1);
@@ -318,7 +319,6 @@ static int vpif_start_streaming(struct vb2_queue *vq, unsigned int count)
                 if (vpif_config_data->ch3_clip_en)
                         channel3_clipping_enable(1);
         }
-        channel_first_int[VPIF_VIDEO_INDEX][ch->channel_id] = 1;
 
         return 0;
 }