Re: [PATCH, RFC 05/30] [media] omap_vout: avoid sleep_on race

2014-01-17 Thread Hans Verkuil
Hi Arnd,

On 01/02/2014 01:07 PM, Arnd Bergmann wrote:
 sleep_on and its variants are broken and going away soon. This changes
 the omap vout driver to use interruptible_sleep_on_timeout instead,

I assume you mean wait_event_interruptible_timeout here :-)

Reviewed-by: Hans Verkuil hans.verk...@cisco.com

If there are no other comments, then I plan to merge this next week.

Regards,

Hans

 which fixes potential race where the dma is complete before we
 schedule.
 
 Signed-off-by: Arnd Bergmann a...@arndb.de
 Cc: Mauro Carvalho Chehab m.che...@samsung.com
 Cc: linux-media@vger.kernel.org
 ---
  drivers/media/platform/omap/omap_vout_vrfb.c | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/media/platform/omap/omap_vout_vrfb.c 
 b/drivers/media/platform/omap/omap_vout_vrfb.c
 index cf1c437..62e7e57 100644
 --- a/drivers/media/platform/omap/omap_vout_vrfb.c
 +++ b/drivers/media/platform/omap/omap_vout_vrfb.c
 @@ -270,7 +270,8 @@ int omap_vout_prepare_vrfb(struct omap_vout_device *vout,
   omap_dma_set_global_params(DMA_DEFAULT_ARB_RATE, 0x20, 0);
  
   omap_start_dma(tx-dma_ch);
 - interruptible_sleep_on_timeout(tx-wait, VRFB_TX_TIMEOUT);
 + wait_event_interruptible_timeout(tx-wait, tx-tx_status == 1,
 +  VRFB_TX_TIMEOUT);
  
   if (tx-tx_status == 0) {
   omap_stop_dma(tx-dma_ch);
 

--
To unsubscribe from this list: send the line unsubscribe linux-media in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[PATCH, RFC 05/30] [media] omap_vout: avoid sleep_on race

2014-01-02 Thread Arnd Bergmann
sleep_on and its variants are broken and going away soon. This changes
the omap vout driver to use interruptible_sleep_on_timeout instead,
which fixes potential race where the dma is complete before we
schedule.

Signed-off-by: Arnd Bergmann a...@arndb.de
Cc: Mauro Carvalho Chehab m.che...@samsung.com
Cc: linux-media@vger.kernel.org
---
 drivers/media/platform/omap/omap_vout_vrfb.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/media/platform/omap/omap_vout_vrfb.c 
b/drivers/media/platform/omap/omap_vout_vrfb.c
index cf1c437..62e7e57 100644
--- a/drivers/media/platform/omap/omap_vout_vrfb.c
+++ b/drivers/media/platform/omap/omap_vout_vrfb.c
@@ -270,7 +270,8 @@ int omap_vout_prepare_vrfb(struct omap_vout_device *vout,
omap_dma_set_global_params(DMA_DEFAULT_ARB_RATE, 0x20, 0);
 
omap_start_dma(tx-dma_ch);
-   interruptible_sleep_on_timeout(tx-wait, VRFB_TX_TIMEOUT);
+   wait_event_interruptible_timeout(tx-wait, tx-tx_status == 1,
+VRFB_TX_TIMEOUT);
 
if (tx-tx_status == 0) {
omap_stop_dma(tx-dma_ch);
-- 
1.8.3.2

--
To unsubscribe from this list: send the line unsubscribe linux-media in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html