diff for duplicates of <4C2DCC5B.2000100@simtec.co.uk> diff --git a/a/1.txt b/N1/1.txt index 58f3af4..efd157b 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -93,7 +93,8 @@ calculation easier. > + start_byte_offset = var->yoffset * info->fix.line_length; > + /* X offset depends on the current bpp */ > + if (info->var.bits_per_pixel >= 8) { -> + start_byte_offset +> + var->xoffset * (info->var.bits_per_pixel >> 3); +> + start_byte_offset += +> + var->xoffset * (info->var.bits_per_pixel >> 3); > + } else { > + switch (info->var.bits_per_pixel) { > + case 4: diff --git a/a/content_digest b/N1/content_digest index 2cfdad7..5933d12 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,8 +2,14 @@ "ref\01277712538-23188-6-git-send-email-p.osciak@samsung.com\0" "From\0Ben Dooks <ben@simtec.co.uk>\0" "Subject\0Re: [PATCH v3 05/12] s3c-fb: Add support for display panning\0" - "Date\0Fri, 02 Jul 2010 11:24:11 +0000\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "Date\0Fri, 02 Jul 2010 12:24:11 +0100\0" + "To\0Pawel Osciak <p.osciak@samsung.com>\0" + "Cc\0linux-fbdev@vger.kernel.org" + linux-samsung-soc@vger.kernel.org + linux-arm-kernel@lists.infradead.org + kyungmin.park@samsung.com + ben-linux@fluff.org + " m.szyprowski@samsung.com\0" "\00:1\0" "b\0" "On 28/06/10 09:08, Pawel Osciak wrote:\n" @@ -101,7 +107,8 @@ "> +\tstart_byte_offset = var->yoffset * info->fix.line_length;\n" "> +\t/* X offset depends on the current bpp */\n" "> +\tif (info->var.bits_per_pixel >= 8) {\n" - "> +\t\tstart_byte_offset +> +\t\t\tvar->xoffset * (info->var.bits_per_pixel >> 3);\n" + "> +\t\tstart_byte_offset +=\n" + "> +\t\t\tvar->xoffset * (info->var.bits_per_pixel >> 3);\n" "> +\t} else {\n" "> +\t\tswitch (info->var.bits_per_pixel) {\n" "> +\t\tcase 4:\n" @@ -173,4 +180,4 @@ "> \t.win[0]\t= &s3c_fb_data_64xx_wins[0],\n" "> \t.win[1]\t= &s3c_fb_data_64xx_wins[1]," -a74661fc66aaf672161bdb9be18d91b55957f45007365f262da850e0b74f6b2f +b0cef38d3227097179079d2bfc13b7e55ce3bd2c4808f22e58adb403f239a402
diff --git a/a/1.txt b/N2/1.txt index 58f3af4..efd157b 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -93,7 +93,8 @@ calculation easier. > + start_byte_offset = var->yoffset * info->fix.line_length; > + /* X offset depends on the current bpp */ > + if (info->var.bits_per_pixel >= 8) { -> + start_byte_offset +> + var->xoffset * (info->var.bits_per_pixel >> 3); +> + start_byte_offset += +> + var->xoffset * (info->var.bits_per_pixel >> 3); > + } else { > + switch (info->var.bits_per_pixel) { > + case 4: diff --git a/a/content_digest b/N2/content_digest index 2cfdad7..1774681 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,8 +1,8 @@ "ref\01277712538-23188-1-git-send-email-p.osciak@samsung.com\0" "ref\01277712538-23188-6-git-send-email-p.osciak@samsung.com\0" - "From\0Ben Dooks <ben@simtec.co.uk>\0" - "Subject\0Re: [PATCH v3 05/12] s3c-fb: Add support for display panning\0" - "Date\0Fri, 02 Jul 2010 11:24:11 +0000\0" + "From\0ben@simtec.co.uk (Ben Dooks)\0" + "Subject\0[PATCH v3 05/12] s3c-fb: Add support for display panning\0" + "Date\0Fri, 02 Jul 2010 12:24:11 +0100\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -101,7 +101,8 @@ "> +\tstart_byte_offset = var->yoffset * info->fix.line_length;\n" "> +\t/* X offset depends on the current bpp */\n" "> +\tif (info->var.bits_per_pixel >= 8) {\n" - "> +\t\tstart_byte_offset +> +\t\t\tvar->xoffset * (info->var.bits_per_pixel >> 3);\n" + "> +\t\tstart_byte_offset +=\n" + "> +\t\t\tvar->xoffset * (info->var.bits_per_pixel >> 3);\n" "> +\t} else {\n" "> +\t\tswitch (info->var.bits_per_pixel) {\n" "> +\t\tcase 4:\n" @@ -173,4 +174,4 @@ "> \t.win[0]\t= &s3c_fb_data_64xx_wins[0],\n" "> \t.win[1]\t= &s3c_fb_data_64xx_wins[1]," -a74661fc66aaf672161bdb9be18d91b55957f45007365f262da850e0b74f6b2f +bb0b1f77f61a4e738a3a7c26f8b0c41adfc995ae89803449a8c065ae8e8f4683
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.