video/rockchip: rga2: force rga version if hardware not support

[firefly-linux-kernel-4.4.55.git] / drivers / video / rockchip / rga2 / rga2_drv.c

diff --git a/drivers/video/rockchip/rga2/rga2_drv.c b/drivers/video/rockchip/rga2/rga2_drv.c
index 8b3b176263ee78ebb26425057c0979d3ae3f9967..850d20f33f348b8208387f9b479cea4e5e175e2a 100644 (file)
--- a/drivers/video/rockchip/rga2/rga2_drv.c
+++ b/drivers/video/rockchip/rga2/rga2_drv.c
@@ -178,6 +178,11 @@ static inline int rga2_init_version(void)
        major_version = (reg_version & RGA2_MAJOR_VERSION_MASK) >> 24;
        minor_version = (reg_version & RGA2_MINOR_VERSION_MASK) >> 20;
 
+       /*
+        * some old rga ip has no rga version register, so force set to 2.00
+        */
+       if (!major_version && !minor_version)
+               major_version = 2;
        sprintf(rga->version, "%d.%02d", major_version, minor_version);
 
        return 0;
@@ -188,7 +193,7 @@ static void rga2_soft_reset(void)
        u32 i;
        u32 reg;
 
-       rga2_write((1 << 3) | (1 << 4), RGA2_SYS_CTRL); //RGA_SYS_CTRL
+       rga2_write((1 << 3) | (1 << 4) | (1 << 6), RGA2_SYS_CTRL);
 
        for(i = 0; i < RGA2_RESET_TIMEOUT; i++)
        {