diff for duplicates of <201005202205.56845.linux@rainbow-software.org> diff --git a/a/1.txt b/N1/1.txt index c2a7236..4bf9b2e 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -43,9 +43,9 @@ Signed-off-by: Ondrej Zary <linux@rainbow-software.org> /* Set S3 clock registers */ - vga_wseq(NULL, 0x12, ((n - 2) | (r << 5))); -+ if (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 || ++ par->chip == CHIP_362_TRIO3D_2X || ++ par->chip == CHIP_368_TRIO3D_2X) { + vga_wseq(NULL, 0x12, (n - 2) | ((r & 3) << 6)); /* n and two bits of r */ + vga_wseq(NULL, 0x29, r >> 2); /* remaining highest bit of r */ + } else @@ -94,9 +94,9 @@ Signed-off-by: Ondrej Zary <linux@rainbow-software.org> vga_wcrt(NULL, 0x66, 0x90); } -+ if (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 || ++ par->chip == CHIP_362_TRIO3D_2X || ++ par->chip == CHIP_368_TRIO3D_2X) { + dbytes = info->var.xres * ((bpp+7)/8); + vga_wcrt(NULL, 0x91, (dbytes + 7) / 8); + vga_wcrt(NULL, 0x90, (((dbytes + 7) / 8) >> 8) | 0x80); @@ -115,9 +115,9 @@ Signed-off-by: Ondrej Zary <linux@rainbow-software.org> - svga_wcrt_mask(0x50, 0x00, 0x30); + svga_wcrt_mask(0x50, 0x00, 0x30); + if (info->var.pixclock > 20000 || -+ par->chip = CHIP_360_TRIO3D_1X || -+ par->chip = CHIP_362_TRIO3D_2X || -+ par->chip = CHIP_368_TRIO3D_2X) ++ par->chip == CHIP_360_TRIO3D_1X || ++ par->chip == CHIP_362_TRIO3D_2X || ++ par->chip == CHIP_368_TRIO3D_2X) svga_wcrt_mask(0x67, 0x00, 0xF0); - } else { - svga_wcrt_mask(0x50, 0x00, 0x30); @@ -153,7 +153,7 @@ Signed-off-by: Ondrej Zary <linux@rainbow-software.org> return CHIP_385_VIRGE_GX; } -+ if (chip = CHIP_36X_TRIO3D_1X_2X) { ++ if (chip == CHIP_36X_TRIO3D_1X_2X) { + switch(vga_rcrt(NULL, 0x2f)) { + case 0x00: + return CHIP_360_TRIO3D_1X; @@ -186,9 +186,9 @@ Signed-off-by: Ondrej Zary <linux@rainbow-software.org> + /* Find how many physical memory there is on card */ + /* 0x36 register is accessible even if other registers are locked */ + regval = vga_rcrt(NULL, 0x36); -+ if (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 || ++ par->chip == CHIP_362_TRIO3D_2X || ++ par->chip == CHIP_368_TRIO3D_2X) { + 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 9ae39ff..e71c3e0 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 S3 Trio3D/1X/2X\0" - "Date\0Thu, 20 May 2010 20:05:55 +0000\0" + "Date\0Thu, 20 May 2010 22:05:55 +0200\0" "To\0Ondrej Zajicek <santiago@crfreenet.org>\0" "Cc\0linux-fbdev@vger.kernel.org" " Kernel development list <linux-kernel@vger.kernel.org>\0" @@ -51,9 +51,9 @@ " \n" " \t/* Set S3 clock registers */\n" "-\tvga_wseq(NULL, 0x12, ((n - 2) | (r << 5)));\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" + "+\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\tvga_wseq(NULL, 0x12, (n - 2) | ((r & 3) << 6));\t/* n and two bits of r */\n" "+\t\tvga_wseq(NULL, 0x29, r >> 2); /* remaining highest bit of r */\n" "+\t} else\n" @@ -102,9 +102,9 @@ " \t\tvga_wcrt(NULL, 0x66, 0x90);\n" " \t}\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" + "+\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\tdbytes = info->var.xres * ((bpp+7)/8);\n" "+\t\tvga_wcrt(NULL, 0x91, (dbytes + 7) / 8);\n" "+\t\tvga_wcrt(NULL, 0x90, (((dbytes + 7) / 8) >> 8) | 0x80);\n" @@ -123,9 +123,9 @@ "-\t\t\tsvga_wcrt_mask(0x50, 0x00, 0x30);\n" "+\t\tsvga_wcrt_mask(0x50, 0x00, 0x30);\n" "+\t\tif (info->var.pixclock > 20000 ||\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_360_TRIO3D_1X ||\n" + "+\t\t par->chip == CHIP_362_TRIO3D_2X ||\n" + "+\t\t par->chip == CHIP_368_TRIO3D_2X)\n" " \t\t\tsvga_wcrt_mask(0x67, 0x00, 0xF0);\n" "-\t\t} else {\n" "-\t\t\tsvga_wcrt_mask(0x50, 0x00, 0x30);\n" @@ -161,7 +161,7 @@ " \t\t\treturn CHIP_385_VIRGE_GX;\n" " \t}\n" " \n" - "+\tif (chip = CHIP_36X_TRIO3D_1X_2X) {\n" + "+\tif (chip == CHIP_36X_TRIO3D_1X_2X) {\n" "+\t\tswitch(vga_rcrt(NULL, 0x2f)) {\n" "+\t\tcase 0x00:\n" "+\t\t\treturn CHIP_360_TRIO3D_1X;\n" @@ -194,9 +194,9 @@ "+\t/* Find how many physical memory there is on card */\n" "+\t/* 0x36 register is accessible even if other registers are locked */\n" "+\tregval = vga_rcrt(NULL, 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" + "+\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\tswitch((regval & 0xE0) >> 5) {\n" "+\t\tcase 0: /* 8MB -- only 4MB usable for display */\n" "+\t\tcase 1: /* 4MB with 32-bit bus */\n" @@ -226,4 +226,4 @@ "-- \n" Ondrej Zary -2fcef27643469eba418de9da56a0ef02d227f77534b8a915025a97444538cdb7 +c01e0bee4749ba47df2806b5adac0aaede7a09becaa8d4ac87c34aefb847e599
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.