1 files changed, 32 insertions, 7 deletions

diff --git a/drivers/gpu/drm/ast/ast_mode.c b/drivers/gpu/drm/ast/ast_mode.c
index 5e77d456d9bb..8bb355d5d43d 100644
--- a/drivers/gpu/drm/ast/ast_mode.c
+++ b/drivers/gpu/drm/ast/ast_mode.c
@@ -568,6 +568,7 @@ static int ast_crtc_do_set_base(struct drm_crtc *crtc,
         }
         ast_bo_unreserve(bo);
 
+        ast_set_offset_reg(crtc);
         ast_set_start_address_crt1(crtc, (u32)gpu_addr);
 
         return 0;
@@ -972,9 +973,21 @@ static int get_clock(void *i2c_priv)
 {
         struct ast_i2c_chan *i2c = i2c_priv;
         struct ast_private *ast = i2c->dev->dev_private;
-        uint32_t val;
+        uint32_t val, val2, count, pass;
+
+        count = 0;
+        pass = 0;
+        val = (ast_get_index_reg_mask(ast, AST_IO_CRTC_PORT, 0xb7, 0x10) >> 4) & 0x01;
+        do {
+                val2 = (ast_get_index_reg_mask(ast, AST_IO_CRTC_PORT, 0xb7, 0x10) >> 4) & 0x01;
+                if (val == val2) {
+                        pass++;
+                } else {
+                        pass = 0;
+                        val = (ast_get_index_reg_mask(ast, AST_IO_CRTC_PORT, 0xb7, 0x10) >> 4) & 0x01;
+                }
+        } while ((pass < 5) && (count++ < 0x10000));
 
-        val = ast_get_index_reg_mask(ast, AST_IO_CRTC_PORT, 0xb7, 0x10) >> 4;
         return val & 1 ? 1 : 0;
 }
 
@@ -982,9 +995,21 @@ static int get_data(void *i2c_priv)
 {
         struct ast_i2c_chan *i2c = i2c_priv;
         struct ast_private *ast = i2c->dev->dev_private;
-        uint32_t val;
+        uint32_t val, val2, count, pass;
+
+        count = 0;
+        pass = 0;
+        val = (ast_get_index_reg_mask(ast, AST_IO_CRTC_PORT, 0xb7, 0x20) >> 5) & 0x01;
+        do {
+                val2 = (ast_get_index_reg_mask(ast, AST_IO_CRTC_PORT, 0xb7, 0x20) >> 5) & 0x01;
+                if (val == val2) {
+                        pass++;
+                } else {
+                        pass = 0;
+                        val = (ast_get_index_reg_mask(ast, AST_IO_CRTC_PORT, 0xb7, 0x20) >> 5) & 0x01;
+                }
+        } while ((pass < 5) && (count++ < 0x10000));
 
-        val = ast_get_index_reg_mask(ast, AST_IO_CRTC_PORT, 0xb7, 0x20) >> 5;
         return val & 1 ? 1 : 0;
 }
 
@@ -997,7 +1022,7 @@ static void set_clock(void *i2c_priv, int clock)
 
         for (i = 0; i < 0x10000; i++) {
                 ujcrb7 = ((clock & 0x01) ? 0 : 1);
-                ast_set_index_reg_mask(ast, AST_IO_CRTC_PORT, 0xb7, 0xfe, ujcrb7);
+                ast_set_index_reg_mask(ast, AST_IO_CRTC_PORT, 0xb7, 0xf4, ujcrb7);
                 jtemp = ast_get_index_reg_mask(ast, AST_IO_CRTC_PORT, 0xb7, 0x01);
                 if (ujcrb7 == jtemp)
                         break;
@@ -1013,7 +1038,7 @@ static void set_data(void *i2c_priv, int data)
 
         for (i = 0; i < 0x10000; i++) {
                 ujcrb7 = ((data & 0x01) ? 0 : 1) << 2;
-                ast_set_index_reg_mask(ast, AST_IO_CRTC_PORT, 0xb7, 0xfb, ujcrb7);
+                ast_set_index_reg_mask(ast, AST_IO_CRTC_PORT, 0xb7, 0xf1, ujcrb7);
                 jtemp = ast_get_index_reg_mask(ast, AST_IO_CRTC_PORT, 0xb7, 0x04);
                 if (ujcrb7 == jtemp)
                         break;
@@ -1254,7 +1279,7 @@ static int ast_cursor_move(struct drm_crtc *crtc,
         ast_set_index_reg(ast, AST_IO_CRTC_PORT, 0xc7, ((y >> 8) & 0x07));
 
         /* dummy write to fire HWC */
-        ast_set_index_reg_mask(ast, AST_IO_CRTC_PORT, 0xCB, 0xFF, 0x00);
+        ast_show_cursor(crtc);
 
         return 0;
 }