The dcache flushing code path was conditional on ARM && !DCACHE config options. However, dcaches exist on other platforms as well and may need clearing if their driver requires it.
Simplify the compile logic and always enable the dcache flush logic in the video core. That way, drivers can always rely on it to call the arch specific callbacks.
This will increase code size for non-ARM platforms with CONFIG_VIDEO=y slightly.
Reported-by: Heinrich Schuchardt xypron.glpk@gmx.de Signed-off-by: Alexander Graf agraf@csgraf.de --- drivers/video/video-uclass.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/drivers/video/video-uclass.c b/drivers/video/video-uclass.c index 956863f98a..bad5eedc96 100644 --- a/drivers/video/video-uclass.c +++ b/drivers/video/video-uclass.c @@ -285,11 +285,13 @@ int video_damage(struct udevice *vid, int x, int y, int width, int height) return 0; }
-#if defined(CONFIG_ARM) && !CONFIG_IS_ENABLED(SYS_DCACHE_OFF) static void video_flush_dcache(struct udevice *vid) { struct video_priv *priv = dev_get_uclass_priv(vid);
+ if (CONFIG_IS_ENABLED(SYS_DCACHE_OFF)) + return; + if (!priv->flush_dcache) return;
@@ -318,7 +320,6 @@ static void video_flush_dcache(struct udevice *vid) } } } -#endif
static void video_flush_copy(struct udevice *vid) { @@ -357,14 +358,9 @@ int video_sync(struct udevice *vid, bool force) return ret; }
- /* - * flush_dcache_range() is declared in common.h but it seems that some - * architectures do not actually implement it. Is there a way to find - * out whether it exists? For now, ARM is safe. - */ -#if defined(CONFIG_ARM) && !CONFIG_IS_ENABLED(SYS_DCACHE_OFF) video_flush_dcache(vid); -#elif defined(CONFIG_VIDEO_SANDBOX_SDL) + +#if defined(CONFIG_VIDEO_SANDBOX_SDL) static ulong last_sync;
if (force || get_timer(last_sync) > 100) {