video: Move last_sync to private data

Rather than using a static variable, use the video device's private
data to remember when the last video sync was completed. This allows
each display to have its own sync and avoids using static data in SPL.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/drivers/video/video-uclass.c b/drivers/video/video-uclass.c
index ff1382f..a95b5f1 100644 (file)
--- a/drivers/video/video-uclass.c
+++ b/drivers/video/video-uclass.c
@@ -349,6 +349,7 @@ void video_set_default_colors(struct udevice *dev, bool invert)
 /* Flush video activity to the caches */
 int video_sync(struct udevice *vid, bool force)
 {
+       struct video_priv *priv = dev_get_uclass_priv(vid);
        struct video_ops *ops = video_get_ops(vid);
        int ret;
 
@@ -364,20 +365,15 @@ int video_sync(struct udevice *vid, bool force)
         * out whether it exists? For now, ARM is safe.
         */
 #if defined(CONFIG_ARM) && !CONFIG_IS_ENABLED(SYS_DCACHE_OFF)
-       struct video_priv *priv = dev_get_uclass_priv(vid);
-
        if (priv->flush_dcache) {
                flush_dcache_range((ulong)priv->fb,
                                   ALIGN((ulong)priv->fb + priv->fb_size,
                                         CONFIG_SYS_CACHELINE_SIZE));
        }
 #elif defined(CONFIG_VIDEO_SANDBOX_SDL)
-       struct video_priv *priv = dev_get_uclass_priv(vid);
-       static ulong last_sync;
-
-       if (force || get_timer(last_sync) > 100) {
+       if (force || get_timer(priv->last_sync) > 100) {
                sandbox_sdl_sync(priv->fb);
-               last_sync = get_timer(0);
+               priv->last_sync = get_timer(0);
        }
 #endif
        return 0;

diff --git a/include/video.h b/include/video.h
index 4d8df9b..4013a94 100644 (file)
--- a/include/video.h
+++ b/include/video.h
@@ -97,6 +97,7 @@ enum video_format {
  *             the LCD is updated
  * @fg_col_idx:        Foreground color code (bit 3 = bold, bit 0-2 = color)
  * @bg_col_idx:        Background color code (bit 3 = bold, bit 0-2 = color)
+ * @last_sync: Monotonic time of last video sync
  */
 struct video_priv {
        /* Things set up by the driver: */
@@ -121,6 +122,7 @@ struct video_priv {
        bool flush_dcache;
        u8 fg_col_idx;
        u8 bg_col_idx;
+       ulong last_sync;
 };
 
 /**