Skip to content

L
linux
Commit f8645933 authored by David Miller's avatar David Miller Committed by Paul Mundt
Browse files
Options

s3fb: Pass par->state.vgabase to vga_*() calls. 

Instead of just plain NULL.
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent c5e04633
Show whitespace changes
Inline Side-by-side
Showing with 52 additions and 50 deletions
drivers/video/s3fb.c
View file @ f8645933
...@@ -348,26 +348,26 @@ static void s3_set_pixclock(struct fb_info *info, u32 pixclock) ...@@ -348,26 +348,26 @@ static void s3_set_pixclock(struct fb_info *info, u32 pixclock)
} }
/* Set VGA misc register */ /* Set VGA misc register */
regval = vga_r(NULL, VGA_MIS_R); regval = vga_r(par->state.vgabase, VGA_MIS_R);
vga_w(NULL, VGA_MIS_W, regval | VGA_MIS_ENB_PLL_LOAD); vga_w(par->state.vgabase, VGA_MIS_W, regval | VGA_MIS_ENB_PLL_LOAD);
/* Set S3 clock registers */ /* Set S3 clock registers */
if (par->chip == CHIP_360_TRIO3D_1X || if (par->chip == CHIP_360_TRIO3D_1X ||
par->chip == CHIP_362_TRIO3D_2X || par->chip == CHIP_362_TRIO3D_2X ||
par->chip == CHIP_368_TRIO3D_2X) { par->chip == CHIP_368_TRIO3D_2X) {
vga_wseq(NULL, 0x12, (n - 2) | ((r & 3) << 6)); /* n and two bits of r */ vga_wseq(par->state.vgabase, 0x12, (n - 2) | ((r & 3) << 6)); /* n and two bits of r */
vga_wseq(NULL, 0x29, r >> 2); /* remaining highest bit of r */ vga_wseq(par->state.vgabase, 0x29, r >> 2); /* remaining highest bit of r */
} else } else
vga_wseq(NULL, 0x12, (n - 2) | (r << 5)); vga_wseq(par->state.vgabase, 0x12, (n - 2) | (r << 5));
vga_wseq(NULL, 0x13, m - 2); vga_wseq(par->state.vgabase, 0x13, m - 2);
udelay(1000); udelay(1000);
/* Activate clock - write 0, 1, 0 to seq/15 bit 5 */ /* Activate clock - write 0, 1, 0 to seq/15 bit 5 */
regval = vga_rseq (NULL, 0x15); /* | 0x80; */ regval = vga_rseq (par->state.vgabase, 0x15); /* | 0x80; */
vga_wseq(NULL, 0x15, regval & ~(1<<5)); vga_wseq(par->state.vgabase, 0x15, regval & ~(1<<5));
vga_wseq(NULL, 0x15, regval | (1<<5)); vga_wseq(par->state.vgabase, 0x15, regval | (1<<5));
vga_wseq(NULL, 0x15, regval & ~(1<<5)); vga_wseq(par->state.vgabase, 0x15, regval & ~(1<<5));
} }
...@@ -511,9 +511,9 @@ static int s3fb_set_par(struct fb_info *info) ...@@ -511,9 +511,9 @@ static int s3fb_set_par(struct fb_info *info)
info->var.activate = FB_ACTIVATE_NOW; info->var.activate = FB_ACTIVATE_NOW;
/* Unlock registers */ /* Unlock registers */
vga_wcrt(NULL, 0x38, 0x48); vga_wcrt(par->state.vgabase, 0x38, 0x48);
vga_wcrt(NULL, 0x39, 0xA5); vga_wcrt(par->state.vgabase, 0x39, 0xA5);
vga_wseq(NULL, 0x08, 0x06); vga_wseq(par->state.vgabase, 0x08, 0x06);
svga_wcrt_mask(par->state.vgabase, 0x11, 0x00, 0x80); svga_wcrt_mask(par->state.vgabase, 0x11, 0x00, 0x80);
/* Blank screen and turn off sync */ /* Blank screen and turn off sync */
...@@ -552,13 +552,13 @@ static int s3fb_set_par(struct fb_info *info) ...@@ -552,13 +552,13 @@ static int s3fb_set_par(struct fb_info *info)
if (par->chip != CHIP_360_TRIO3D_1X && if (par->chip != CHIP_360_TRIO3D_1X &&
par->chip != CHIP_362_TRIO3D_2X && par->chip != CHIP_362_TRIO3D_2X &&
par->chip != CHIP_368_TRIO3D_2X) { par->chip != CHIP_368_TRIO3D_2X) {
vga_wcrt(NULL, 0x54, 0x18); /* M parameter */ vga_wcrt(par->state.vgabase, 0x54, 0x18); /* M parameter */
vga_wcrt(NULL, 0x60, 0xff); /* N parameter */ vga_wcrt(par->state.vgabase, 0x60, 0xff); /* N parameter */
vga_wcrt(NULL, 0x61, 0xff); /* L parameter */ vga_wcrt(par->state.vgabase, 0x61, 0xff); /* L parameter */
vga_wcrt(NULL, 0x62, 0xff); /* L parameter */ vga_wcrt(par->state.vgabase, 0x62, 0xff); /* L parameter */
} }
vga_wcrt(NULL, 0x3A, 0x35); vga_wcrt(par->state.vgabase, 0x3A, 0x35);
svga_wattr(par->state.vgabase, 0x33, 0x00); svga_wattr(par->state.vgabase, 0x33, 0x00);
if (info->var.vmode & FB_VMODE_DOUBLE) if (info->var.vmode & FB_VMODE_DOUBLE)
...@@ -580,27 +580,27 @@ static int s3fb_set_par(struct fb_info *info) ...@@ -580,27 +580,27 @@ static int s3fb_set_par(struct fb_info *info)
/* S3 virge DX hack */ /* S3 virge DX hack */
if (par->chip == CHIP_375_VIRGE_DX) { if (par->chip == CHIP_375_VIRGE_DX) {
vga_wcrt(NULL, 0x86, 0x80); vga_wcrt(par->state.vgabase, 0x86, 0x80);
vga_wcrt(NULL, 0x90, 0x00); vga_wcrt(par->state.vgabase, 0x90, 0x00);
} }
/* S3 virge VX hack */ /* S3 virge VX hack */
if (par->chip == CHIP_988_VIRGE_VX) { if (par->chip == CHIP_988_VIRGE_VX) {
vga_wcrt(NULL, 0x50, 0x00); vga_wcrt(par->state.vgabase, 0x50, 0x00);
vga_wcrt(NULL, 0x67, 0x50); vga_wcrt(par->state.vgabase, 0x67, 0x50);
vga_wcrt(NULL, 0x63, (mode <= 2) ? 0x90 : 0x09); vga_wcrt(par->state.vgabase, 0x63, (mode <= 2) ? 0x90 : 0x09);
vga_wcrt(NULL, 0x66, 0x90); vga_wcrt(par->state.vgabase, 0x66, 0x90);
} }
if (par->chip == CHIP_360_TRIO3D_1X || if (par->chip == CHIP_360_TRIO3D_1X ||
par->chip == CHIP_362_TRIO3D_2X || par->chip == CHIP_362_TRIO3D_2X ||
par->chip == CHIP_368_TRIO3D_2X) { par->chip == CHIP_368_TRIO3D_2X) {
dbytes = info->var.xres * ((bpp+7)/8); dbytes = info->var.xres * ((bpp+7)/8);
vga_wcrt(NULL, 0x91, (dbytes + 7) / 8); vga_wcrt(par->state.vgabase, 0x91, (dbytes + 7) / 8);
vga_wcrt(NULL, 0x90, (((dbytes + 7) / 8) >> 8) | 0x80); vga_wcrt(par->state.vgabase, 0x90, (((dbytes + 7) / 8) >> 8) | 0x80);
vga_wcrt(NULL, 0x66, 0x81); vga_wcrt(par->state.vgabase, 0x66, 0x81);
} }
svga_wcrt_mask(par->state.vgabase, 0x31, 0x00, 0x40); svga_wcrt_mask(par->state.vgabase, 0x31, 0x00, 0x40);
...@@ -627,7 +627,7 @@ static int s3fb_set_par(struct fb_info *info) ...@@ -627,7 +627,7 @@ static int s3fb_set_par(struct fb_info *info)
break; break;
case 1: case 1:
pr_debug("fb%d: 4 bit pseudocolor\n", info->node); pr_debug("fb%d: 4 bit pseudocolor\n", info->node);
vga_wgfx(NULL, VGA_GFX_MODE, 0x40); vga_wgfx(par->state.vgabase, VGA_GFX_MODE, 0x40);
/* Set additional registers like in 8-bit mode */ /* Set additional registers like in 8-bit mode */
svga_wcrt_mask(par->state.vgabase, 0x50, 0x00, 0x30); svga_wcrt_mask(par->state.vgabase, 0x50, 0x00, 0x30);
...@@ -720,7 +720,7 @@ static int s3fb_set_par(struct fb_info *info) ...@@ -720,7 +720,7 @@ static int s3fb_set_par(struct fb_info *info)
/* Set interlaced mode start/end register */ /* Set interlaced mode start/end register */
value = info->var.xres + info->var.left_margin + info->var.right_margin + info->var.hsync_len; value = info->var.xres + info->var.left_margin + info->var.right_margin + info->var.hsync_len;
value = ((value * hmul) / 8) - 5; value = ((value * hmul) / 8) - 5;
vga_wcrt(NULL, 0x3C, (value + 1) / 2); vga_wcrt(par->state.vgabase, 0x3C, (value + 1) / 2);
memset_io(info->screen_base, 0x00, screen_size); memset_io(info->screen_base, 0x00, screen_size);
/* Device and screen back on */ /* Device and screen back on */
...@@ -873,12 +873,14 @@ static struct fb_ops s3fb_ops = { ...@@ -873,12 +873,14 @@ static struct fb_ops s3fb_ops = {
/* ------------------------------------------------------------------------- */ /* ------------------------------------------------------------------------- */
static int __devinit s3_identification(int chip) static int __devinit s3_identification(struct s3fb_info *par)
{ {
int chip = par->chip;
if (chip == CHIP_XXX_TRIO) { if (chip == CHIP_XXX_TRIO) {
u8 cr30 = vga_rcrt(NULL, 0x30); u8 cr30 = vga_rcrt(par->state.vgabase, 0x30);
u8 cr2e = vga_rcrt(NULL, 0x2e); u8 cr2e = vga_rcrt(par->state.vgabase, 0x2e);
u8 cr2f = vga_rcrt(NULL, 0x2f); u8 cr2f = vga_rcrt(par->state.vgabase, 0x2f);
if ((cr30 == 0xE0) || (cr30 == 0xE1)) { if ((cr30 == 0xE0) || (cr30 == 0xE1)) {
if (cr2e == 0x10) if (cr2e == 0x10)
...@@ -893,7 +895,7 @@ static int __devinit s3_identification(int chip) ...@@ -893,7 +895,7 @@ static int __devinit s3_identification(int chip)
} }
if (chip == CHIP_XXX_TRIO64V2_DXGX) { if (chip == CHIP_XXX_TRIO64V2_DXGX) {
u8 cr6f = vga_rcrt(NULL, 0x6f); u8 cr6f = vga_rcrt(par->state.vgabase, 0x6f);
if (! (cr6f & 0x01)) if (! (cr6f & 0x01))
return CHIP_775_TRIO64V2_DX; return CHIP_775_TRIO64V2_DX;
...@@ -902,7 +904,7 @@ static int __devinit s3_identification(int chip) ...@@ -902,7 +904,7 @@ static int __devinit s3_identification(int chip)
} }
if (chip == CHIP_XXX_VIRGE_DXGX) { if (chip == CHIP_XXX_VIRGE_DXGX) {
u8 cr6f = vga_rcrt(NULL, 0x6f); u8 cr6f = vga_rcrt(par->state.vgabase, 0x6f);
if (! (cr6f & 0x01)) if (! (cr6f & 0x01))
return CHIP_375_VIRGE_DX; return CHIP_375_VIRGE_DX;
...@@ -911,7 +913,7 @@ static int __devinit s3_identification(int chip) ...@@ -911,7 +913,7 @@ static int __devinit s3_identification(int chip)
} }
if (chip == CHIP_36X_TRIO3D_1X_2X) { if (chip == CHIP_36X_TRIO3D_1X_2X) {
switch (vga_rcrt(NULL, 0x2f)) { switch (vga_rcrt(par->state.vgabase, 0x2f)) {
case 0x00: case 0x00:
return CHIP_360_TRIO3D_1X; return CHIP_360_TRIO3D_1X;
case 0x01: case 0x01:
...@@ -979,21 +981,21 @@ static int __devinit s3_pci_probe(struct pci_dev *dev, const struct pci_device_i ...@@ -979,21 +981,21 @@ static int __devinit s3_pci_probe(struct pci_dev *dev, const struct pci_device_i
} }
/* Unlock regs */ /* Unlock regs */
cr38 = vga_rcrt(NULL, 0x38); cr38 = vga_rcrt(par->state.vgabase, 0x38);
cr39 = vga_rcrt(NULL, 0x39); cr39 = vga_rcrt(par->state.vgabase, 0x39);
vga_wseq(NULL, 0x08, 0x06); vga_wseq(par->state.vgabase, 0x08, 0x06);
vga_wcrt(NULL, 0x38, 0x48); vga_wcrt(par->state.vgabase, 0x38, 0x48);
vga_wcrt(NULL, 0x39, 0xA5); vga_wcrt(par->state.vgabase, 0x39, 0xA5);
/* Identify chip type */ /* Identify chip type */
par->chip = id->driver_data & CHIP_MASK; par->chip = id->driver_data & CHIP_MASK;
par->rev = vga_rcrt(NULL, 0x2f); par->rev = vga_rcrt(par->state.vgabase, 0x2f);
if (par->chip & CHIP_UNDECIDED_FLAG) if (par->chip & CHIP_UNDECIDED_FLAG)
par->chip = s3_identification(par->chip); par->chip = s3_identification(par);
/* Find how many physical memory there is on card */ /* Find how many physical memory there is on card */
/* 0x36 register is accessible even if other registers are locked */ /* 0x36 register is accessible even if other registers are locked */
regval = vga_rcrt(NULL, 0x36); regval = vga_rcrt(par->state.vgabase, 0x36);
if (par->chip == CHIP_360_TRIO3D_1X || if (par->chip == CHIP_360_TRIO3D_1X ||
par->chip == CHIP_362_TRIO3D_2X || par->chip == CHIP_362_TRIO3D_2X ||
par->chip == CHIP_368_TRIO3D_2X) { par->chip == CHIP_368_TRIO3D_2X) {
...@@ -1012,13 +1014,13 @@ static int __devinit s3_pci_probe(struct pci_dev *dev, const struct pci_device_i ...@@ -1012,13 +1014,13 @@ static int __devinit s3_pci_probe(struct pci_dev *dev, const struct pci_device_i
info->fix.smem_len = info->screen_size; info->fix.smem_len = info->screen_size;
/* Find MCLK frequency */ /* Find MCLK frequency */
regval = vga_rseq(NULL, 0x10); regval = vga_rseq(par->state.vgabase, 0x10);
par->mclk_freq = ((vga_rseq(NULL, 0x11) + 2) * 14318) / ((regval & 0x1F) + 2); par->mclk_freq = ((vga_rseq(par->state.vgabase, 0x11) + 2) * 14318) / ((regval & 0x1F) + 2);
par->mclk_freq = par->mclk_freq >> (regval >> 5); par->mclk_freq = par->mclk_freq >> (regval >> 5);
/* Restore locks */ /* Restore locks */
vga_wcrt(NULL, 0x38, cr38); vga_wcrt(par->state.vgabase, 0x38, cr38);
vga_wcrt(NULL, 0x39, cr39); vga_wcrt(par->state.vgabase, 0x39, cr39);
strcpy(info->fix.id, s3_names [par->chip]); strcpy(info->fix.id, s3_names [par->chip]);
info->fix.mmio_start = 0; info->fix.mmio_start = 0;
...@@ -1054,8 +1056,8 @@ static int __devinit s3_pci_probe(struct pci_dev *dev, const struct pci_device_i ...@@ -1054,8 +1056,8 @@ static int __devinit s3_pci_probe(struct pci_dev *dev, const struct pci_device_i
if (par->chip == CHIP_UNKNOWN) if (par->chip == CHIP_UNKNOWN)
printk(KERN_INFO "fb%d: unknown chip, CR2D=%x, CR2E=%x, CRT2F=%x, CRT30=%x\n", printk(KERN_INFO "fb%d: unknown chip, CR2D=%x, CR2E=%x, CRT2F=%x, CRT30=%x\n",
info->node, vga_rcrt(NULL, 0x2d), vga_rcrt(NULL, 0x2e), info->node, vga_rcrt(par->state.vgabase, 0x2d), vga_rcrt(par->state.vgabase, 0x2e),
vga_rcrt(NULL, 0x2f), vga_rcrt(NULL, 0x30)); vga_rcrt(par->state.vgabase, 0x2f), vga_rcrt(par->state.vgabase, 0x30));
/* Record a reference to the driver data */ /* Record a reference to the driver data */
pci_set_drvdata(dev, info); pci_set_drvdata(dev, info);
......
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