Skip to content

L
linux
Commit a54be174 authored by Florian Tobias Schandinat's avatar Florian Tobias Schandinat
Browse files
Options

viafb: rework output device routing 

This patch rips the device routing out of the 3 main functions to
separate functions to make them available for transition to a better
controlling scheme.
Signed-off-by: default avatarFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>
Cc: Joseph Chan <JosephChan@via.com.tw>
parent b002741d
Hide whitespace changes
Inline Side-by-side
Showing with 94 additions and 89 deletions
drivers/video/via/hw.c
View file @ a54be174
...@@ -860,18 +860,78 @@ void viafb_set_output_path(int device, int set_iga, int output_interface) ...@@ -860,18 +860,78 @@ void viafb_set_output_path(int device, int set_iga, int output_interface)
enable_second_display_channel(); enable_second_display_channel();
} }
static void set_crt_output_path(int set_iga) static void set_source_common(u8 index, u8 offset, u8 iga)
{ {
viafb_write_reg_mask(CR36, VIACR, 0x00, BIT4 + BIT5); u8 value, mask = 1 << offset;
switch (set_iga) { switch (iga) {
case IGA1:
value = 0x00;
break;
case IGA2:
value = mask;
break;
default:
printk(KERN_WARNING "viafb: Unsupported source: %d\n", iga);
return;
}
via_write_reg_mask(VIACR, index, value, mask);
}
static void set_crt_source(u8 iga)
{
u8 value;
switch (iga) {
case IGA1: case IGA1:
viafb_write_reg_mask(SR16, VIASR, 0x00, BIT6); value = 0x00;
break; break;
case IGA2: case IGA2:
viafb_write_reg_mask(SR16, VIASR, 0x40, BIT6); value = 0x40;
break; break;
default:
printk(KERN_WARNING "viafb: Unsupported source: %d\n", iga);
return;
} }
via_write_reg_mask(VIASR, 0x16, value, 0x40);
}
static inline void set_6C_source(u8 iga)
{
set_source_common(0x6C, 7, iga);
}
static inline void set_93_source(u8 iga)
{
set_source_common(0x93, 7, iga);
}
static inline void set_96_source(u8 iga)
{
set_source_common(0x96, 4, iga);
}
static inline void set_dvp1_source(u8 iga)
{
set_source_common(0x9B, 4, iga);
}
static inline void set_lvds1_source(u8 iga)
{
set_source_common(0x99, 4, iga);
}
static inline void set_lvds2_source(u8 iga)
{
set_source_common(0x97, 4, iga);
}
static void set_crt_output_path(int set_iga)
{
viafb_write_reg_mask(CR36, VIACR, 0x00, BIT4 + BIT5);
set_crt_source(set_iga);
} }
static void dvi_patch_skew_dvp0(void) static void dvi_patch_skew_dvp0(void)
...@@ -944,76 +1004,45 @@ static void set_dvi_output_path(int set_iga, int output_interface) ...@@ -944,76 +1004,45 @@ static void set_dvi_output_path(int set_iga, int output_interface)
{ {
switch (output_interface) { switch (output_interface) {
case INTERFACE_DVP0: case INTERFACE_DVP0:
set_96_source(set_iga);
set_6C_source(set_iga);
viafb_write_reg_mask(CR6B, VIACR, 0x01, BIT0); viafb_write_reg_mask(CR6B, VIACR, 0x01, BIT0);
viafb_write_reg_mask(CR6C, VIACR, 0x21, BIT0 + BIT5);
if (set_iga == IGA1) {
viafb_write_reg_mask(CR96, VIACR, 0x00, BIT4);
viafb_write_reg_mask(CR6C, VIACR, 0x21, BIT0 +
BIT5 + BIT7);
} else {
viafb_write_reg_mask(CR96, VIACR, 0x10, BIT4);
viafb_write_reg_mask(CR6C, VIACR, 0xA1, BIT0 +
BIT5 + BIT7);
}
viafb_write_reg_mask(SR1E, VIASR, 0xC0, BIT7 + BIT6); viafb_write_reg_mask(SR1E, VIASR, 0xC0, BIT7 + BIT6);
dvi_patch_skew_dvp0(); dvi_patch_skew_dvp0();
break; break;
case INTERFACE_DVP1: case INTERFACE_DVP1:
if (viaparinfo->chip_info->gfx_chip_name == UNICHROME_CLE266) { if (viaparinfo->chip_info->gfx_chip_name == UNICHROME_CLE266) {
if (set_iga == IGA1) set_93_source(set_iga);
viafb_write_reg_mask(CR93, VIACR, 0x21, viafb_write_reg_mask(CR93, VIACR, 0x21, BIT0 + BIT5);
BIT0 + BIT5 + BIT7);
else
viafb_write_reg_mask(CR93, VIACR, 0xA1,
BIT0 + BIT5 + BIT7);
} else { } else {
if (set_iga == IGA1) set_dvp1_source(set_iga);
viafb_write_reg_mask(CR9B, VIACR, 0x00, BIT4);
else
viafb_write_reg_mask(CR9B, VIACR, 0x10, BIT4);
} }
viafb_write_reg_mask(SR1E, VIASR, 0x30, BIT4 + BIT5); viafb_write_reg_mask(SR1E, VIASR, 0x30, BIT4 + BIT5);
break; break;
case INTERFACE_DFP_HIGH: case INTERFACE_DFP_HIGH:
if (viaparinfo->chip_info->gfx_chip_name != UNICHROME_CLE266) { if (viaparinfo->chip_info->gfx_chip_name != UNICHROME_CLE266) {
if (set_iga == IGA1) { via_write_reg_mask(VIACR, CR97, 0x03, 0x03);
viafb_write_reg_mask(CR96, VIACR, 0x00, BIT4); set_lvds2_source(set_iga);
viafb_write_reg_mask(CR97, VIACR, 0x03, set_96_source(set_iga);
BIT0 + BIT1 + BIT4);
} else {
viafb_write_reg_mask(CR96, VIACR, 0x10, BIT4);
viafb_write_reg_mask(CR97, VIACR, 0x13,
BIT0 + BIT1 + BIT4);
}
} }
viafb_write_reg_mask(SR2A, VIASR, 0x0C, BIT2 + BIT3); viafb_write_reg_mask(SR2A, VIASR, 0x0C, BIT2 + BIT3);
break; break;
case INTERFACE_DFP_LOW: case INTERFACE_DFP_LOW:
if (viaparinfo->chip_info->gfx_chip_name == UNICHROME_CLE266) if (viaparinfo->chip_info->gfx_chip_name == UNICHROME_CLE266)
break; break;
set_dvp1_source(set_iga);
if (set_iga == IGA1) { set_lvds1_source(set_iga);
viafb_write_reg_mask(CR99, VIACR, 0x00, BIT4);
viafb_write_reg_mask(CR9B, VIACR, 0x00, BIT4);
} else {
viafb_write_reg_mask(CR99, VIACR, 0x10, BIT4);
viafb_write_reg_mask(CR9B, VIACR, 0x10, BIT4);
}
viafb_write_reg_mask(SR2A, VIASR, 0x03, BIT0 + BIT1); viafb_write_reg_mask(SR2A, VIASR, 0x03, BIT0 + BIT1);
dvi_patch_skew_dvp_low(); dvi_patch_skew_dvp_low();
break; break;
case INTERFACE_TMDS: case INTERFACE_TMDS:
if (set_iga == IGA1) set_lvds1_source(set_iga);
viafb_write_reg_mask(CR99, VIACR, 0x00, BIT4);
else
viafb_write_reg_mask(CR99, VIACR, 0x10, BIT4);
break; break;
} }
...@@ -1031,45 +1060,31 @@ static void set_lcd_output_path(int set_iga, int output_interface) ...@@ -1031,45 +1060,31 @@ static void set_lcd_output_path(int set_iga, int output_interface)
viafb_write_reg_mask(CR6B, VIACR, 0x00, BIT3); viafb_write_reg_mask(CR6B, VIACR, 0x00, BIT3);
viafb_write_reg_mask(CR6A, VIACR, 0x08, BIT3); viafb_write_reg_mask(CR6A, VIACR, 0x08, BIT3);
switch (output_interface) { switch (output_interface) {
case INTERFACE_DVP0: case INTERFACE_DVP0:
if (set_iga == IGA1) { set_96_source(set_iga);
viafb_write_reg_mask(CR96, VIACR, 0x00, BIT4); if (set_iga == IGA2)
} else {
viafb_write_reg(CR91, VIACR, 0x00); viafb_write_reg(CR91, VIACR, 0x00);
viafb_write_reg_mask(CR96, VIACR, 0x10, BIT4);
}
break; break;
case INTERFACE_DVP1: case INTERFACE_DVP1:
if (set_iga == IGA1) set_dvp1_source(set_iga);
viafb_write_reg_mask(CR9B, VIACR, 0x00, BIT4); if (set_iga == IGA2)
else {
viafb_write_reg(CR91, VIACR, 0x00); viafb_write_reg(CR91, VIACR, 0x00);
viafb_write_reg_mask(CR9B, VIACR, 0x10, BIT4);
}
break; break;
case INTERFACE_DFP_HIGH: case INTERFACE_DFP_HIGH:
if (set_iga == IGA1) set_lvds2_source(set_iga);
viafb_write_reg_mask(CR97, VIACR, 0x00, BIT4); set_96_source(set_iga);
else { if (set_iga == IGA2)
viafb_write_reg(CR91, VIACR, 0x00); viafb_write_reg(CR91, VIACR, 0x00);
viafb_write_reg_mask(CR97, VIACR, 0x10, BIT4);
viafb_write_reg_mask(CR96, VIACR, 0x10, BIT4);
}
break; break;
case INTERFACE_DFP_LOW: case INTERFACE_DFP_LOW:
if (set_iga == IGA1) set_lvds1_source(set_iga);
viafb_write_reg_mask(CR99, VIACR, 0x00, BIT4); set_dvp1_source(set_iga);
else { if (set_iga == IGA2)
viafb_write_reg(CR91, VIACR, 0x00); viafb_write_reg(CR91, VIACR, 0x00);
viafb_write_reg_mask(CR99, VIACR, 0x10, BIT4);
viafb_write_reg_mask(CR9B, VIACR, 0x10, BIT4);
}
break; break;
case INTERFACE_DFP: case INTERFACE_DFP:
...@@ -1078,30 +1093,20 @@ static void set_lcd_output_path(int set_iga, int output_interface) ...@@ -1078,30 +1093,20 @@ static void set_lcd_output_path(int set_iga, int output_interface)
viaparinfo->chip_info->gfx_chip_name)) viaparinfo->chip_info->gfx_chip_name))
viafb_write_reg_mask(CR97, VIACR, 0x84, viafb_write_reg_mask(CR97, VIACR, 0x84,
BIT7 + BIT2 + BIT1 + BIT0); BIT7 + BIT2 + BIT1 + BIT0);
if (set_iga == IGA1) {
viafb_write_reg_mask(CR97, VIACR, 0x00, BIT4); set_lvds1_source(set_iga);
viafb_write_reg_mask(CR99, VIACR, 0x00, BIT4); set_lvds2_source(set_iga);
} else { if (set_iga == IGA2)
viafb_write_reg(CR91, VIACR, 0x00); viafb_write_reg(CR91, VIACR, 0x00);
viafb_write_reg_mask(CR97, VIACR, 0x10, BIT4);
viafb_write_reg_mask(CR99, VIACR, 0x10, BIT4);
}
break; break;
case INTERFACE_LVDS0: case INTERFACE_LVDS0:
case INTERFACE_LVDS0LVDS1: case INTERFACE_LVDS0LVDS1:
if (set_iga == IGA1) set_lvds1_source(set_iga);
viafb_write_reg_mask(CR99, VIACR, 0x00, BIT4);
else
viafb_write_reg_mask(CR99, VIACR, 0x10, BIT4);
break; break;
case INTERFACE_LVDS1: case INTERFACE_LVDS1:
if (set_iga == IGA1) set_lvds2_source(set_iga);
viafb_write_reg_mask(CR97, VIACR, 0x00, BIT4);
else
viafb_write_reg_mask(CR97, VIACR, 0x10, BIT4);
break; break;
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7