diff for duplicates of <4FF13F9C.5050104@gmx.de> diff --git a/a/1.txt b/N1/1.txt index 5e4e8ba..dafaa7e 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -49,8 +49,8 @@ Florian Tobias Schandinat > video->out_height = fbi->var.yres; > video->out_stride = fbi->var.xres_virtual; > -> - if (mx3_fbi->blank = FB_BLANK_UNBLANK) -> + if (mx3_fbi->blank = FB_BLANK_UNBLANK) { +> - if (mx3_fbi->blank == FB_BLANK_UNBLANK) +> + if (mx3_fbi->blank == FB_BLANK_UNBLANK) { > sdc_enable_channel(mx3_fbi); > + /* > + * sg[0] points to fb smem_start address @@ -87,10 +87,10 @@ Florian Tobias Schandinat > return -EINVAL; > } > -> - if (fbi->var.xoffset = var->xoffset && -> - fbi->var.yoffset = var->yoffset) -> + if (mx3_fbi->cur_var.xoffset = var->xoffset && -> + mx3_fbi->cur_var.yoffset = var->yoffset) +> - if (fbi->var.xoffset == var->xoffset && +> - fbi->var.yoffset == var->yoffset) +> + if (mx3_fbi->cur_var.xoffset == var->xoffset && +> + mx3_fbi->cur_var.yoffset == var->yoffset) > return 0; /* No change, do nothing */ > > y_bottom = var->yoffset; diff --git a/a/content_digest b/N1/content_digest index e0936be..6d4815c 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\01339376810-8247-1-git-send-email-Ying.Liu@freescale.com\0" "ref\01339376810-8247-2-git-send-email-Ying.Liu@freescale.com\0" - "From\0Florian Tobias Schandinat <FlorianSchandinat@gmx.de>\0" - "Subject\0Re: [PATCH 2/3] mx3fb: support pan display with fb_set_var\0" + "From\0FlorianSchandinat@gmx.de (Florian Tobias Schandinat)\0" + "Subject\0[PATCH 2/3] mx3fb: support pan display with fb_set_var\0" "Date\0Mon, 02 Jul 2012 06:28:44 +0000\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" @@ -57,8 +57,8 @@ "> \tvideo->out_height\t= fbi->var.yres;\n" "> \tvideo->out_stride\t= fbi->var.xres_virtual;\n" "> \n" - "> -\tif (mx3_fbi->blank = FB_BLANK_UNBLANK)\n" - "> +\tif (mx3_fbi->blank = FB_BLANK_UNBLANK) {\n" + "> -\tif (mx3_fbi->blank == FB_BLANK_UNBLANK)\n" + "> +\tif (mx3_fbi->blank == FB_BLANK_UNBLANK) {\n" "> \t\tsdc_enable_channel(mx3_fbi);\n" "> +\t\t/*\n" "> +\t\t * sg[0] points to fb smem_start address\n" @@ -95,10 +95,10 @@ "> \t\treturn -EINVAL;\n" "> \t}\n" "> \n" - "> -\tif (fbi->var.xoffset = var->xoffset &&\n" - "> -\t fbi->var.yoffset = var->yoffset)\n" - "> +\tif (mx3_fbi->cur_var.xoffset = var->xoffset &&\n" - "> +\t mx3_fbi->cur_var.yoffset = var->yoffset)\n" + "> -\tif (fbi->var.xoffset == var->xoffset &&\n" + "> -\t fbi->var.yoffset == var->yoffset)\n" + "> +\tif (mx3_fbi->cur_var.xoffset == var->xoffset &&\n" + "> +\t mx3_fbi->cur_var.yoffset == var->yoffset)\n" "> \t\treturn 0;\t/* No change, do nothing */\n" "> \n" "> \ty_bottom = var->yoffset;\n" @@ -112,4 +112,4 @@ "> \n" "> \tdev_dbg(fbi->device, \"Update complete\\n\");" -5d8cd023815c724a787744b9d5855e772f7f2629f9154978ce4caa4ce99c5f47 +f1a205be8c20977b2a04abfccf5c25dd846af3a3d39f0b1f8fd02b643da5f313
diff --git a/a/1.txt b/N2/1.txt index 5e4e8ba..dafaa7e 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -49,8 +49,8 @@ Florian Tobias Schandinat > video->out_height = fbi->var.yres; > video->out_stride = fbi->var.xres_virtual; > -> - if (mx3_fbi->blank = FB_BLANK_UNBLANK) -> + if (mx3_fbi->blank = FB_BLANK_UNBLANK) { +> - if (mx3_fbi->blank == FB_BLANK_UNBLANK) +> + if (mx3_fbi->blank == FB_BLANK_UNBLANK) { > sdc_enable_channel(mx3_fbi); > + /* > + * sg[0] points to fb smem_start address @@ -87,10 +87,10 @@ Florian Tobias Schandinat > return -EINVAL; > } > -> - if (fbi->var.xoffset = var->xoffset && -> - fbi->var.yoffset = var->yoffset) -> + if (mx3_fbi->cur_var.xoffset = var->xoffset && -> + mx3_fbi->cur_var.yoffset = var->yoffset) +> - if (fbi->var.xoffset == var->xoffset && +> - fbi->var.yoffset == var->yoffset) +> + if (mx3_fbi->cur_var.xoffset == var->xoffset && +> + mx3_fbi->cur_var.yoffset == var->yoffset) > return 0; /* No change, do nothing */ > > y_bottom = var->yoffset; diff --git a/a/content_digest b/N2/content_digest index e0936be..2b562f6 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -3,7 +3,12 @@ "From\0Florian Tobias Schandinat <FlorianSchandinat@gmx.de>\0" "Subject\0Re: [PATCH 2/3] mx3fb: support pan display with fb_set_var\0" "Date\0Mon, 02 Jul 2012 06:28:44 +0000\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Liu Ying <Ying.Liu@freescale.com>\0" + "Cc\0g.liakhovetski@gmx.de" + liu.y.victor@gmail.com + linux-fbdev@vger.kernel.org + linux-kernel@vger.kernel.org + " linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On 06/11/2012 01:06 AM, Liu Ying wrote:\n" @@ -57,8 +62,8 @@ "> \tvideo->out_height\t= fbi->var.yres;\n" "> \tvideo->out_stride\t= fbi->var.xres_virtual;\n" "> \n" - "> -\tif (mx3_fbi->blank = FB_BLANK_UNBLANK)\n" - "> +\tif (mx3_fbi->blank = FB_BLANK_UNBLANK) {\n" + "> -\tif (mx3_fbi->blank == FB_BLANK_UNBLANK)\n" + "> +\tif (mx3_fbi->blank == FB_BLANK_UNBLANK) {\n" "> \t\tsdc_enable_channel(mx3_fbi);\n" "> +\t\t/*\n" "> +\t\t * sg[0] points to fb smem_start address\n" @@ -95,10 +100,10 @@ "> \t\treturn -EINVAL;\n" "> \t}\n" "> \n" - "> -\tif (fbi->var.xoffset = var->xoffset &&\n" - "> -\t fbi->var.yoffset = var->yoffset)\n" - "> +\tif (mx3_fbi->cur_var.xoffset = var->xoffset &&\n" - "> +\t mx3_fbi->cur_var.yoffset = var->yoffset)\n" + "> -\tif (fbi->var.xoffset == var->xoffset &&\n" + "> -\t fbi->var.yoffset == var->yoffset)\n" + "> +\tif (mx3_fbi->cur_var.xoffset == var->xoffset &&\n" + "> +\t mx3_fbi->cur_var.yoffset == var->yoffset)\n" "> \t\treturn 0;\t/* No change, do nothing */\n" "> \n" "> \ty_bottom = var->yoffset;\n" @@ -112,4 +117,4 @@ "> \n" "> \tdev_dbg(fbi->device, \"Update complete\\n\");" -5d8cd023815c724a787744b9d5855e772f7f2629f9154978ce4caa4ce99c5f47 +a0f86cb8842ff72b268f4900724ef383097354982822256dddea7622b54159b1
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.