viafb: merge the remaining output path with enable functions

This patch merges the remaining functionality of the output path
function in the associated enabling functions. This is very natural as
most of the remaining code does actually enable the device.
Just some more or less intelligent code merge. If no stupid mistakes
occured there should be no regressions.

Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Cc: Joseph Chan <JosephChan@via.com.tw>

1 files changed, 108 insertions, 38 deletions

diff --git a/drivers/video/via/dvi.c b/drivers/video/via/dvi.c
index ab6145da1a2f..7c82f6fda918 100644
--- a/drivers/video/via/dvi.c
+++ b/drivers/video/via/dvi.c
@@ -496,38 +496,103 @@ void viafb_dvi_disable(void)
                 viafb_read_reg(VIACR, CRD2) | 0x08);
 }
 
+static void dvi_patch_skew_dvp0(void)
+{
+        /* Reset data driving first: */
+        viafb_write_reg_mask(SR1B, VIASR, 0, BIT1);
+        viafb_write_reg_mask(SR2A, VIASR, 0, BIT4);
+
+        switch (viaparinfo->chip_info->gfx_chip_name) {
+        case UNICHROME_P4M890:
+                {
+                        if ((viaparinfo->tmds_setting_info->h_active == 1600) &&
+                                (viaparinfo->tmds_setting_info->v_active ==
+                                1200))
+                                viafb_write_reg_mask(CR96, VIACR, 0x03,
+                                               BIT0 + BIT1 + BIT2);
+                        else
+                                viafb_write_reg_mask(CR96, VIACR, 0x07,
+                                               BIT0 + BIT1 + BIT2);
+                        break;
+                }
+
+        case UNICHROME_P4M900:
+                {
+                        viafb_write_reg_mask(CR96, VIACR, 0x07,
+                                       BIT0 + BIT1 + BIT2 + BIT3);
+                        viafb_write_reg_mask(SR1B, VIASR, 0x02, BIT1);
+                        viafb_write_reg_mask(SR2A, VIASR, 0x10, BIT4);
+                        break;
+                }
+
+        default:
+                {
+                        break;
+                }
+        }
+}
+
+static void dvi_patch_skew_dvp_low(void)
+{
+        switch (viaparinfo->chip_info->gfx_chip_name) {
+        case UNICHROME_K8M890:
+                {
+                        viafb_write_reg_mask(CR99, VIACR, 0x03, BIT0 + BIT1);
+                        break;
+                }
+
+        case UNICHROME_P4M900:
+                {
+                        viafb_write_reg_mask(CR99, VIACR, 0x08,
+                                       BIT0 + BIT1 + BIT2 + BIT3);
+                        break;
+                }
+
+        case UNICHROME_P4M890:
+                {
+                        viafb_write_reg_mask(CR99, VIACR, 0x0F,
+                                       BIT0 + BIT1 + BIT2 + BIT3);
+                        break;
+                }
+
+        default:
+                {
+                        break;
+                }
+        }
+}
+
 /* If Enable DVI, turn off pad */
 void viafb_dvi_enable(void)
 {
         u8 data;
 
-        if (viaparinfo->chip_info->
-                tmds_chip_info.output_interface == INTERFACE_DVP0) {
-                viafb_write_reg(SR1E, VIASR,
-                        viafb_read_reg(VIASR, SR1E) | 0xC0);
+        switch (viaparinfo->chip_info->tmds_chip_info.output_interface) {
+        case INTERFACE_DVP0:
+                viafb_write_reg_mask(CR6B, VIACR, 0x01, BIT0);
+                viafb_write_reg_mask(CR6C, VIACR, 0x21, BIT0 + BIT5);
+                viafb_write_reg_mask(SR1E, VIASR, 0xC0, BIT7 + BIT6);
+                dvi_patch_skew_dvp0();
                 if (viaparinfo->chip_info->gfx_chip_name == UNICHROME_CLE266)
                         tmds_register_write(0x88, 0x3b);
                 else
                         /*clear CR91[5] to direct on display period
                            in the secondary diplay path */
-                        viafb_write_reg(CR91, VIACR,
-                        viafb_read_reg(VIACR, CR91) & 0xDF);
-        }
+                        via_write_reg_mask(VIACR, 0x91, 0x00, 0x20);
+                break;
 
-        if (viaparinfo->chip_info->
-                tmds_chip_info.output_interface == INTERFACE_DVP1) {
-                viafb_write_reg(SR1E, VIASR,
-                        viafb_read_reg(VIASR, SR1E) | 0x30);
+        case INTERFACE_DVP1:
+                if (viaparinfo->chip_info->gfx_chip_name == UNICHROME_CLE266)
+                        viafb_write_reg_mask(CR93, VIACR, 0x21, BIT0 + BIT5);
 
+                viafb_write_reg_mask(SR1E, VIASR, 0x30, BIT4 + BIT5);
                 /*fix dvi cann't be enabled with MB VT5718C4 - Al Zhang */
-                if (viaparinfo->chip_info->gfx_chip_name == UNICHROME_CLE266) {
+                if (viaparinfo->chip_info->gfx_chip_name == UNICHROME_CLE266)
                         tmds_register_write(0x88, 0x3b);
-                } else {
+                else
                         /*clear CR91[5] to direct on display period
                           in the secondary diplay path */
-                        viafb_write_reg(CR91, VIACR,
-                        viafb_read_reg(VIACR, CR91) & 0xDF);
-                }
+                        via_write_reg_mask(VIACR, 0x91, 0x00, 0x20);
 
                 /*fix DVI cannot enable on EPIA-M board */
                 if (viafb_platform_epia_dvi == 1) {
@@ -539,36 +604,41 @@ void viafb_dvi_enable(void)
                                 else
                                         data = 0x37;
                                 viafb_i2c_writebyte(viaparinfo->chip_info->
-                                                       tmds_chip_info.i2c_port,
-                                                    viaparinfo->chip_info->
-                                                       tmds_chip_info.tmds_chip_slave_addr,
-                                                    0x08, data);
+                                        tmds_chip_info.i2c_port,
+                                        viaparinfo->chip_info->
+                                        tmds_chip_info.tmds_chip_slave_addr,
+                                        0x08, data);
                         }
                 }
-        }
+                break;
 
