diff for duplicates of <201102202040.48219.linux@rainbow-software.org> diff --git a/a/1.txt b/N1/1.txt index 3e9517c..16a7b8d 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -36,28 +36,28 @@ Signed-off-by: Ondrej Zary <linux@rainbow-software.org> int rv; - rv = svga_compute_pll(&s3_pll, 1000000000 / pixclock, &m, &n, &r, info->node); -+ rv = svga_compute_pll((par->chip = CHIP_365_TRIO3D) ? &s3_trio3d_pll : &s3_pll, ++ rv = svga_compute_pll((par->chip == CHIP_365_TRIO3D) ? &s3_trio3d_pll : &s3_pll, + 1000000000 / pixclock, &m, &n, &r, info->node); if (rv < 0) { printk(KERN_ERR "fb%d: cannot set requested pixclock, keeping old value\n", info->node); return; @@ -598,7 +603,8 @@ static int s3fb_set_par(struct fb_info * - if (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_365_TRIO3D) { + if (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_365_TRIO3D) { 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); @@ -1012,13 +1018,15 @@ static int __devinit s3_pci_probe(struct regval = vga_rcrt(par->state.vgabase, 0x36); - if (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_365_TRIO3D) { + if (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_365_TRIO3D) { switch ((regval & 0xE0) >> 5) { case 0: /* 8MB -- only 4MB usable for display */ case 1: /* 4MB with 32-bit bus */ diff --git a/a/content_digest b/N1/content_digest index 28cd3d9..266ff5b 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 support for 86C365 Trio3D\0" - "Date\0Sun, 20 Feb 2011 19:40:44 +0000\0" + "Date\0Sun, 20 Feb 2011 20:40:44 +0100\0" "To\0Ondrej Zajicek <santiago@crfreenet.org>\0" "Cc\0linux-fbdev@vger.kernel.org" Kernel development list <linux-kernel@vger.kernel.org> @@ -45,28 +45,28 @@ " \tint rv;\n" " \n" "-\trv = svga_compute_pll(&s3_pll, 1000000000 / pixclock, &m, &n, &r, info->node);\n" - "+\trv = svga_compute_pll((par->chip = CHIP_365_TRIO3D) ? &s3_trio3d_pll : &s3_pll,\n" + "+\trv = svga_compute_pll((par->chip == CHIP_365_TRIO3D) ? &s3_trio3d_pll : &s3_pll,\n" "+\t\t\t 1000000000 / pixclock, &m, &n, &r, info->node);\n" " \tif (rv < 0) {\n" " \t\tprintk(KERN_ERR \"fb%d: cannot set requested pixclock, keeping old value\\n\", info->node);\n" " \t\treturn;\n" "@@ -598,7 +603,8 @@ static int s3fb_set_par(struct fb_info *\n" " \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_368_TRIO3D_2X ||\n" - "+\t par->chip = CHIP_365_TRIO3D) {\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_368_TRIO3D_2X ||\n" + "+\t par->chip == CHIP_365_TRIO3D) {\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" "@@ -1012,13 +1018,15 @@ static int __devinit s3_pci_probe(struct\n" " \tregval = vga_rcrt(par->state.vgabase, 0x36);\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_368_TRIO3D_2X ||\n" - "+\t par->chip = CHIP_365_TRIO3D) {\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_368_TRIO3D_2X ||\n" + "+\t par->chip == CHIP_365_TRIO3D) {\n" " \t\tswitch ((regval & 0xE0) >> 5) {\n" " \t\tcase 0: /* 8MB -- only 4MB usable for display */\n" " \t\tcase 1: /* 4MB with 32-bit bus */\n" @@ -90,4 +90,4 @@ "-- \n" Ondrej Zary -bf9a9e387c4777da9b7f009ccdcdc356fa4e65aae156afb81afb3bcbc3f2e783 +b4b14970af54cde94de81e6efdd8d2ede1f68c134f9ad017db9ee64e7085117a
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.