diff for duplicates of <201202101859.27975.linux@rainbow-software.org> diff --git a/a/1.txt b/N1/1.txt index 5b85c13..933052e 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -255,7 +255,7 @@ Changes in v5: + struct i740fb_par *par = info->par; + + mutex_lock(&(par->open_lock)); -+ if (par->ref_count = 0) { ++ if (par->ref_count == 0) { + printk(KERN_ERR "fb%d: release called with zero refcount\n", + info->node); + mutex_unlock(&(par->open_lock)); @@ -449,7 +449,8 @@ Changes in v5: + par->video_clk2_n = (n_best - 2) & 0xFF; + par->video_clk2_mn_msbs = ((((n_best - 2) >> 4) & VCO_N_MSBS) + | (((m_best - 2) >> 8) & VCO_M_MSBS)); -+ par->video_clk2_div_sel + ((p_best << 4) | (d_best ? 4 : 0) | REF_DIV_1); ++ par->video_clk2_div_sel = ++ ((p_best << 4) | (d_best ? 4 : 0) | REF_DIV_1); +} + +static int i740fb_decode_var(const struct fb_var_screeninfo *var, @@ -601,7 +602,8 @@ Changes in v5: + } + + /* disabled IRQ */ -+ par->crtc[VGA_CRTC_V_SYNC_END] + ((yres + lower - 1 + vslen) & 0x0F) & ~0x10; ++ par->crtc[VGA_CRTC_V_SYNC_END] = ++ ((yres + lower - 1 + vslen) & 0x0F) & ~0x10; + /* 0x7F for VGA, but some SVGA chips require all 8 bits to be set */ + par->crtc[VGA_CRTC_V_BLANK_END] = (yres + lower - 1 + vslen) & 0xFF; + @@ -650,7 +652,7 @@ Changes in v5: + break; + case 15: /* 0rrrrrgg gggbbbbb */ + case 16: /* rrrrrggg gggbbbbb */ -+ par->pixelpipe_cfg1 = (var->green.length = 6) ? ++ par->pixelpipe_cfg1 = (var->green.length == 6) ? + DISPLAY_16BPP_MODE : DISPLAY_15BPP_MODE; + par->crtc[VGA_CRTC_OFFSET] = vxres >> 2; + par->ext_offset = vxres >> 10; @@ -676,7 +678,8 @@ Changes in v5: + + par->crtc[VGA_CRTC_START_LO] = base & 0x000000FF; + par->crtc[VGA_CRTC_START_HI] = (base & 0x0000FF00) >> 8; -+ par->ext_start_addr + ((base & 0x003F0000) >> 16) | EXT_START_ADDR_ENABLE; ++ par->ext_start_addr = ++ ((base & 0x003F0000) >> 16) | EXT_START_ADDR_ENABLE; + par->ext_start_addr_hi = (base & 0x3FC00000) >> 22; + + par->pixelpipe_cfg0 = DAC_8_BIT; @@ -709,7 +712,8 @@ Changes in v5: + par->misc |= 0x0C; + + /* Calculate the FIFO Watermark and Burst Length. */ -+ par->lmi_fifo_watermark + i740_calc_fifo(par, 1000000 / var->pixclock, bpp); ++ par->lmi_fifo_watermark = ++ i740_calc_fifo(par, 1000000 / var->pixclock, bpp); + + return 0; +} @@ -906,8 +910,9 @@ Changes in v5: + mdelay(50); + vga_unprotect(par); + -+ info->fix.line_length + info->var.xres_virtual * info->var.bits_per_pixel / 8; -+ if (info->var.bits_per_pixel = 8) ++ info->fix.line_length = ++ info->var.xres_virtual * info->var.bits_per_pixel / 8; ++ if (info->var.bits_per_pixel == 8) + info->fix.visual = FB_VISUAL_PSEUDOCOLOR; + else + info->fix.visual = FB_VISUAL_TRUECOLOR; @@ -984,7 +989,8 @@ Changes in v5: + par->crtc[VGA_CRTC_START_LO] = base & 0x000000FF; + par->crtc[VGA_CRTC_START_HI] = (base & 0x0000FF00) >> 8; + par->ext_start_addr_hi = (base & 0x3FC00000) >> 22; -+ par->ext_start_addr + ((base & 0x003F0000) >> 16) | EXT_START_ADDR_ENABLE; ++ par->ext_start_addr = ++ ((base & 0x003F0000) >> 16) | EXT_START_ADDR_ENABLE; + + i740outreg(par, VGA_CRT_IC, VGA_CRTC_START_LO, base & 0x000000FF); + i740outreg(par, VGA_CRT_IC, VGA_CRTC_START_HI, @@ -1035,7 +1041,7 @@ Changes in v5: + i740outreg(par, XRX, DPMS_SYNC_SELECT, DPMSSyncSelect); + + /* Let fbcon do a soft blank for us */ -+ return (blank_mode = FB_BLANK_NORMAL) ? 1 : 0; ++ return (blank_mode == FB_BLANK_NORMAL) ? 1 : 0; +} + +static struct fb_ops i740fb_ops = { @@ -1105,7 +1111,7 @@ Changes in v5: + + /* detect memory size */ + if ((i740inreg(par, XRX, DRAM_ROW_TYPE) & DRAM_ROW_1) -+ = DRAM_ROW_1_SDRAM) ++ == DRAM_ROW_1_SDRAM) + i740outb(par, XRX, DRAM_ROW_BNDRY_1); + else + i740outb(par, XRX, DRAM_ROW_BNDRY_0); @@ -1126,7 +1132,7 @@ Changes in v5: + info->fix.smem_len = info->screen_size; + info->flags = FBINFO_DEFAULT | FBINFO_HWACCEL_YPAN; + -+ if (i740fb_setup_ddc_bus(info) = 0) { ++ if (i740fb_setup_ddc_bus(info) == 0) { + par->ddc_registered = true; + edid = fb_ddc_read(&par->ddc_adapter); + if (edid) { @@ -1162,7 +1168,7 @@ Changes in v5: + info->monspecs.modedb, + info->monspecs.modedb_len, + NULL, info->var.bits_per_pixel); -+ if (!ret || ret = 4) { ++ if (!ret || ret == 4) { + dev_err(info->device, "mode %s not found\n", + mode_option); + ret = -EINVAL; @@ -1176,7 +1182,7 @@ Changes in v5: + info->var.yres_virtual = info->fix.smem_len * 8 / + (info->var.bits_per_pixel * info->var.xres_virtual); + -+ if (ret = -EINVAL) ++ if (ret == -EINVAL) + goto err_find_mode; + + ret = fb_alloc_cmap(&info->cmap, 256, 0); @@ -1254,14 +1260,14 @@ Changes in v5: + struct i740fb_par *par = info->par; + + /* don't disable console during hibernation and wakeup from it */ -+ if (state.event = PM_EVENT_FREEZE || state.event = PM_EVENT_PRETHAW) ++ if (state.event == PM_EVENT_FREEZE || state.event == PM_EVENT_PRETHAW) + return 0; + + console_lock(); + mutex_lock(&(par->open_lock)); + + /* do nothing if framebuffer is not active */ -+ if (par->ref_count = 0) { ++ if (par->ref_count == 0) { + mutex_unlock(&(par->open_lock)); + console_unlock(); + return 0; @@ -1287,7 +1293,7 @@ Changes in v5: + console_lock(); + mutex_lock(&(par->open_lock)); + -+ if (par->ref_count = 0) ++ if (par->ref_count == 0) + goto fail; + + pci_set_power_state(dev, PCI_D0); diff --git a/a/content_digest b/N1/content_digest index fe6d96f..db0030b 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0Ondrej Zary <linux@rainbow-software.org>\0" "Subject\0[PATCH v5] [resend] Resurrect Intel740 driver: i740fb\0" - "Date\0Fri, 10 Feb 2012 17:59:17 +0000\0" + "Date\0Fri, 10 Feb 2012 18:59:17 +0100\0" "To\0linux-fbdev@vger.kernel.org\0" "Cc\0Andrey Ulanov <drey@rt.mipt.ru>" Florian Tobias Schandinat <FlorianSchandinat@gmx.de> @@ -265,7 +265,7 @@ "+\tstruct i740fb_par *par = info->par;\n" "+\n" "+\tmutex_lock(&(par->open_lock));\n" - "+\tif (par->ref_count = 0) {\n" + "+\tif (par->ref_count == 0) {\n" "+\t\tprintk(KERN_ERR \"fb%d: release called with zero refcount\\n\",\n" "+\t\t\tinfo->node);\n" "+\t\tmutex_unlock(&(par->open_lock));\n" @@ -459,7 +459,8 @@ "+\tpar->video_clk2_n = (n_best - 2) & 0xFF;\n" "+\tpar->video_clk2_mn_msbs = ((((n_best - 2) >> 4) & VCO_N_MSBS)\n" "+\t\t\t\t | (((m_best - 2) >> 8) & VCO_M_MSBS));\n" - "+\tpar->video_clk2_div_sel +\t\t((p_best << 4) | (d_best ? 4 : 0) | REF_DIV_1);\n" + "+\tpar->video_clk2_div_sel =\n" + "+\t\t((p_best << 4) | (d_best ? 4 : 0) | REF_DIV_1);\n" "+}\n" "+\n" "+static int i740fb_decode_var(const struct fb_var_screeninfo *var,\n" @@ -611,7 +612,8 @@ "+\t}\n" "+\n" "+\t/* disabled IRQ */\n" - "+\tpar->crtc[VGA_CRTC_V_SYNC_END] +\t\t((yres + lower - 1 + vslen) & 0x0F) & ~0x10;\n" + "+\tpar->crtc[VGA_CRTC_V_SYNC_END] =\n" + "+\t\t((yres + lower - 1 + vslen) & 0x0F) & ~0x10;\n" "+\t/* 0x7F for VGA, but some SVGA chips require all 8 bits to be set */\n" "+\tpar->crtc[VGA_CRTC_V_BLANK_END] = (yres + lower - 1 + vslen) & 0xFF;\n" "+\n" @@ -660,7 +662,7 @@ "+\t\tbreak;\n" "+\tcase 15: /* 0rrrrrgg gggbbbbb */\n" "+\tcase 16: /* rrrrrggg gggbbbbb */\n" - "+\t\tpar->pixelpipe_cfg1 = (var->green.length = 6) ?\n" + "+\t\tpar->pixelpipe_cfg1 = (var->green.length == 6) ?\n" "+\t\t\tDISPLAY_16BPP_MODE : DISPLAY_15BPP_MODE;\n" "+\t\tpar->crtc[VGA_CRTC_OFFSET] = vxres >> 2;\n" "+\t\tpar->ext_offset = vxres >> 10;\n" @@ -686,7 +688,8 @@ "+\n" "+\tpar->crtc[VGA_CRTC_START_LO] = base & 0x000000FF;\n" "+\tpar->crtc[VGA_CRTC_START_HI] = (base & 0x0000FF00) >> 8;\n" - "+\tpar->ext_start_addr +\t\t((base & 0x003F0000) >> 16) | EXT_START_ADDR_ENABLE;\n" + "+\tpar->ext_start_addr =\n" + "+\t\t((base & 0x003F0000) >> 16) | EXT_START_ADDR_ENABLE;\n" "+\tpar->ext_start_addr_hi = (base & 0x3FC00000) >> 22;\n" "+\n" "+\tpar->pixelpipe_cfg0 = DAC_8_BIT;\n" @@ -719,7 +722,8 @@ "+\tpar->misc |= 0x0C;\n" "+\n" "+\t/* Calculate the FIFO Watermark and Burst Length. */\n" - "+\tpar->lmi_fifo_watermark +\t\ti740_calc_fifo(par, 1000000 / var->pixclock, bpp);\n" + "+\tpar->lmi_fifo_watermark =\n" + "+\t\ti740_calc_fifo(par, 1000000 / var->pixclock, bpp);\n" "+\n" "+\treturn 0;\n" "+}\n" @@ -916,8 +920,9 @@ "+\tmdelay(50);\n" "+\tvga_unprotect(par);\n" "+\n" - "+\tinfo->fix.line_length +\t\t\tinfo->var.xres_virtual * info->var.bits_per_pixel / 8;\n" - "+\tif (info->var.bits_per_pixel = 8)\n" + "+\tinfo->fix.line_length =\n" + "+\t\t\tinfo->var.xres_virtual * info->var.bits_per_pixel / 8;\n" + "+\tif (info->var.bits_per_pixel == 8)\n" "+\t\tinfo->fix.visual = FB_VISUAL_PSEUDOCOLOR;\n" "+\telse\n" "+\t\tinfo->fix.visual = FB_VISUAL_TRUECOLOR;\n" @@ -994,7 +999,8 @@ "+\tpar->crtc[VGA_CRTC_START_LO] = base & 0x000000FF;\n" "+\tpar->crtc[VGA_CRTC_START_HI] = (base & 0x0000FF00) >> 8;\n" "+\tpar->ext_start_addr_hi = (base & 0x3FC00000) >> 22;\n" - "+\tpar->ext_start_addr +\t\t\t((base & 0x003F0000) >> 16) | EXT_START_ADDR_ENABLE;\n" + "+\tpar->ext_start_addr =\n" + "+\t\t\t((base & 0x003F0000) >> 16) | EXT_START_ADDR_ENABLE;\n" "+\n" "+\ti740outreg(par, VGA_CRT_IC, VGA_CRTC_START_LO, base & 0x000000FF);\n" "+\ti740outreg(par, VGA_CRT_IC, VGA_CRTC_START_HI,\n" @@ -1045,7 +1051,7 @@ "+\ti740outreg(par, XRX, DPMS_SYNC_SELECT, DPMSSyncSelect);\n" "+\n" "+\t/* Let fbcon do a soft blank for us */\n" - "+\treturn (blank_mode = FB_BLANK_NORMAL) ? 1 : 0;\n" + "+\treturn (blank_mode == FB_BLANK_NORMAL) ? 1 : 0;\n" "+}\n" "+\n" "+static struct fb_ops i740fb_ops = {\n" @@ -1115,7 +1121,7 @@ "+\n" "+\t/* detect memory size */\n" "+\tif ((i740inreg(par, XRX, DRAM_ROW_TYPE) & DRAM_ROW_1)\n" - "+\t\t\t\t\t\t\t= DRAM_ROW_1_SDRAM)\n" + "+\t\t\t\t\t\t\t== DRAM_ROW_1_SDRAM)\n" "+\t\ti740outb(par, XRX, DRAM_ROW_BNDRY_1);\n" "+\telse\n" "+\t\ti740outb(par, XRX, DRAM_ROW_BNDRY_0);\n" @@ -1136,7 +1142,7 @@ "+\tinfo->fix.smem_len = info->screen_size;\n" "+\tinfo->flags = FBINFO_DEFAULT | FBINFO_HWACCEL_YPAN;\n" "+\n" - "+\tif (i740fb_setup_ddc_bus(info) = 0) {\n" + "+\tif (i740fb_setup_ddc_bus(info) == 0) {\n" "+\t\tpar->ddc_registered = true;\n" "+\t\tedid = fb_ddc_read(&par->ddc_adapter);\n" "+\t\tif (edid) {\n" @@ -1172,7 +1178,7 @@ "+\t\t\t\t info->monspecs.modedb,\n" "+\t\t\t\t info->monspecs.modedb_len,\n" "+\t\t\t\t NULL, info->var.bits_per_pixel);\n" - "+\t\tif (!ret || ret = 4) {\n" + "+\t\tif (!ret || ret == 4) {\n" "+\t\t\tdev_err(info->device, \"mode %s not found\\n\",\n" "+\t\t\t\tmode_option);\n" "+\t\t\tret = -EINVAL;\n" @@ -1186,7 +1192,7 @@ "+\tinfo->var.yres_virtual = info->fix.smem_len * 8 /\n" "+\t\t\t(info->var.bits_per_pixel * info->var.xres_virtual);\n" "+\n" - "+\tif (ret = -EINVAL)\n" + "+\tif (ret == -EINVAL)\n" "+\t\tgoto err_find_mode;\n" "+\n" "+\tret = fb_alloc_cmap(&info->cmap, 256, 0);\n" @@ -1264,14 +1270,14 @@ "+\tstruct i740fb_par *par = info->par;\n" "+\n" "+\t/* don't disable console during hibernation and wakeup from it */\n" - "+\tif (state.event = PM_EVENT_FREEZE || state.event = PM_EVENT_PRETHAW)\n" + "+\tif (state.event == PM_EVENT_FREEZE || state.event == PM_EVENT_PRETHAW)\n" "+\t\treturn 0;\n" "+\n" "+\tconsole_lock();\n" "+\tmutex_lock(&(par->open_lock));\n" "+\n" "+\t/* do nothing if framebuffer is not active */\n" - "+\tif (par->ref_count = 0) {\n" + "+\tif (par->ref_count == 0) {\n" "+\t\tmutex_unlock(&(par->open_lock));\n" "+\t\tconsole_unlock();\n" "+\t\treturn 0;\n" @@ -1297,7 +1303,7 @@ "+\tconsole_lock();\n" "+\tmutex_lock(&(par->open_lock));\n" "+\n" - "+\tif (par->ref_count = 0)\n" + "+\tif (par->ref_count == 0)\n" "+\t\tgoto fail;\n" "+\n" "+\tpci_set_power_state(dev, PCI_D0);\n" @@ -1710,4 +1716,4 @@ "-- \n" Ondrej Zary -195b70093a845c798e4c8820c033770eb20f7d6abb7742398f8b3431f3cabc7f +fca554bcb5592e8fb64b1a8ac120240bea42f49de2ad609c7c560da12c0340b3
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.