diff for duplicates of <201104181214.57501.linux@rainbow-software.org> diff --git a/a/1.txt b/N1/1.txt index a5b4ec7..dfce5f9 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -70,9 +70,9 @@ Signed-off-by: Ondrej Zary <linux@rainbow-software.org> + +static bool s3fb_ddc_needs_mmio(int chip) +{ -+ return !(chip = CHIP_360_TRIO3D_1X || -+ chip = CHIP_362_TRIO3D_2X || -+ chip = CHIP_368_TRIO3D_2X); ++ return !(chip == CHIP_360_TRIO3D_1X || ++ chip == CHIP_362_TRIO3D_2X || ++ chip == CHIP_368_TRIO3D_2X); +} + +static u8 s3fb_ddc_read(struct s3fb_info *par) @@ -156,8 +156,8 @@ Signed-off-by: Ondrej Zary <linux@rainbow-software.org> + * DDC and extension pins - switch it do DDC + */ +/* vga_wseq(par->state.vgabase, 0x08, 0x06); - not needed, already unlocked */ -+ if (par->chip = CHIP_357_VIRGE_GX2 || -+ par->chip = CHIP_359_VIRGE_GX2P) ++ if (par->chip == CHIP_357_VIRGE_GX2 || ++ par->chip == CHIP_359_VIRGE_GX2P) + svga_wseq_mask(par->state.vgabase, 0x0d, 0x01, 0x03); + else + svga_wseq_mask(par->state.vgabase, 0x0d, 0x00, 0x03); @@ -199,7 +199,7 @@ Signed-off-by: Ondrej Zary <linux@rainbow-software.org> + info->fix.smem_start + MMIO_OFFSET); + } + if (!s3fb_ddc_needs_mmio(par->chip) || par->mmio) -+ if (s3fb_setup_ddc_bus(info) = 0) { ++ if (s3fb_setup_ddc_bus(info) == 0) { + u8 *edid = fb_ddc_read(&par->ddc_adapter); + par->ddc_registered = true; + if (edid) { @@ -217,7 +217,7 @@ Signed-off-by: Ondrej Zary <linux@rainbow-software.org> + if (m) { + fb_videomode_to_var(&info->var, m); + /* fill all other info->var's fields */ -+ if (s3fb_check_var(&info->var, info) = 0) ++ if (s3fb_check_var(&info->var, info) == 0) + found = true; + } + } @@ -229,14 +229,14 @@ Signed-off-by: Ondrej Zary <linux@rainbow-software.org> /* Prepare startup mode */ - rc = fb_find_mode(&(info->var), info, mode_option, NULL, 0, NULL, 8); -- if (! ((rc = 1) || (rc = 2))) { +- if (! ((rc == 1) || (rc == 2))) { - rc = -EINVAL; - dev_err(info->device, "mode %s not found\n", mode_option); + if (mode_option) { + rc = fb_find_mode(&info->var, info, mode_option, + info->monspecs.modedb, info->monspecs.modedb_len, + NULL, info->var.bits_per_pixel); -+ if (!rc || rc = 4) { ++ if (!rc || rc == 4) { + rc = -EINVAL; + dev_err(info->device, "mode %s not found\n", mode_option); + fb_destroy_modedb(info->monspecs.modedb); diff --git a/a/content_digest b/N1/content_digest index a632988..f41b6f0 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0Ondrej Zary <linux@rainbow-software.org>\0" "Subject\0[PATCH v4] [resend] s3fb: add DDC support\0" - "Date\0Mon, 18 Apr 2011 10:14:57 +0000\0" + "Date\0Mon, 18 Apr 2011 12:14:57 +0200\0" "To\0Paul Mundt <lethal@linux-sh.org>\0" "Cc\0Ondrej Zajicek <santiago@crfreenet.org>" linux-fbdev@vger.kernel.org @@ -79,9 +79,9 @@ "+\n" "+static bool s3fb_ddc_needs_mmio(int chip)\n" "+{\n" - "+\treturn !(chip = CHIP_360_TRIO3D_1X ||\n" - "+\t\t chip = CHIP_362_TRIO3D_2X ||\n" - "+\t\t chip = CHIP_368_TRIO3D_2X);\n" + "+\treturn !(chip == CHIP_360_TRIO3D_1X ||\n" + "+\t\t chip == CHIP_362_TRIO3D_2X ||\n" + "+\t\t chip == CHIP_368_TRIO3D_2X);\n" "+}\n" "+\n" "+static u8 s3fb_ddc_read(struct s3fb_info *par)\n" @@ -165,8 +165,8 @@ "+\t * DDC and extension pins - switch it do DDC\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" + "+\tif (par->chip == CHIP_357_VIRGE_GX2 ||\n" + "+\t par->chip == CHIP_359_VIRGE_GX2P)\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" @@ -208,7 +208,7 @@ "+\t\t\t\tinfo->fix.smem_start + MMIO_OFFSET);\n" "+\t}\n" "+\tif (!s3fb_ddc_needs_mmio(par->chip) || par->mmio)\n" - "+\t\tif (s3fb_setup_ddc_bus(info) = 0) {\n" + "+\t\tif (s3fb_setup_ddc_bus(info) == 0) {\n" "+\t\t\tu8 *edid = fb_ddc_read(&par->ddc_adapter);\n" "+\t\t\tpar->ddc_registered = true;\n" "+\t\t\tif (edid) {\n" @@ -226,7 +226,7 @@ "+\t\t\t\t\tif (m) {\n" "+\t\t\t\t\t\tfb_videomode_to_var(&info->var, m);\n" "+\t\t\t\t\t\t/* fill all other info->var's fields */\n" - "+\t\t\t\t\t\tif (s3fb_check_var(&info->var, info) = 0)\n" + "+\t\t\t\t\t\tif (s3fb_check_var(&info->var, info) == 0)\n" "+\t\t\t\t\t\t\tfound = true;\n" "+\t\t\t\t\t}\n" "+\t\t\t\t}\n" @@ -238,14 +238,14 @@ " \n" " \t/* Prepare startup mode */\n" "-\trc = fb_find_mode(&(info->var), info, mode_option, NULL, 0, NULL, 8);\n" - "-\tif (! ((rc = 1) || (rc = 2))) {\n" + "-\tif (! ((rc == 1) || (rc == 2))) {\n" "-\t\trc = -EINVAL;\n" "-\t\tdev_err(info->device, \"mode %s not found\\n\", mode_option);\n" "+\tif (mode_option) {\n" "+\t\trc = fb_find_mode(&info->var, info, mode_option,\n" "+\t\t\t\t info->monspecs.modedb, info->monspecs.modedb_len,\n" "+\t\t\t\t NULL, info->var.bits_per_pixel);\n" - "+\t\tif (!rc || rc = 4) {\n" + "+\t\tif (!rc || rc == 4) {\n" "+\t\t\trc = -EINVAL;\n" "+\t\t\tdev_err(info->device, \"mode %s not found\\n\", mode_option);\n" "+\t\t\tfb_destroy_modedb(info->monspecs.modedb);\n" @@ -314,4 +314,4 @@ "-- \n" Ondrej Zary -4e539f2fb8beab070fafd75a019653db4e49d01c2ed7178aee98e6299509a11a +6821f4f8f0c3fa9df43f98da0f704355dab457ecc81b79fd17479767b63cf15f
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.