diff for duplicates of <20180603144225.839044928@twibright.com> diff --git a/a/1.txt b/N1/1.txt index 7ee3d38..232a25f 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -24,7 +24,8 @@ Signed-off-by: Mikulas Patocka <mpatocka@redhat.com> 1 file changed, 34 insertions(+), 11 deletions(-) Index: linux-4.17-rc7/drivers/video/fbdev/udlfb.c -=================================--- linux-4.17-rc7.orig/drivers/video/fbdev/udlfb.c 2018-05-31 14:51:43.000000000 +0200 +=================================================================== +--- linux-4.17-rc7.orig/drivers/video/fbdev/udlfb.c 2018-05-31 14:51:43.000000000 +0200 +++ linux-4.17-rc7/drivers/video/fbdev/udlfb.c 2018-05-31 14:51:43.000000000 +0200 @@ -431,7 +431,9 @@ static void dlfb_compress_hline( const uint16_t *const pixel_end, @@ -42,7 +43,7 @@ Index: linux-4.17-rc7/drivers/video/fbdev/udlfb.c const uint16_t *cmd_pixel_start, *cmd_pixel_end = NULL; + if (back_buffer_offset && -+ *pixel = *(u16 *)((u8 *)pixel + back_buffer_offset)) { ++ *pixel == *(u16 *)((u8 *)pixel + back_buffer_offset)) { + pixel++; + dev_addr += BPP; + (*ident_ptr)++; @@ -59,7 +60,7 @@ Index: linux-4.17-rc7/drivers/video/fbdev/udlfb.c + if (back_buffer_offset) { + /* note: the framebuffer may change under us, so we must test for underflow */ + while (cmd_pixel_end - 1 > pixel && -+ *(cmd_pixel_end - 1) = *(u16 *)((u8 *)(cmd_pixel_end - 1) + back_buffer_offset)) ++ *(cmd_pixel_end - 1) == *(u16 *)((u8 *)(cmd_pixel_end - 1) + back_buffer_offset)) + cmd_pixel_end--; + } + @@ -77,14 +78,14 @@ Index: linux-4.17-rc7/drivers/video/fbdev/udlfb.c pixel++; if (unlikely((pixel < cmd_pixel_end) && -- (*pixel = *repeating_pixel))) { -+ (*pixel = pixel_value))) { +- (*pixel == *repeating_pixel))) { ++ (*pixel == pixel_value))) { /* go back and fill in raw pixel count */ *raw_pixels_count_byte = ((repeating_pixel - raw_pixel_start) + 1) & 0xFF; - while ((pixel < cmd_pixel_end) -- && (*pixel = *repeating_pixel)) { +- && (*pixel == *repeating_pixel)) { - pixel++; - } + do { @@ -92,7 +93,7 @@ Index: linux-4.17-rc7/drivers/video/fbdev/udlfb.c + *(u16 *)((u8 *)pixel + back_buffer_offset) = pixel_value; + pixel++; + } while ((pixel < cmd_pixel_end) && -+ (*pixel = pixel_value)); ++ (*pixel == pixel_value)); /* immediately after raw data is repeat byte */ *cmd++ = ((pixel - repeating_pixel) - 1) & 0xFF; @@ -132,3 +133,8 @@ Index: linux-4.17-rc7/drivers/video/fbdev/udlfb.c if (cmd >= cmd_end) { int len = cmd - (u8 *) urb->transfer_buffer; + +_______________________________________________ +dri-devel mailing list +dri-devel@lists.freedesktop.org +https://lists.freedesktop.org/mailman/listinfo/dri-devel diff --git a/a/content_digest b/N1/content_digest index b90bf9c..dd650b1 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020180603144053.875668929@twibright.com\0" "From\0Mikulas Patocka <mpatocka@redhat.com>\0" "Subject\0[PATCH 19/21] udlfb: optimization - test the backing buffer\0" - "Date\0Sun, 03 Jun 2018 14:41:12 +0000\0" + "Date\0Sun, 03 Jun 2018 16:41:12 +0200\0" "To\0Mikulas Patocka <mpatocka@redhat.com>" Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> Dave Airlie <airlied@redhat.com> @@ -10,6 +10,7 @@ "Cc\0linux-fbdev@vger.kernel.org" " dri-devel@lists.freedesktop.org\0" "\00:1\0" + "fn\0udl-test-backing-buffer.patch\0" "b\0" "Currently, the udlfb driver only tests for identical bytes at the\n" "beginning or at the end of a page and renders anything between the first\n" @@ -37,7 +38,8 @@ " 1 file changed, 34 insertions(+), 11 deletions(-)\n" "\n" "Index: linux-4.17-rc7/drivers/video/fbdev/udlfb.c\n" - "=================================--- linux-4.17-rc7.orig/drivers/video/fbdev/udlfb.c\t2018-05-31 14:51:43.000000000 +0200\n" + "===================================================================\n" + "--- linux-4.17-rc7.orig/drivers/video/fbdev/udlfb.c\t2018-05-31 14:51:43.000000000 +0200\n" "+++ linux-4.17-rc7/drivers/video/fbdev/udlfb.c\t2018-05-31 14:51:43.000000000 +0200\n" "@@ -431,7 +431,9 @@ static void dlfb_compress_hline(\n" " \tconst uint16_t *const pixel_end,\n" @@ -55,7 +57,7 @@ " \t\tconst uint16_t *cmd_pixel_start, *cmd_pixel_end = NULL;\n" " \n" "+\t\tif (back_buffer_offset &&\n" - "+\t\t *pixel = *(u16 *)((u8 *)pixel + back_buffer_offset)) {\n" + "+\t\t *pixel == *(u16 *)((u8 *)pixel + back_buffer_offset)) {\n" "+\t\t\tpixel++;\n" "+\t\t\tdev_addr += BPP;\n" "+\t\t\t(*ident_ptr)++;\n" @@ -72,7 +74,7 @@ "+\t\tif (back_buffer_offset) {\n" "+\t\t\t/* note: the framebuffer may change under us, so we must test for underflow */\n" "+\t\t\twhile (cmd_pixel_end - 1 > pixel &&\n" - "+\t\t\t *(cmd_pixel_end - 1) = *(u16 *)((u8 *)(cmd_pixel_end - 1) + back_buffer_offset))\n" + "+\t\t\t *(cmd_pixel_end - 1) == *(u16 *)((u8 *)(cmd_pixel_end - 1) + back_buffer_offset))\n" "+\t\t\t\tcmd_pixel_end--;\n" "+\t\t}\n" "+\n" @@ -90,14 +92,14 @@ " \t\t\tpixel++;\n" " \n" " \t\t\tif (unlikely((pixel < cmd_pixel_end) &&\n" - "-\t\t\t\t (*pixel = *repeating_pixel))) {\n" - "+\t\t\t\t (*pixel = pixel_value))) {\n" + "-\t\t\t\t (*pixel == *repeating_pixel))) {\n" + "+\t\t\t\t (*pixel == pixel_value))) {\n" " \t\t\t\t/* go back and fill in raw pixel count */\n" " \t\t\t\t*raw_pixels_count_byte = ((repeating_pixel -\n" " \t\t\t\t\t\traw_pixel_start) + 1) & 0xFF;\n" " \n" "-\t\t\t\twhile ((pixel < cmd_pixel_end)\n" - "-\t\t\t\t && (*pixel = *repeating_pixel)) {\n" + "-\t\t\t\t && (*pixel == *repeating_pixel)) {\n" "-\t\t\t\t\tpixel++;\n" "-\t\t\t\t}\n" "+\t\t\t\tdo {\n" @@ -105,7 +107,7 @@ "+\t\t\t\t\t\t*(u16 *)((u8 *)pixel + back_buffer_offset) = pixel_value;\n" "+ \t\t\t\t\tpixel++;\n" "+\t\t\t\t} while ((pixel < cmd_pixel_end) &&\n" - "+\t\t\t\t\t (*pixel = pixel_value));\n" + "+\t\t\t\t\t (*pixel == pixel_value));\n" " \n" " \t\t\t\t/* immediately after raw data is repeat byte */\n" " \t\t\t\t*cmd++ = ((pixel - repeating_pixel) - 1) & 0xFF;\n" @@ -144,6 +146,11 @@ "+\t\t\tident_ptr);\n" " \n" " \t\tif (cmd >= cmd_end) {\n" - " \t\t\tint len = cmd - (u8 *) urb->transfer_buffer;" + " \t\t\tint len = cmd - (u8 *) urb->transfer_buffer;\n" + "\n" + "_______________________________________________\n" + "dri-devel mailing list\n" + "dri-devel@lists.freedesktop.org\n" + https://lists.freedesktop.org/mailman/listinfo/dri-devel -5ec4a31139ff76d2c16afd19252a16df1cc698c4d7dd4c9c54b66cdab6bd5aef +d066c4c61edff024ae2e9d40988194488f465f74a5eacfbf9f52c36413e99fe2
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.