-        if (viaparinfo->chip_info->
-                tmds_chip_info.output_interface == INTERFACE_DFP_HIGH) {
-                viafb_write_reg(SR2A, VIASR,
-                        viafb_read_reg(VIASR, SR2A) | 0x0C);
-                viafb_write_reg(CR91, VIACR,
-                        viafb_read_reg(VIACR, CR91) & 0xDF);
-        }
+        case INTERFACE_DFP_HIGH:
+                if (viaparinfo->chip_info->gfx_chip_name != UNICHROME_CLE266)
+                        via_write_reg_mask(VIACR, CR97, 0x03, 0x03);
 
-        if (viaparinfo->chip_info->
-                tmds_chip_info.output_interface == INTERFACE_DFP_LOW) {
-                viafb_write_reg(SR2A, VIASR,
-                        viafb_read_reg(VIASR, SR2A) | 0x03);
-                viafb_write_reg(CR91, VIACR,
-                        viafb_read_reg(VIACR, CR91) & 0xDF);
-        }
-        if (viaparinfo->chip_info->
-                tmds_chip_info.output_interface == INTERFACE_TMDS) {
+                viafb_write_reg_mask(SR2A, VIASR, 0x0C, BIT2 + BIT3);
+                via_write_reg_mask(VIACR, 0x91, 0x00, 0x20);
+                break;
+
+        case INTERFACE_DFP_LOW:
+                if (viaparinfo->chip_info->gfx_chip_name == UNICHROME_CLE266)
+                        break;
+                viafb_write_reg_mask(SR2A, VIASR, 0x03, BIT0 + BIT1);
+                dvi_patch_skew_dvp_low();
+                via_write_reg_mask(VIACR, 0x91, 0x00, 0x20);
+                break;
+
+        case INTERFACE_TMDS:
                 /* Turn on Display period in the panel path. */
                 viafb_write_reg_mask(CR91, VIACR, 0, BIT7);
 
                 /* Turn on TMDS power. */
                 viafb_write_reg_mask(CRD2, VIACR, 0, BIT3);
+                break;
         }
-}
 
+        if (viaparinfo->tmds_setting_info->iga_path == IGA2) {
+                /* Disable LCD Scaling */
+                viafb_write_reg_mask(CR79, VIACR, 0x00, BIT0);
+        }
+}