diff for duplicates of <201103012018.37764.linux@rainbow-software.org> diff --git a/a/1.txt b/N1/1.txt index 16fac93..f3c09c0 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -23,13 +23,13 @@ Signed-off-by: Ondrej Zary <linux@rainbow-software.org> if (bpp != 0) { info->fix.ypanstep = 1; @@ -604,7 +607,9 @@ - if (par->chip = CHIP_360_TRIO3D_1X || - par->chip = CHIP_362_TRIO3D_2X || - par->chip = CHIP_368_TRIO3D_2X || -- par->chip = CHIP_365_TRIO3D) { -+ par->chip = CHIP_365_TRIO3D || -+ par->chip = CHIP_375_VIRGE_DX || -+ par->chip = CHIP_385_VIRGE_GX) { + if (par->chip == CHIP_360_TRIO3D_1X || + par->chip == CHIP_362_TRIO3D_2X || + par->chip == CHIP_368_TRIO3D_2X || +- par->chip == CHIP_365_TRIO3D) { ++ par->chip == CHIP_365_TRIO3D || ++ par->chip == CHIP_375_VIRGE_DX || ++ par->chip == CHIP_385_VIRGE_GX) { 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); @@ -37,12 +37,12 @@ Signed-off-by: Ondrej Zary <linux@rainbow-software.org> vga_wcrt(par->state.vgabase, 0x66, 0x81); } -+ if (par->chip = CHIP_356_VIRGE_GX2 || -+ par->chip = CHIP_357_VIRGE_GX2P || -+ 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_356_VIRGE_GX2 || ++ par->chip == CHIP_357_VIRGE_GX2P || ++ 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_wcrt(par->state.vgabase, 0x34, 0x00); + else /* enable Data Transfer Position Control (DTPC) */ + vga_wcrt(par->state.vgabase, 0x34, 0x10); diff --git a/a/content_digest b/N1/content_digest index bfe9b3a..5e8ec04 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0Ondrej Zary <linux@rainbow-software.org>\0" "Subject\0[PATCH 4/5]: s3fb: enable DTPC\0" - "Date\0Tue, 01 Mar 2011 19:18:35 +0000\0" + "Date\0Tue, 1 Mar 2011 20:18:35 +0100\0" "To\0Ondrej Zajicek <santiago@crfreenet.org>\0" "Cc\0linux-fbdev@vger.kernel.org" " Kernel development list <linux-kernel@vger.kernel.org>\0" @@ -31,13 +31,13 @@ " \tif (bpp != 0) {\n" " \t\tinfo->fix.ypanstep = 1;\n" "@@ -604,7 +607,9 @@\n" - " \tif (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" - "+\t par->chip = CHIP_365_TRIO3D ||\n" - "+\t par->chip = CHIP_375_VIRGE_DX ||\n" - "+\t par->chip = CHIP_385_VIRGE_GX) {\n" + " \tif (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" + "+\t par->chip == CHIP_365_TRIO3D ||\n" + "+\t par->chip == CHIP_375_VIRGE_DX ||\n" + "+\t par->chip == CHIP_385_VIRGE_GX) {\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" @@ -45,12 +45,12 @@ " \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" - "+\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_356_VIRGE_GX2 ||\n" + "+\t par->chip == CHIP_357_VIRGE_GX2P ||\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_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" @@ -80,4 +80,4 @@ "-- \n" Ondrej Zary -3c6bbb1a5f6619d48816b7a811a0151ecb2d58ca28dae41c0515461b574629fe +6411103260960aa946e7f1f747a2ad9f6587c3f4544ec7e23c58fb9b355708b9
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.