drivers/amlogic/media/osd: change L2C1 register for osd_two_ports function

This will change the osd _two_port register to VPU_WRARB_MODE_L2C1.
On S922X devices the system freezed sometimes on osd hardware init.

diff --git a/drivers/amlogic/media/osd/osd_hw.c b/drivers/amlogic/media/osd/osd_hw.c
index 1afcc95..2457f3d 100644 (file)
--- a/drivers/amlogic/media/osd/osd_hw.c
+++ b/drivers/amlogic/media/osd/osd_hw.c
@@ -3239,12 +3239,12 @@ static void osd_set_two_ports(bool set)
 
        if (set) {
                data32[0] = osd_reg_read(VPP_RDARB_MODE);
-               data32[1] = osd_reg_read(VPU_RDARB_MODE_L2C1);
+               data32[1] = osd_reg_read(VPU_WRARB_MODE_L2C1);
                osd_reg_set_bits(VPP_RDARB_MODE, 2, 20, 8);
-               osd_reg_set_bits(VPU_RDARB_MODE_L2C1, 2, 16, 8);
+               osd_reg_set_bits(VPU_WRARB_MODE_L2C1, 2, 16, 4);
        } else {
                osd_reg_write(VPP_RDARB_MODE, data32[0]);
-               osd_reg_write(VPU_RDARB_MODE_L2C1, data32[1]);
+               osd_reg_write(VPU_WRARB_MODE_L2C1, data32[1]);
        }
 }
 

diff --git a/drivers/amlogic/media/osd/osd_reg.h b/drivers/amlogic/media/osd/osd_reg.h
index 517ca97..8821d24 100644 (file)
--- a/drivers/amlogic/media/osd/osd_reg.h
+++ b/drivers/amlogic/media/osd/osd_reg.h
@@ -1424,6 +1424,7 @@
 #define VPP_POST_BLEND_DUMMY_ALPHA                 0x3969
 #define VPP_RDARB_MODE                             0x3978
 #define VPP_RDARB_REQEN_SLV                        0x3979
+#define VPU_WRARB_MODE_L2C1                        0x27a2
 #define VPU_RDARB_MODE_L2C1                        0x279d
 
 /*VIU2 osd1 reg*/