diff for duplicates of <4FFA03B2.90308@gmx.de> diff --git a/a/1.txt b/N1/1.txt index b7de53c..4370d5c 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -37,20 +37,20 @@ Florian Tobias Schandinat > @@ -280,7 +281,8 @@ static int __devinit s3fb_setup_ddc_bus(struct fb_info *info) > */ > /* vga_wseq(par->state.vgabase, 0x08, 0x06); - not needed, already unlocked */ -> if (par->chip = CHIP_357_VIRGE_GX2 || -> - par->chip = CHIP_359_VIRGE_GX2P) -> + par->chip = CHIP_359_VIRGE_GX2P || -> + par->chip = CHIP_260_VIRGE_MX) +> if (par->chip == CHIP_357_VIRGE_GX2 || +> - par->chip == CHIP_359_VIRGE_GX2P) +> + par->chip == CHIP_359_VIRGE_GX2P || +> + par->chip == CHIP_260_VIRGE_MX) > svga_wseq_mask(par->state.vgabase, 0x0d, 0x01, 0x03); > else > svga_wseq_mask(par->state.vgabase, 0x0d, 0x00, 0x03); > @@ -487,7 +489,8 @@ static void s3_set_pixclock(struct fb_info *info, u32 pixclock) -> par->chip = CHIP_359_VIRGE_GX2P || -> par->chip = CHIP_360_TRIO3D_1X || -> par->chip = CHIP_362_TRIO3D_2X || -> - par->chip = CHIP_368_TRIO3D_2X) { -> + par->chip = CHIP_368_TRIO3D_2X || -> + par->chip = CHIP_260_VIRGE_MX) { +> par->chip == CHIP_359_VIRGE_GX2P || +> par->chip == CHIP_360_TRIO3D_1X || +> par->chip == CHIP_362_TRIO3D_2X || +> - par->chip == CHIP_368_TRIO3D_2X) { +> + par->chip == CHIP_368_TRIO3D_2X || +> + par->chip == CHIP_260_VIRGE_MX) { > vga_wseq(par->state.vgabase, 0x12, (n - 2) | ((r & 3) << 6)); /* n and two bits of r */ > vga_wseq(par->state.vgabase, 0x29, r >> 2); /* remaining highest bit of r */ > } else @@ -65,32 +65,32 @@ Florian Tobias Schandinat > vga_wcrt(par->state.vgabase, 0x60, 0xff); /* N parameter */ > vga_wcrt(par->state.vgabase, 0x61, 0xff); /* L parameter */ > @@ -739,7 +743,8 @@ static int s3fb_set_par(struct fb_info *info) -> par->chip = CHIP_368_TRIO3D_2X || -> par->chip = CHIP_365_TRIO3D || -> par->chip = CHIP_375_VIRGE_DX || -> - par->chip = CHIP_385_VIRGE_GX) { -> + par->chip = CHIP_385_VIRGE_GX || -> + par->chip = CHIP_260_VIRGE_MX) { +> par->chip == CHIP_368_TRIO3D_2X || +> par->chip == CHIP_365_TRIO3D || +> par->chip == CHIP_375_VIRGE_DX || +> - par->chip == CHIP_385_VIRGE_GX) { +> + par->chip == CHIP_385_VIRGE_GX || +> + par->chip == CHIP_260_VIRGE_MX) { > dbytes = info->var.xres * ((bpp+7)/8); > vga_wcrt(par->state.vgabase, 0x91, (dbytes + 7) / 8); > vga_wcrt(par->state.vgabase, 0x90, (((dbytes + 7) / 8) >> 8) | 0x80); > @@ -751,7 +756,8 @@ static int s3fb_set_par(struct fb_info *info) -> par->chip = CHIP_359_VIRGE_GX2P || -> par->chip = CHIP_360_TRIO3D_1X || -> par->chip = CHIP_362_TRIO3D_2X || -> - par->chip = CHIP_368_TRIO3D_2X) -> + par->chip = CHIP_368_TRIO3D_2X || -> + par->chip = CHIP_260_VIRGE_MX) +> par->chip == CHIP_359_VIRGE_GX2P || +> par->chip == CHIP_360_TRIO3D_1X || +> par->chip == CHIP_362_TRIO3D_2X || +> - par->chip == CHIP_368_TRIO3D_2X) +> + par->chip == CHIP_368_TRIO3D_2X || +> + par->chip == CHIP_260_VIRGE_MX) > vga_wcrt(par->state.vgabase, 0x34, 0x00); > else /* enable Data Transfer Position Control (DTPC) */ > vga_wcrt(par->state.vgabase, 0x34, 0x10); > @@ -807,7 +813,8 @@ static int s3fb_set_par(struct fb_info *info) -> par->chip = CHIP_359_VIRGE_GX2P || -> par->chip = CHIP_360_TRIO3D_1X || -> par->chip = CHIP_362_TRIO3D_2X || -> - par->chip = CHIP_368_TRIO3D_2X) -> + par->chip = CHIP_368_TRIO3D_2X || -> + par->chip = CHIP_260_VIRGE_MX) +> par->chip == CHIP_359_VIRGE_GX2P || +> par->chip == CHIP_360_TRIO3D_1X || +> par->chip == CHIP_362_TRIO3D_2X || +> - par->chip == CHIP_368_TRIO3D_2X) +> + par->chip == CHIP_368_TRIO3D_2X || +> + par->chip == CHIP_260_VIRGE_MX) > svga_wcrt_mask(par->state.vgabase, 0x67, 0x00, 0xF0); > else { > svga_wcrt_mask(par->state.vgabase, 0x67, 0x10, 0xF0); @@ -117,10 +117,10 @@ Florian Tobias Schandinat > @@ -1208,7 +1217,8 @@ static int __devinit s3_pci_probe(struct pci_dev *dev, const struct pci_device_i > break; > } -> } else if (par->chip = CHIP_357_VIRGE_GX2 || -> - par->chip = CHIP_359_VIRGE_GX2P) { -> + par->chip = CHIP_359_VIRGE_GX2P || -> + par->chip = CHIP_260_VIRGE_MX) { +> } else if (par->chip == CHIP_357_VIRGE_GX2 || +> - par->chip == CHIP_359_VIRGE_GX2P) { +> + par->chip == CHIP_359_VIRGE_GX2P || +> + par->chip == CHIP_260_VIRGE_MX) { > switch ((regval & 0xC0) >> 6) { > case 1: /* 4MB */ > info->screen_size = 4 << 20; diff --git a/a/content_digest b/N1/content_digest index 6414748..e64c6d8 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -47,20 +47,20 @@ "> @@ -280,7 +281,8 @@ static int __devinit s3fb_setup_ddc_bus(struct fb_info *info)\n" "> \t */\n" "> /*\tvga_wseq(par->state.vgabase, 0x08, 0x06); - not needed, already unlocked */\n" - "> \tif (par->chip = CHIP_357_VIRGE_GX2 ||\n" - "> -\t par->chip = CHIP_359_VIRGE_GX2P)\n" - "> +\t par->chip = CHIP_359_VIRGE_GX2P ||\n" - "> +\t par->chip = CHIP_260_VIRGE_MX)\n" + "> \tif (par->chip == CHIP_357_VIRGE_GX2 ||\n" + "> -\t par->chip == CHIP_359_VIRGE_GX2P)\n" + "> +\t par->chip == CHIP_359_VIRGE_GX2P ||\n" + "> +\t par->chip == CHIP_260_VIRGE_MX)\n" "> \t\tsvga_wseq_mask(par->state.vgabase, 0x0d, 0x01, 0x03);\n" "> \telse\n" "> \t\tsvga_wseq_mask(par->state.vgabase, 0x0d, 0x00, 0x03);\n" "> @@ -487,7 +489,8 @@ static void s3_set_pixclock(struct fb_info *info, u32 pixclock)\n" - "> \t par->chip = CHIP_359_VIRGE_GX2P ||\n" - "> \t par->chip = CHIP_360_TRIO3D_1X ||\n" - "> \t par->chip = CHIP_362_TRIO3D_2X ||\n" - "> -\t par->chip = CHIP_368_TRIO3D_2X) {\n" - "> +\t par->chip = CHIP_368_TRIO3D_2X ||\n" - "> +\t par->chip = CHIP_260_VIRGE_MX) {\n" + "> \t par->chip == CHIP_359_VIRGE_GX2P ||\n" + "> \t par->chip == CHIP_360_TRIO3D_1X ||\n" + "> \t par->chip == CHIP_362_TRIO3D_2X ||\n" + "> -\t par->chip == CHIP_368_TRIO3D_2X) {\n" + "> +\t par->chip == CHIP_368_TRIO3D_2X ||\n" + "> +\t par->chip == CHIP_260_VIRGE_MX) {\n" "> \t\tvga_wseq(par->state.vgabase, 0x12, (n - 2) | ((r & 3) << 6));\t/* n and two bits of r */\n" "> \t\tvga_wseq(par->state.vgabase, 0x29, r >> 2); /* remaining highest bit of r */\n" "> \t} else\n" @@ -75,32 +75,32 @@ "> \t\tvga_wcrt(par->state.vgabase, 0x60, 0xff); /* N parameter */\n" "> \t\tvga_wcrt(par->state.vgabase, 0x61, 0xff); /* L parameter */\n" "> @@ -739,7 +743,8 @@ static int s3fb_set_par(struct fb_info *info)\n" - "> \t par->chip = CHIP_368_TRIO3D_2X ||\n" - "> \t par->chip = CHIP_365_TRIO3D ||\n" - "> \t par->chip = CHIP_375_VIRGE_DX ||\n" - "> -\t par->chip = CHIP_385_VIRGE_GX) {\n" - "> +\t par->chip = CHIP_385_VIRGE_GX ||\n" - "> +\t par->chip = CHIP_260_VIRGE_MX) {\n" + "> \t par->chip == CHIP_368_TRIO3D_2X ||\n" + "> \t par->chip == CHIP_365_TRIO3D ||\n" + "> \t par->chip == CHIP_375_VIRGE_DX ||\n" + "> -\t par->chip == CHIP_385_VIRGE_GX) {\n" + "> +\t par->chip == CHIP_385_VIRGE_GX ||\n" + "> +\t par->chip == CHIP_260_VIRGE_MX) {\n" "> \t\tdbytes = info->var.xres * ((bpp+7)/8);\n" "> \t\tvga_wcrt(par->state.vgabase, 0x91, (dbytes + 7) / 8);\n" "> \t\tvga_wcrt(par->state.vgabase, 0x90, (((dbytes + 7) / 8) >> 8) | 0x80);\n" "> @@ -751,7 +756,8 @@ static int s3fb_set_par(struct fb_info *info)\n" - "> \t par->chip = CHIP_359_VIRGE_GX2P ||\n" - "> \t par->chip = CHIP_360_TRIO3D_1X ||\n" - "> \t par->chip = CHIP_362_TRIO3D_2X ||\n" - "> -\t par->chip = CHIP_368_TRIO3D_2X)\n" - "> +\t par->chip = CHIP_368_TRIO3D_2X ||\n" - "> +\t par->chip = CHIP_260_VIRGE_MX)\n" + "> \t par->chip == CHIP_359_VIRGE_GX2P ||\n" + "> \t par->chip == CHIP_360_TRIO3D_1X ||\n" + "> \t par->chip == CHIP_362_TRIO3D_2X ||\n" + "> -\t par->chip == CHIP_368_TRIO3D_2X)\n" + "> +\t par->chip == CHIP_368_TRIO3D_2X ||\n" + "> +\t par->chip == CHIP_260_VIRGE_MX)\n" "> \t\tvga_wcrt(par->state.vgabase, 0x34, 0x00);\n" "> \telse\t/* enable Data Transfer Position Control (DTPC) */\n" "> \t\tvga_wcrt(par->state.vgabase, 0x34, 0x10);\n" "> @@ -807,7 +813,8 @@ static int s3fb_set_par(struct fb_info *info)\n" - "> \t\t par->chip = CHIP_359_VIRGE_GX2P ||\n" - "> \t\t par->chip = CHIP_360_TRIO3D_1X ||\n" - "> \t\t par->chip = CHIP_362_TRIO3D_2X ||\n" - "> -\t\t par->chip = CHIP_368_TRIO3D_2X)\n" - "> +\t\t par->chip = CHIP_368_TRIO3D_2X ||\n" - "> +\t\t par->chip = CHIP_260_VIRGE_MX)\n" + "> \t\t par->chip == CHIP_359_VIRGE_GX2P ||\n" + "> \t\t par->chip == CHIP_360_TRIO3D_1X ||\n" + "> \t\t par->chip == CHIP_362_TRIO3D_2X ||\n" + "> -\t\t par->chip == CHIP_368_TRIO3D_2X)\n" + "> +\t\t par->chip == CHIP_368_TRIO3D_2X ||\n" + "> +\t\t par->chip == CHIP_260_VIRGE_MX)\n" "> \t\t\tsvga_wcrt_mask(par->state.vgabase, 0x67, 0x00, 0xF0);\n" "> \t\telse {\n" "> \t\t\tsvga_wcrt_mask(par->state.vgabase, 0x67, 0x10, 0xF0);\n" @@ -127,10 +127,10 @@ "> @@ -1208,7 +1217,8 @@ static int __devinit s3_pci_probe(struct pci_dev *dev, const struct pci_device_i\n" "> \t\t\tbreak;\n" "> \t\t}\n" - "> \t} else if (par->chip = CHIP_357_VIRGE_GX2 ||\n" - "> -\t\t par->chip = CHIP_359_VIRGE_GX2P) {\n" - "> +\t\t par->chip = CHIP_359_VIRGE_GX2P ||\n" - "> +\t\t par->chip = CHIP_260_VIRGE_MX) {\n" + "> \t} else if (par->chip == CHIP_357_VIRGE_GX2 ||\n" + "> -\t\t par->chip == CHIP_359_VIRGE_GX2P) {\n" + "> +\t\t par->chip == CHIP_359_VIRGE_GX2P ||\n" + "> +\t\t par->chip == CHIP_260_VIRGE_MX) {\n" "> \t\tswitch ((regval & 0xC0) >> 6) {\n" "> \t\tcase 1: /* 4MB */\n" "> \t\t\tinfo->screen_size = 4 << 20;\n" @@ -144,4 +144,4 @@ "> };\n" > -cfb96978342367dd89da507473ef743564bb48399e99fb973b4e4a5998305007 +3b2a3dac3170987d27be20883e57c6f23063a44b46a1aca10acaea04e1b74aaf
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.