Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6

[~andy/linux] / drivers / staging / omapdrm / omap_fb.c

diff --git a/drivers/staging/omapdrm/omap_fb.c b/drivers/staging/omapdrm/omap_fb.c
index 04b235b6724abc12cb79d06d14d51bfe0ae2b526..74260f043ab11f248958388fba070168288edf38 100644 (file)
--- a/drivers/staging/omapdrm/omap_fb.c
+++ b/drivers/staging/omapdrm/omap_fb.c
@@ -167,7 +167,7 @@ void omap_framebuffer_update_scanout(struct drm_framebuffer *fb, int x, int y,
 }
 
 /* Call for unpin 'a' (if not NULL), and pin 'b' (if not NULL).  Although
- * buffers to unpin are just just pushed to the unpin fifo so that the
+ * buffers to unpin are just pushed to the unpin fifo so that the
  * caller can defer unpin until vblank.
  *
  * Note if this fails (ie. something went very wrong!), all buffers are
@@ -197,8 +197,11 @@ int omap_framebuffer_replace(struct drm_framebuffer *a,
                        pa->paddr = 0;
                }
 
-               if (pb && !ret)
+               if (pb && !ret) {
                        ret = omap_gem_get_paddr(pb->bo, &pb->paddr, true);
+                       if (!ret)
+                               omap_gem_dma_sync(pb->bo, DMA_TO_DEVICE);
+               }
        }
 
        if (ret) {