diff for duplicates of <20180603144221.605787225@twibright.com> diff --git a/a/1.txt b/N1/1.txt index e82cfd1..31c6bd3 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -12,7 +12,8 @@ Cc: stable@vger.kernel.org 3 files changed, 30 insertions(+), 26 deletions(-) Index: linux-4.17-rc7/drivers/gpu/drm/udl/udl_drv.h -=================================--- linux-4.17-rc7.orig/drivers/gpu/drm/udl/udl_drv.h 2018-06-03 13:15:01.000000000 +0200 +=================================================================== +--- linux-4.17-rc7.orig/drivers/gpu/drm/udl/udl_drv.h 2018-06-03 13:15:01.000000000 +0200 +++ linux-4.17-rc7/drivers/gpu/drm/udl/udl_drv.h 2018-06-03 13:15:01.000000000 +0200 @@ -110,7 +110,7 @@ udl_fb_user_fb_create(struct drm_device struct drm_file *file, @@ -24,7 +25,8 @@ Index: linux-4.17-rc7/drivers/gpu/drm/udl/udl_drv.h u32 byte_offset, u32 device_byte_offset, u32 byte_width, int *ident_ptr, int *sent_ptr); Index: linux-4.17-rc7/drivers/gpu/drm/udl/udl_fb.c -=================================--- linux-4.17-rc7.orig/drivers/gpu/drm/udl/udl_fb.c 2018-06-03 13:15:01.000000000 +0200 +=================================================================== +--- linux-4.17-rc7.orig/drivers/gpu/drm/udl/udl_fb.c 2018-06-03 13:15:01.000000000 +0200 +++ linux-4.17-rc7/drivers/gpu/drm/udl/udl_fb.c 2018-06-03 13:15:01.000000000 +0200 @@ -91,7 +91,10 @@ int udl_handle_damage(struct udl_framebu int bytes_identical = 0; @@ -65,7 +67,8 @@ Index: linux-4.17-rc7/drivers/gpu/drm/udl/udl_fb.c atomic_add(((unsigned int) ((end_cycles - start_cycles) >> 10)), /* Kcycles */ Index: linux-4.17-rc7/drivers/gpu/drm/udl/udl_transfer.c -=================================--- linux-4.17-rc7.orig/drivers/gpu/drm/udl/udl_transfer.c 2018-06-03 13:15:01.000000000 +0200 +=================================================================== +--- linux-4.17-rc7.orig/drivers/gpu/drm/udl/udl_transfer.c 2018-06-03 13:15:01.000000000 +0200 +++ linux-4.17-rc7/drivers/gpu/drm/udl/udl_transfer.c 2018-06-03 13:15:01.000000000 +0200 @@ -83,12 +83,12 @@ static inline u16 pixel32_to_be16(const ((pixel >> 8) & 0xf800)); @@ -75,11 +78,11 @@ Index: linux-4.17-rc7/drivers/gpu/drm/udl/udl_transfer.c +static inline u16 get_pixel_val16(const uint8_t *pixel, int log_bpp) { - u16 pixel_val16 = 0; -- if (bpp = 2) +- if (bpp == 2) + u16 pixel_val16; -+ if (log_bpp = 1) ++ if (log_bpp == 1) pixel_val16 = *(const uint16_t *)pixel; -- else if (bpp = 4) +- else if (bpp == 4) + else pixel_val16 = pixel32_to_be16(*(const uint32_t *)pixel); return pixel_val16; @@ -170,8 +173,8 @@ Index: linux-4.17-rc7/drivers/gpu/drm/udl/udl_transfer.c u8 *cmd = *urb_buf_ptr; u8 *cmd_end = (u8 *) urb->transfer_buffer + urb->transfer_buffer_length; -- BUG_ON(!(bpp = 2 || bpp = 4)); -+ BUG_ON(!(log_bpp = 1 || log_bpp = 2)); +- BUG_ON(!(bpp == 2 || bpp == 4)); ++ BUG_ON(!(log_bpp == 1 || log_bpp == 2)); line_start = (u8 *) (front + byte_offset); next_pixel = line_start; @@ -184,3 +187,8 @@ Index: linux-4.17-rc7/drivers/gpu/drm/udl/udl_transfer.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 95116dd..c0bc5fe 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 07/21] udl-kms: avoid division\0" - "Date\0Sun, 03 Jun 2018 14:41:00 +0000\0" + "Date\0Sun, 03 Jun 2018 16:41:00 +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\0udlkms-avoid-division.patch\0" "b\0" "Division is slow, so it shouldn't be done by the pixel generating code.\n" "The driver supports only 2 or 4 bytes per pixel, so we can replace\n" @@ -25,7 +26,8 @@ " 3 files changed, 30 insertions(+), 26 deletions(-)\n" "\n" "Index: linux-4.17-rc7/drivers/gpu/drm/udl/udl_drv.h\n" - "=================================--- linux-4.17-rc7.orig/drivers/gpu/drm/udl/udl_drv.h\t2018-06-03 13:15:01.000000000 +0200\n" + "===================================================================\n" + "--- linux-4.17-rc7.orig/drivers/gpu/drm/udl/udl_drv.h\t2018-06-03 13:15:01.000000000 +0200\n" "+++ linux-4.17-rc7/drivers/gpu/drm/udl/udl_drv.h\t2018-06-03 13:15:01.000000000 +0200\n" "@@ -110,7 +110,7 @@ udl_fb_user_fb_create(struct drm_device\n" " \t\t struct drm_file *file,\n" @@ -37,7 +39,8 @@ " \t\t u32 byte_offset, u32 device_byte_offset, u32 byte_width,\n" " \t\t int *ident_ptr, int *sent_ptr);\n" "Index: linux-4.17-rc7/drivers/gpu/drm/udl/udl_fb.c\n" - "=================================--- linux-4.17-rc7.orig/drivers/gpu/drm/udl/udl_fb.c\t2018-06-03 13:15:01.000000000 +0200\n" + "===================================================================\n" + "--- linux-4.17-rc7.orig/drivers/gpu/drm/udl/udl_fb.c\t2018-06-03 13:15:01.000000000 +0200\n" "+++ linux-4.17-rc7/drivers/gpu/drm/udl/udl_fb.c\t2018-06-03 13:15:01.000000000 +0200\n" "@@ -91,7 +91,10 @@ int udl_handle_damage(struct udl_framebu\n" " \tint bytes_identical = 0;\n" @@ -78,7 +81,8 @@ " \tatomic_add(((unsigned int) ((end_cycles - start_cycles)\n" " \t\t >> 10)), /* Kcycles */\n" "Index: linux-4.17-rc7/drivers/gpu/drm/udl/udl_transfer.c\n" - "=================================--- linux-4.17-rc7.orig/drivers/gpu/drm/udl/udl_transfer.c\t2018-06-03 13:15:01.000000000 +0200\n" + "===================================================================\n" + "--- linux-4.17-rc7.orig/drivers/gpu/drm/udl/udl_transfer.c\t2018-06-03 13:15:01.000000000 +0200\n" "+++ linux-4.17-rc7/drivers/gpu/drm/udl/udl_transfer.c\t2018-06-03 13:15:01.000000000 +0200\n" "@@ -83,12 +83,12 @@ static inline u16 pixel32_to_be16(const\n" " \t\t((pixel >> 8) & 0xf800));\n" @@ -88,11 +92,11 @@ "+static inline u16 get_pixel_val16(const uint8_t *pixel, int log_bpp)\n" " {\n" "-\tu16 pixel_val16 = 0;\n" - "-\tif (bpp = 2)\n" + "-\tif (bpp == 2)\n" "+\tu16 pixel_val16;\n" - "+\tif (log_bpp = 1)\n" + "+\tif (log_bpp == 1)\n" " \t\tpixel_val16 = *(const uint16_t *)pixel;\n" - "-\telse if (bpp = 4)\n" + "-\telse if (bpp == 4)\n" "+\telse\n" " \t\tpixel_val16 = pixel32_to_be16(*(const uint32_t *)pixel);\n" " \treturn pixel_val16;\n" @@ -183,8 +187,8 @@ " \tu8 *cmd = *urb_buf_ptr;\n" " \tu8 *cmd_end = (u8 *) urb->transfer_buffer + urb->transfer_buffer_length;\n" " \n" - "-\tBUG_ON(!(bpp = 2 || bpp = 4));\n" - "+\tBUG_ON(!(log_bpp = 1 || log_bpp = 2));\n" + "-\tBUG_ON(!(bpp == 2 || bpp == 4));\n" + "+\tBUG_ON(!(log_bpp == 1 || log_bpp == 2));\n" " \n" " \tline_start = (u8 *) (front + byte_offset);\n" " \tnext_pixel = line_start;\n" @@ -196,6 +200,11 @@ "+\t\t\t (u8 **) &cmd, (u8 *) cmd_end, log_bpp);\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 -8ed566d1fe6982134c3966431ec631860be5c1c5c6a6db6ebdcd1110697157f9 +2f3a09ffd5b9ce717bfd24d86fbf27dcc196c3bedd37c94ab5a48f7fb43cf3fe
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.