diff for duplicates of <201207012123.38236.linux@rainbow-software.org> diff --git a/a/1.txt b/N1/1.txt index 88e9f06..09f0b1a 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -28,20 +28,20 @@ Signed-off-by: Ondrej Zary <linux@rainbow-software.org> @@ -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 @@ -56,32 +56,32 @@ Signed-off-by: Ondrej Zary <linux@rainbow-software.org> 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); @@ -108,10 +108,10 @@ Signed-off-by: Ondrej Zary <linux@rainbow-software.org> @@ -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 83e78f4..f7675bc 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0Ondrej Zary <linux@rainbow-software.org>\0" "Subject\0[PATCH] s3fb: Add Virge/MX (86C260)\0" - "Date\0Sun, 01 Jul 2012 19:23:33 +0000\0" + "Date\0Sun, 1 Jul 2012 21:23:33 +0200\0" "To\0Florian Tobias Schandinat <FlorianSchandinat@gmx.de>\0" "Cc\0Ondrej Zajicek <santiago@crfreenet.org>" linux-fbdev@vger.kernel.org @@ -37,20 +37,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" @@ -65,32 +65,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" @@ -117,10 +117,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" @@ -136,4 +136,4 @@ "-- \n" Ondrej Zary -1b97b811befb501df3fa126f3db8f81da1bc6d2dbe2365ae3752d9c869c1c313 +392aa8e05c50dd5f6f3871fca98bde88004a0b33f7685b4472690462ac16f758
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.