diff for duplicates of <201103292107.11969.linux@rainbow-software.org> diff --git a/a/1.txt b/N1/1.txt index 883a17c..9ca986f 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -4,13 +4,13 @@ Fix Virge/GX2 support in s3fb: - drive it the same way as Trio3D/2X The original IDs most likely came from S3 website which claims that: -- 356 is Virge/GX2 with IDŠ10, driver included in Windows 2K, XP -- 357 is Virge/GX2+ with IDŠ11, driver included in Windows ME -- 359 is Virge/GX2+ with IDŠ12, driver included in Windows ME +- 356 is Virge/GX2 with ID=8A10, driver included in Windows 2K, XP +- 357 is Virge/GX2+ with ID=8A11, driver included in Windows ME +- 359 is Virge/GX2+ with ID=8A12, driver included in Windows ME but: - google search for 86C356 only reveals references to Trio3D (probably because of a typo - Trio3D is 86C365) -- my card is clearly marked as 86C357, Virge/GX2 and has IDŠ10 +- my card is clearly marked as 86C357, Virge/GX2 and has ID=8A10 - there is no driver for IDs 8A11 and 8A12 in Windows ME - there is a driver for ID 8A10 in Windows ME that says it's GX2 (357) @@ -48,12 +48,12 @@ Signed-off-by: Ondrej Zary <linux@rainbow-software.org> vga_w(par->state.vgabase, VGA_MIS_W, regval | VGA_MIS_ENB_PLL_LOAD); /* Set S3 clock registers */ -- if (par->chip = CHIP_360_TRIO3D_1X || -+ if (par->chip = CHIP_357_VIRGE_GX2 || -+ par->chip = CHIP_359_VIRGE_GX2P || -+ par->chip = CHIP_360_TRIO3D_1X || - par->chip = CHIP_362_TRIO3D_2X || - par->chip = CHIP_368_TRIO3D_2X) { +- if (par->chip == CHIP_360_TRIO3D_1X || ++ if (par->chip == CHIP_357_VIRGE_GX2 || ++ par->chip == CHIP_359_VIRGE_GX2P || ++ par->chip == CHIP_360_TRIO3D_1X || + par->chip == CHIP_362_TRIO3D_2X || + par->chip == CHIP_368_TRIO3D_2X) { vga_wseq(par->state.vgabase, 0x12, (n - 2) | ((r & 3) << 6)); /* n and two bits of r */ @@ -560,7 +561,9 @@ static int s3fb_set_par(struct fb_info * pr_debug("fb%d: offset register : %d\n", info->node, offset_value); @@ -70,32 +70,32 @@ Signed-off-by: Ondrej Zary <linux@rainbow-software.org> vga_wcrt(par->state.vgabase, 0x66, 0x90); } -- if (par->chip = CHIP_360_TRIO3D_1X || -+ if (par->chip = CHIP_357_VIRGE_GX2 || -+ 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_365_TRIO3D || +- if (par->chip == CHIP_360_TRIO3D_1X || ++ if (par->chip == CHIP_357_VIRGE_GX2 || ++ 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_365_TRIO3D || @@ -617,8 +622,7 @@ static int s3fb_set_par(struct fb_info * vga_wcrt(par->state.vgabase, 0x66, 0x81); } -- if (par->chip = CHIP_356_VIRGE_GX2 || -- par->chip = CHIP_357_VIRGE_GX2P || -+ if (par->chip = CHIP_357_VIRGE_GX2 || - par->chip = CHIP_359_VIRGE_GX2P || - par->chip = CHIP_360_TRIO3D_1X || - par->chip = CHIP_362_TRIO3D_2X || +- if (par->chip == CHIP_356_VIRGE_GX2 || +- par->chip == CHIP_357_VIRGE_GX2P || ++ if (par->chip == CHIP_357_VIRGE_GX2 || + par->chip == CHIP_359_VIRGE_GX2P || + par->chip == CHIP_360_TRIO3D_1X || + par->chip == CHIP_362_TRIO3D_2X || @@ -674,6 +678,8 @@ static int s3fb_set_par(struct fb_info * pr_debug("fb%d: 8 bit pseudocolor\n", info->node); svga_wcrt_mask(par->state.vgabase, 0x50, 0x00, 0x30); if (info->var.pixclock > 20000 || -+ par->chip = CHIP_357_VIRGE_GX2 || -+ 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_357_VIRGE_GX2 || ++ par->chip == CHIP_359_VIRGE_GX2P || + par->chip == CHIP_360_TRIO3D_1X || + par->chip == CHIP_362_TRIO3D_2X || + par->chip == CHIP_368_TRIO3D_2X) @@ -702,7 +708,9 @@ static int s3fb_set_par(struct fb_info * } else { svga_wcrt_mask(par->state.vgabase, 0x50, 0x10, 0x30); @@ -122,8 +122,8 @@ Signed-off-by: Ondrej Zary <linux@rainbow-software.org> info->screen_size = 2 << 20; break; } -+ } else if (par->chip = CHIP_357_VIRGE_GX2 || -+ par->chip = CHIP_359_VIRGE_GX2P) { ++ } else if (par->chip == CHIP_357_VIRGE_GX2 || ++ par->chip == CHIP_359_VIRGE_GX2P) { + switch ((regval & 0xC0) >> 6) { + case 1: /* 4MB */ + info->screen_size = 4 << 20; diff --git a/a/content_digest b/N1/content_digest index b02da52..1401116 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: fix Virge/GX2\0" - "Date\0Tue, 29 Mar 2011 19:07:08 +0000\0" + "Date\0Tue, 29 Mar 2011 21:07:08 +0200\0" "To\0Ondrej Zajicek <santiago@crfreenet.org>\0" "Cc\0linux-fbdev@vger.kernel.org" Kernel development list <linux-kernel@vger.kernel.org> @@ -13,13 +13,13 @@ "- drive it the same way as Trio3D/2X\n" "\n" "The original IDs most likely came from S3 website which claims that:\n" - "- 356 is Virge/GX2 with ID\305\24010, driver included in Windows 2K, XP\n" - "- 357 is Virge/GX2+ with ID\305\24011, driver included in Windows ME\n" - "- 359 is Virge/GX2+ with ID\305\24012, driver included in Windows ME\n" + "- 356 is Virge/GX2 with ID=8A10, driver included in Windows 2K, XP\n" + "- 357 is Virge/GX2+ with ID=8A11, driver included in Windows ME\n" + "- 359 is Virge/GX2+ with ID=8A12, driver included in Windows ME\n" "but:\n" "- google search for 86C356 only reveals references to Trio3D (probably\n" "because of a typo - Trio3D is 86C365)\n" - "- my card is clearly marked as 86C357, Virge/GX2 and has ID\305\24010\n" + "- my card is clearly marked as 86C357, Virge/GX2 and has ID=8A10\n" "- there is no driver for IDs 8A11 and 8A12 in Windows ME\n" "- there is a driver for ID 8A10 in Windows ME that says it's GX2 (357)\n" "\n" @@ -57,12 +57,12 @@ " \tvga_w(par->state.vgabase, VGA_MIS_W, regval | VGA_MIS_ENB_PLL_LOAD);\n" " \n" " \t/* Set S3 clock registers */\n" - "-\tif (par->chip = CHIP_360_TRIO3D_1X ||\n" - "+\tif (par->chip = CHIP_357_VIRGE_GX2 ||\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" + "-\tif (par->chip == CHIP_360_TRIO3D_1X ||\n" + "+\tif (par->chip == CHIP_357_VIRGE_GX2 ||\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\tvga_wseq(par->state.vgabase, 0x12, (n - 2) | ((r & 3) << 6));\t/* n and two bits of r */\n" "@@ -560,7 +561,9 @@ static int s3fb_set_par(struct fb_info *\n" " \tpr_debug(\"fb%d: offset register : %d\\n\", info->node, offset_value);\n" @@ -79,32 +79,32 @@ " \t\tvga_wcrt(par->state.vgabase, 0x66, 0x90);\n" " \t}\n" " \n" - "-\tif (par->chip = CHIP_360_TRIO3D_1X ||\n" - "+\tif (par->chip = CHIP_357_VIRGE_GX2 ||\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_365_TRIO3D ||\n" + "-\tif (par->chip == CHIP_360_TRIO3D_1X ||\n" + "+\tif (par->chip == CHIP_357_VIRGE_GX2 ||\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_365_TRIO3D ||\n" "@@ -617,8 +622,7 @@ static int s3fb_set_par(struct fb_info *\n" " \t\tvga_wcrt(par->state.vgabase, 0x66, 0x81);\n" " \t}\n" " \n" - "-\tif (par->chip = CHIP_356_VIRGE_GX2 ||\n" - "-\t par->chip = CHIP_357_VIRGE_GX2P ||\n" - "+\tif (par->chip = CHIP_357_VIRGE_GX2 ||\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" + "-\tif (par->chip == CHIP_356_VIRGE_GX2 ||\n" + "-\t par->chip == CHIP_357_VIRGE_GX2P ||\n" + "+\tif (par->chip == CHIP_357_VIRGE_GX2 ||\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" "@@ -674,6 +678,8 @@ static int s3fb_set_par(struct fb_info *\n" " \t\tpr_debug(\"fb%d: 8 bit pseudocolor\\n\", info->node);\n" " \t\tsvga_wcrt_mask(par->state.vgabase, 0x50, 0x00, 0x30);\n" " \t\tif (info->var.pixclock > 20000 ||\n" - "+\t\t par->chip = CHIP_357_VIRGE_GX2 ||\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_357_VIRGE_GX2 ||\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" "@@ -702,7 +708,9 @@ static int s3fb_set_par(struct fb_info *\n" " \t\t} else {\n" " \t\t\tsvga_wcrt_mask(par->state.vgabase, 0x50, 0x10, 0x30);\n" @@ -131,8 +131,8 @@ " \t\t\tinfo->screen_size = 2 << 20;\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} else if (par->chip == CHIP_357_VIRGE_GX2 ||\n" + "+\t\t par->chip == CHIP_359_VIRGE_GX2P) {\n" "+\t\tswitch ((regval & 0xC0) >> 6) {\n" "+\t\tcase 1: /* 4MB */\n" "+\t\t\tinfo->screen_size = 4 << 20;\n" @@ -159,4 +159,4 @@ "-- \n" Ondrej Zary -fa7761f8dce88897e38db9ef5bbfa5f3ba6a1b302a66e5e964020e14ae357f2b +bf0ae39e51a4a6ecd032d474d39c3b423a0e30ce52c44c82a117da9d9b340484
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.