From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754179AbcDYJRL (ORCPT ); Mon, 25 Apr 2016 05:17:11 -0400 Received: from mail-wm0-f48.google.com ([74.125.82.48]:35688 "EHLO mail-wm0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753730AbcDYJRJ (ORCPT ); Mon, 25 Apr 2016 05:17:09 -0400 Date: Mon, 25 Apr 2016 11:17:04 +0200 From: Daniel Vetter To: Noralf =?iso-8859-1?Q?Tr=F8nnes?= Cc: dri-devel@lists.freedesktop.org, linux-fbdev@vger.kernel.org, daniel@ffwll.ch, laurent.pinchart@ideasonboard.com, tomi.valkeinen@ti.com, linux-kernel@vger.kernel.org Subject: Re: [PATCH v2 8/8] drm/udl: Use drm_fb_helper deferred_io support Message-ID: <20160425091704.GU2510@phenom.ffwll.local> Mail-Followup-To: Noralf =?iso-8859-1?Q?Tr=F8nnes?= , dri-devel@lists.freedesktop.org, linux-fbdev@vger.kernel.org, laurent.pinchart@ideasonboard.com, tomi.valkeinen@ti.com, linux-kernel@vger.kernel.org References: <1461530942-22485-1-git-send-email-noralf@tronnes.org> <1461530942-22485-9-git-send-email-noralf@tronnes.org> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1461530942-22485-9-git-send-email-noralf@tronnes.org> X-Operating-System: Linux phenom 4.4.0-1-amd64 User-Agent: Mutt/1.5.24 (2015-08-30) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sun, Apr 24, 2016 at 10:49:02PM +0200, Noralf Trønnes wrote: > Use the fbdev deferred io support in drm_fb_helper. > The (struct fb_ops *)->fb_{fillrect,copyarea,imageblit} functions will > now schedule a worker instead of being flushed directly like it was > previously (recorded when in atomic). > > This patch has only been compile tested. > > Signed-off-by: Noralf Trønnes > --- > > Changes since v1: > - No need to enable deferred_io by default since drm_fb_helper uses > a dedicated worker for flushing Hooray for deleting code. Reviewed-by: Daniel Vetter > > drivers/gpu/drm/udl/udl_drv.h | 2 - > drivers/gpu/drm/udl/udl_fb.c | 140 ++---------------------------------------- > 2 files changed, 6 insertions(+), 136 deletions(-) > > diff --git a/drivers/gpu/drm/udl/udl_drv.h b/drivers/gpu/drm/udl/udl_drv.h > index 4a064ef..0b03d34 100644 > --- a/drivers/gpu/drm/udl/udl_drv.h > +++ b/drivers/gpu/drm/udl/udl_drv.h > @@ -81,8 +81,6 @@ struct udl_framebuffer { > struct drm_framebuffer base; > struct udl_gem_object *obj; > bool active_16; /* active on the 16-bit channel */ > - int x1, y1, x2, y2; /* dirty rect */ > - spinlock_t dirty_lock; > }; > > #define to_udl_fb(x) container_of(x, struct udl_framebuffer, base) > diff --git a/drivers/gpu/drm/udl/udl_fb.c b/drivers/gpu/drm/udl/udl_fb.c > index a52de2f..4a9b432 100644 > --- a/drivers/gpu/drm/udl/udl_fb.c > +++ b/drivers/gpu/drm/udl/udl_fb.c > @@ -77,68 +77,6 @@ static uint16_t rgb16(uint32_t col) > } > #endif > > -/* > - * NOTE: fb_defio.c is holding info->fbdefio.mutex > - * Touching ANY framebuffer memory that triggers a page fault > - * in fb_defio will cause a deadlock, when it also tries to > - * grab the same mutex. > - */ > -static void udlfb_dpy_deferred_io(struct fb_info *info, > - struct list_head *pagelist) > -{ > - struct page *cur; > - struct fb_deferred_io *fbdefio = info->fbdefio; > - struct udl_fbdev *ufbdev = info->par; > - struct drm_device *dev = ufbdev->ufb.base.dev; > - struct udl_device *udl = dev->dev_private; > - struct urb *urb; > - char *cmd; > - cycles_t start_cycles, end_cycles; > - int bytes_sent = 0; > - int bytes_identical = 0; > - int bytes_rendered = 0; > - > - if (!fb_defio) > - return; > - > - start_cycles = get_cycles(); > - > - urb = udl_get_urb(dev); > - if (!urb) > - return; > - > - cmd = urb->transfer_buffer; > - > - /* walk the written page list and render each to device */ > - list_for_each_entry(cur, &fbdefio->pagelist, lru) { > - > - if (udl_render_hline(dev, (ufbdev->ufb.base.bits_per_pixel / 8), > - &urb, (char *) info->fix.smem_start, > - &cmd, cur->index << PAGE_SHIFT, > - cur->index << PAGE_SHIFT, > - PAGE_SIZE, &bytes_identical, &bytes_sent)) > - goto error; > - bytes_rendered += PAGE_SIZE; > - } > - > - if (cmd > (char *) urb->transfer_buffer) { > - /* Send partial buffer remaining before exiting */ > - int len = cmd - (char *) urb->transfer_buffer; > - udl_submit_urb(dev, urb, len); > - bytes_sent += len; > - } else > - udl_urb_completion(urb); > - > -error: > - atomic_add(bytes_sent, &udl->bytes_sent); > - atomic_add(bytes_identical, &udl->bytes_identical); > - atomic_add(bytes_rendered, &udl->bytes_rendered); > - end_cycles = get_cycles(); > - atomic_add(((unsigned int) ((end_cycles - start_cycles) > - >> 10)), /* Kcycles */ > - &udl->cpu_kcycles_used); > -} > - > int udl_handle_damage(struct udl_framebuffer *fb, int x, int y, > int width, int height) > { > @@ -152,9 +90,6 @@ int udl_handle_damage(struct udl_framebuffer *fb, int x, int y, > struct urb *urb; > int aligned_x; > int bpp = (fb->base.bits_per_pixel / 8); > - int x2, y2; > - bool store_for_later = false; > - unsigned long flags; > > if (!fb->active_16) > return 0; > @@ -180,38 +115,6 @@ int udl_handle_damage(struct udl_framebuffer *fb, int x, int y, > (y + height > fb->base.height)) > return -EINVAL; > > - /* if we are in atomic just store the info > - can't test inside spin lock */ > - if (in_atomic()) > - store_for_later = true; > - > - x2 = x + width - 1; > - y2 = y + height - 1; > - > - spin_lock_irqsave(&fb->dirty_lock, flags); > - > - if (fb->y1 < y) > - y = fb->y1; > - if (fb->y2 > y2) > - y2 = fb->y2; > - if (fb->x1 < x) > - x = fb->x1; > - if (fb->x2 > x2) > - x2 = fb->x2; > - > - if (store_for_later) { > - fb->x1 = x; > - fb->x2 = x2; > - fb->y1 = y; > - fb->y2 = y2; > - spin_unlock_irqrestore(&fb->dirty_lock, flags); > - return 0; > - } > - > - fb->x1 = fb->y1 = INT_MAX; > - fb->x2 = fb->y2 = 0; > - > - spin_unlock_irqrestore(&fb->dirty_lock, flags); > start_cycles = get_cycles(); > > urb = udl_get_urb(dev); > @@ -219,14 +122,14 @@ int udl_handle_damage(struct udl_framebuffer *fb, int x, int y, > return 0; > cmd = urb->transfer_buffer; > > - for (i = y; i <= y2 ; i++) { > + for (i = y; i < height ; i++) { > const int line_offset = fb->base.pitches[0] * i; > const int byte_offset = line_offset + (x * bpp); > const int dev_byte_offset = (fb->base.width * bpp * i) + (x * bpp); > if (udl_render_hline(dev, bpp, &urb, > (char *) fb->obj->vmapping, > &cmd, byte_offset, dev_byte_offset, > - (x2 - x + 1) * bpp, > + width * bpp, > &bytes_identical, &bytes_sent)) > goto error; > } > @@ -283,36 +186,6 @@ static int udl_fb_mmap(struct fb_info *info, struct vm_area_struct *vma) > return 0; > } > > -static void udl_fb_fillrect(struct fb_info *info, const struct fb_fillrect *rect) > -{ > - struct udl_fbdev *ufbdev = info->par; > - > - sys_fillrect(info, rect); > - > - udl_handle_damage(&ufbdev->ufb, rect->dx, rect->dy, rect->width, > - rect->height); > -} > - > -static void udl_fb_copyarea(struct fb_info *info, const struct fb_copyarea *region) > -{ > - struct udl_fbdev *ufbdev = info->par; > - > - sys_copyarea(info, region); > - > - udl_handle_damage(&ufbdev->ufb, region->dx, region->dy, region->width, > - region->height); > -} > - > -static void udl_fb_imageblit(struct fb_info *info, const struct fb_image *image) > -{ > - struct udl_fbdev *ufbdev = info->par; > - > - sys_imageblit(info, image); > - > - udl_handle_damage(&ufbdev->ufb, image->dx, image->dy, image->width, > - image->height); > -} > - > /* > * It's common for several clients to have framebuffer open simultaneously. > * e.g. both fbcon and X. Makes things interesting. > @@ -339,7 +212,7 @@ static int udl_fb_open(struct fb_info *info, int user) > > if (fbdefio) { > fbdefio->delay = DL_DEFIO_WRITE_DELAY; > - fbdefio->deferred_io = udlfb_dpy_deferred_io; > + fbdefio->deferred_io = drm_fb_helper_deferred_io; > } > > info->fbdefio = fbdefio; > @@ -379,9 +252,9 @@ static struct fb_ops udlfb_ops = { > .owner = THIS_MODULE, > .fb_check_var = drm_fb_helper_check_var, > .fb_set_par = drm_fb_helper_set_par, > - .fb_fillrect = udl_fb_fillrect, > - .fb_copyarea = udl_fb_copyarea, > - .fb_imageblit = udl_fb_imageblit, > + .fb_fillrect = drm_fb_helper_sys_fillrect, > + .fb_copyarea = drm_fb_helper_sys_copyarea, > + .fb_imageblit = drm_fb_helper_sys_imageblit, > .fb_pan_display = drm_fb_helper_pan_display, > .fb_blank = drm_fb_helper_blank, > .fb_setcmap = drm_fb_helper_setcmap, > @@ -458,7 +331,6 @@ udl_framebuffer_init(struct drm_device *dev, > { > int ret; > > - spin_lock_init(&ufb->dirty_lock); > ufb->obj = obj; > drm_helper_mode_fill_fb_struct(&ufb->base, mode_cmd); > ret = drm_framebuffer_init(dev, &ufb->base, &udlfb_funcs); > -- > 2.2.2 > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Date: Mon, 25 Apr 2016 09:17:04 +0000 Subject: Re: [PATCH v2 8/8] drm/udl: Use drm_fb_helper deferred_io support Message-Id: <20160425091704.GU2510@phenom.ffwll.local> List-Id: References: <1461530942-22485-1-git-send-email-noralf@tronnes.org> <1461530942-22485-9-git-send-email-noralf@tronnes.org> In-Reply-To: <1461530942-22485-9-git-send-email-noralf@tronnes.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable To: Noralf =?iso-8859-1?Q?Tr=F8nnes?= Cc: linux-fbdev@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, tomi.valkeinen@ti.com, laurent.pinchart@ideasonboard.com On Sun, Apr 24, 2016 at 10:49:02PM +0200, Noralf Tr=F8nnes wrote: > Use the fbdev deferred io support in drm_fb_helper. > The (struct fb_ops *)->fb_{fillrect,copyarea,imageblit} functions will > now schedule a worker instead of being flushed directly like it was > previously (recorded when in atomic). >=20 > This patch has only been compile tested. >=20 > Signed-off-by: Noralf Tr=F8nnes > --- >=20 > Changes since v1: > - No need to enable deferred_io by default since drm_fb_helper uses > a dedicated worker for flushing Hooray for deleting code. Reviewed-by: Daniel Vetter >=20 > drivers/gpu/drm/udl/udl_drv.h | 2 - > drivers/gpu/drm/udl/udl_fb.c | 140 ++----------------------------------= ------ > 2 files changed, 6 insertions(+), 136 deletions(-) >=20 > diff --git a/drivers/gpu/drm/udl/udl_drv.h b/drivers/gpu/drm/udl/udl_drv.h > index 4a064ef..0b03d34 100644 > --- a/drivers/gpu/drm/udl/udl_drv.h > +++ b/drivers/gpu/drm/udl/udl_drv.h > @@ -81,8 +81,6 @@ struct udl_framebuffer { > struct drm_framebuffer base; > struct udl_gem_object *obj; > bool active_16; /* active on the 16-bit channel */ > - int x1, y1, x2, y2; /* dirty rect */ > - spinlock_t dirty_lock; > }; >=20 > #define to_udl_fb(x) container_of(x, struct udl_framebuffer, base) > diff --git a/drivers/gpu/drm/udl/udl_fb.c b/drivers/gpu/drm/udl/udl_fb.c > index a52de2f..4a9b432 100644 > --- a/drivers/gpu/drm/udl/udl_fb.c > +++ b/drivers/gpu/drm/udl/udl_fb.c > @@ -77,68 +77,6 @@ static uint16_t rgb16(uint32_t col) > } > #endif >=20 > -/* > - * NOTE: fb_defio.c is holding info->fbdefio.mutex > - * Touching ANY framebuffer memory that triggers a page fault > - * in fb_defio will cause a deadlock, when it also tries to > - * grab the same mutex. > - */ > -static void udlfb_dpy_deferred_io(struct fb_info *info, > - struct list_head *pagelist) > -{ > - struct page *cur; > - struct fb_deferred_io *fbdefio =3D info->fbdefio; > - struct udl_fbdev *ufbdev =3D info->par; > - struct drm_device *dev =3D ufbdev->ufb.base.dev; > - struct udl_device *udl =3D dev->dev_private; > - struct urb *urb; > - char *cmd; > - cycles_t start_cycles, end_cycles; > - int bytes_sent =3D 0; > - int bytes_identical =3D 0; > - int bytes_rendered =3D 0; > - > - if (!fb_defio) > - return; > - > - start_cycles =3D get_cycles(); > - > - urb =3D udl_get_urb(dev); > - if (!urb) > - return; > - > - cmd =3D urb->transfer_buffer; > - > - /* walk the written page list and render each to device */ > - list_for_each_entry(cur, &fbdefio->pagelist, lru) { > - > - if (udl_render_hline(dev, (ufbdev->ufb.base.bits_per_pixel / 8), > - &urb, (char *) info->fix.smem_start, > - &cmd, cur->index << PAGE_SHIFT, > - cur->index << PAGE_SHIFT, > - PAGE_SIZE, &bytes_identical, &bytes_sent)) > - goto error; > - bytes_rendered +=3D PAGE_SIZE; > - } > - > - if (cmd > (char *) urb->transfer_buffer) { > - /* Send partial buffer remaining before exiting */ > - int len =3D cmd - (char *) urb->transfer_buffer; > - udl_submit_urb(dev, urb, len); > - bytes_sent +=3D len; > - } else > - udl_urb_completion(urb); > - > -error: > - atomic_add(bytes_sent, &udl->bytes_sent); > - atomic_add(bytes_identical, &udl->bytes_identical); > - atomic_add(bytes_rendered, &udl->bytes_rendered); > - end_cycles =3D get_cycles(); > - atomic_add(((unsigned int) ((end_cycles - start_cycles) > - >> 10)), /* Kcycles */ > - &udl->cpu_kcycles_used); > -} > - > int udl_handle_damage(struct udl_framebuffer *fb, int x, int y, > int width, int height) > { > @@ -152,9 +90,6 @@ int udl_handle_damage(struct udl_framebuffer *fb, int = x, int y, > struct urb *urb; > int aligned_x; > int bpp =3D (fb->base.bits_per_pixel / 8); > - int x2, y2; > - bool store_for_later =3D false; > - unsigned long flags; >=20 > if (!fb->active_16) > return 0; > @@ -180,38 +115,6 @@ int udl_handle_damage(struct udl_framebuffer *fb, in= t x, int y, > (y + height > fb->base.height)) > return -EINVAL; >=20 > - /* if we are in atomic just store the info > - can't test inside spin lock */ > - if (in_atomic()) > - store_for_later =3D true; > - > - x2 =3D x + width - 1; > - y2 =3D y + height - 1; > - > - spin_lock_irqsave(&fb->dirty_lock, flags); > - > - if (fb->y1 < y) > - y =3D fb->y1; > - if (fb->y2 > y2) > - y2 =3D fb->y2; > - if (fb->x1 < x) > - x =3D fb->x1; > - if (fb->x2 > x2) > - x2 =3D fb->x2; > - > - if (store_for_later) { > - fb->x1 =3D x; > - fb->x2 =3D x2; > - fb->y1 =3D y; > - fb->y2 =3D y2; > - spin_unlock_irqrestore(&fb->dirty_lock, flags); > - return 0; > - } > - > - fb->x1 =3D fb->y1 =3D INT_MAX; > - fb->x2 =3D fb->y2 =3D 0; > - > - spin_unlock_irqrestore(&fb->dirty_lock, flags); > start_cycles =3D get_cycles(); >=20 > urb =3D udl_get_urb(dev); > @@ -219,14 +122,14 @@ int udl_handle_damage(struct udl_framebuffer *fb, i= nt x, int y, > return 0; > cmd =3D urb->transfer_buffer; >=20 > - for (i =3D y; i <=3D y2 ; i++) { > + for (i =3D y; i < height ; i++) { > const int line_offset =3D fb->base.pitches[0] * i; > const int byte_offset =3D line_offset + (x * bpp); > const int dev_byte_offset =3D (fb->base.width * bpp * i) + (x * bpp); > if (udl_render_hline(dev, bpp, &urb, > (char *) fb->obj->vmapping, > &cmd, byte_offset, dev_byte_offset, > - (x2 - x + 1) * bpp, > + width * bpp, > &bytes_identical, &bytes_sent)) > goto error; > } > @@ -283,36 +186,6 @@ static int udl_fb_mmap(struct fb_info *info, struct = vm_area_struct *vma) > return 0; > } >=20 > -static void udl_fb_fillrect(struct fb_info *info, const struct fb_fillre= ct *rect) > -{ > - struct udl_fbdev *ufbdev =3D info->par; > - > - sys_fillrect(info, rect); > - > - udl_handle_damage(&ufbdev->ufb, rect->dx, rect->dy, rect->width, > - rect->height); > -} > - > -static void udl_fb_copyarea(struct fb_info *info, const struct fb_copyar= ea *region) > -{ > - struct udl_fbdev *ufbdev =3D info->par; > - > - sys_copyarea(info, region); > - > - udl_handle_damage(&ufbdev->ufb, region->dx, region->dy, region->width, > - region->height); > -} > - > -static void udl_fb_imageblit(struct fb_info *info, const struct fb_image= *image) > -{ > - struct udl_fbdev *ufbdev =3D info->par; > - > - sys_imageblit(info, image); > - > - udl_handle_damage(&ufbdev->ufb, image->dx, image->dy, image->width, > - image->height); > -} > - > /* > * It's common for several clients to have framebuffer open simultaneous= ly. > * e.g. both fbcon and X. Makes things interesting. > @@ -339,7 +212,7 @@ static int udl_fb_open(struct fb_info *info, int user) >=20 > if (fbdefio) { > fbdefio->delay =3D DL_DEFIO_WRITE_DELAY; > - fbdefio->deferred_io =3D udlfb_dpy_deferred_io; > + fbdefio->deferred_io =3D drm_fb_helper_deferred_io; > } >=20 > info->fbdefio =3D fbdefio; > @@ -379,9 +252,9 @@ static struct fb_ops udlfb_ops =3D { > .owner =3D THIS_MODULE, > .fb_check_var =3D drm_fb_helper_check_var, > .fb_set_par =3D drm_fb_helper_set_par, > - .fb_fillrect =3D udl_fb_fillrect, > - .fb_copyarea =3D udl_fb_copyarea, > - .fb_imageblit =3D udl_fb_imageblit, > + .fb_fillrect =3D drm_fb_helper_sys_fillrect, > + .fb_copyarea =3D drm_fb_helper_sys_copyarea, > + .fb_imageblit =3D drm_fb_helper_sys_imageblit, > .fb_pan_display =3D drm_fb_helper_pan_display, > .fb_blank =3D drm_fb_helper_blank, > .fb_setcmap =3D drm_fb_helper_setcmap, > @@ -458,7 +331,6 @@ udl_framebuffer_init(struct drm_device *dev, > { > int ret; >=20 > - spin_lock_init(&ufb->dirty_lock); > ufb->obj =3D obj; > drm_helper_mode_fill_fb_struct(&ufb->base, mode_cmd); > ret =3D drm_framebuffer_init(dev, &ufb->base, &udlfb_funcs); > -- > 2.2.2 >=20 --=20 Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH v2 8/8] drm/udl: Use drm_fb_helper deferred_io support Date: Mon, 25 Apr 2016 11:17:04 +0200 Message-ID: <20160425091704.GU2510@phenom.ffwll.local> References: <1461530942-22485-1-git-send-email-noralf@tronnes.org> <1461530942-22485-9-git-send-email-noralf@tronnes.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wm0-x229.google.com (mail-wm0-x229.google.com [IPv6:2a00:1450:400c:c09::229]) by gabe.freedesktop.org (Postfix) with ESMTPS id 837E66E54E for ; Mon, 25 Apr 2016 09:17:09 +0000 (UTC) Received: by mail-wm0-x229.google.com with SMTP id e201so78369424wme.0 for ; Mon, 25 Apr 2016 02:17:09 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1461530942-22485-9-git-send-email-noralf@tronnes.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Noralf =?iso-8859-1?Q?Tr=F8nnes?= Cc: linux-fbdev@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, tomi.valkeinen@ti.com, laurent.pinchart@ideasonboard.com List-Id: dri-devel@lists.freedesktop.org T24gU3VuLCBBcHIgMjQsIDIwMTYgYXQgMTA6NDk6MDJQTSArMDIwMCwgTm9yYWxmIFRyw7hubmVz IHdyb3RlOgo+IFVzZSB0aGUgZmJkZXYgZGVmZXJyZWQgaW8gc3VwcG9ydCBpbiBkcm1fZmJfaGVs cGVyLgo+IFRoZSAoc3RydWN0IGZiX29wcyAqKS0+ZmJfe2ZpbGxyZWN0LGNvcHlhcmVhLGltYWdl YmxpdH0gZnVuY3Rpb25zIHdpbGwKPiBub3cgc2NoZWR1bGUgYSB3b3JrZXIgaW5zdGVhZCBvZiBi ZWluZyBmbHVzaGVkIGRpcmVjdGx5IGxpa2UgaXQgd2FzCj4gcHJldmlvdXNseSAocmVjb3JkZWQg d2hlbiBpbiBhdG9taWMpLgo+IAo+IFRoaXMgcGF0Y2ggaGFzIG9ubHkgYmVlbiBjb21waWxlIHRl c3RlZC4KPiAKPiBTaWduZWQtb2ZmLWJ5OiBOb3JhbGYgVHLDuG5uZXMgPG5vcmFsZkB0cm9ubmVz Lm9yZz4KPiAtLS0KPiAKPiBDaGFuZ2VzIHNpbmNlIHYxOgo+IC0gTm8gbmVlZCB0byBlbmFibGUg ZGVmZXJyZWRfaW8gYnkgZGVmYXVsdCBzaW5jZSBkcm1fZmJfaGVscGVyIHVzZXMKPiAgIGEgZGVk aWNhdGVkIHdvcmtlciBmb3IgZmx1c2hpbmcKCkhvb3JheSBmb3IgZGVsZXRpbmcgY29kZS4gUmV2 aWV3ZWQtYnk6IERhbmllbCBWZXR0ZXIgPGRhbmllbC52ZXR0ZXJAZmZ3bGwuY2g+Cgo+IAo+ICBk cml2ZXJzL2dwdS9kcm0vdWRsL3VkbF9kcnYuaCB8ICAgMiAtCj4gIGRyaXZlcnMvZ3B1L2RybS91 ZGwvdWRsX2ZiLmMgIHwgMTQwICsrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLQo+ICAyIGZpbGVzIGNoYW5nZWQsIDYgaW5zZXJ0aW9ucygrKSwgMTM2IGRlbGV0aW9ucygt KQo+IAo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vdWRsL3VkbF9kcnYuaCBiL2RyaXZl cnMvZ3B1L2RybS91ZGwvdWRsX2Rydi5oCj4gaW5kZXggNGEwNjRlZi4uMGIwM2QzNCAxMDA2NDQK PiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vdWRsL3VkbF9kcnYuaAo+ICsrKyBiL2RyaXZlcnMvZ3B1 L2RybS91ZGwvdWRsX2Rydi5oCj4gQEAgLTgxLDggKzgxLDYgQEAgc3RydWN0IHVkbF9mcmFtZWJ1 ZmZlciB7Cj4gIAlzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyIGJhc2U7Cj4gIAlzdHJ1Y3QgdWRsX2dl bV9vYmplY3QgKm9iajsKPiAgCWJvb2wgYWN0aXZlXzE2OyAvKiBhY3RpdmUgb24gdGhlIDE2LWJp dCBjaGFubmVsICovCj4gLQlpbnQgeDEsIHkxLCB4MiwgeTI7IC8qIGRpcnR5IHJlY3QgKi8KPiAt CXNwaW5sb2NrX3QgZGlydHlfbG9jazsKPiAgfTsKPiAKPiAgI2RlZmluZSB0b191ZGxfZmIoeCkg Y29udGFpbmVyX29mKHgsIHN0cnVjdCB1ZGxfZnJhbWVidWZmZXIsIGJhc2UpCj4gZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS91ZGwvdWRsX2ZiLmMgYi9kcml2ZXJzL2dwdS9kcm0vdWRsL3Vk bF9mYi5jCj4gaW5kZXggYTUyZGUyZi4uNGE5YjQzMiAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL2dw dS9kcm0vdWRsL3VkbF9mYi5jCj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL3VkbC91ZGxfZmIuYwo+ IEBAIC03Nyw2OCArNzcsNiBAQCBzdGF0aWMgdWludDE2X3QgcmdiMTYodWludDMyX3QgY29sKQo+ ICB9Cj4gICNlbmRpZgo+IAo+IC0vKgo+IC0gKiBOT1RFOiBmYl9kZWZpby5jIGlzIGhvbGRpbmcg aW5mby0+ZmJkZWZpby5tdXRleAo+IC0gKiAgIFRvdWNoaW5nIEFOWSBmcmFtZWJ1ZmZlciBtZW1v cnkgdGhhdCB0cmlnZ2VycyBhIHBhZ2UgZmF1bHQKPiAtICogICBpbiBmYl9kZWZpbyB3aWxsIGNh dXNlIGEgZGVhZGxvY2ssIHdoZW4gaXQgYWxzbyB0cmllcyB0bwo+IC0gKiAgIGdyYWIgdGhlIHNh bWUgbXV0ZXguCj4gLSAqLwo+IC1zdGF0aWMgdm9pZCB1ZGxmYl9kcHlfZGVmZXJyZWRfaW8oc3Ry dWN0IGZiX2luZm8gKmluZm8sCj4gLQkJCQkgIHN0cnVjdCBsaXN0X2hlYWQgKnBhZ2VsaXN0KQo+ IC17Cj4gLQlzdHJ1Y3QgcGFnZSAqY3VyOwo+IC0Jc3RydWN0IGZiX2RlZmVycmVkX2lvICpmYmRl ZmlvID0gaW5mby0+ZmJkZWZpbzsKPiAtCXN0cnVjdCB1ZGxfZmJkZXYgKnVmYmRldiA9IGluZm8t PnBhcjsKPiAtCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSB1ZmJkZXYtPnVmYi5iYXNlLmRldjsK PiAtCXN0cnVjdCB1ZGxfZGV2aWNlICp1ZGwgPSBkZXYtPmRldl9wcml2YXRlOwo+IC0Jc3RydWN0 IHVyYiAqdXJiOwo+IC0JY2hhciAqY21kOwo+IC0JY3ljbGVzX3Qgc3RhcnRfY3ljbGVzLCBlbmRf Y3ljbGVzOwo+IC0JaW50IGJ5dGVzX3NlbnQgPSAwOwo+IC0JaW50IGJ5dGVzX2lkZW50aWNhbCA9 IDA7Cj4gLQlpbnQgYnl0ZXNfcmVuZGVyZWQgPSAwOwo+IC0KPiAtCWlmICghZmJfZGVmaW8pCj4g LQkJcmV0dXJuOwo+IC0KPiAtCXN0YXJ0X2N5Y2xlcyA9IGdldF9jeWNsZXMoKTsKPiAtCj4gLQl1 cmIgPSB1ZGxfZ2V0X3VyYihkZXYpOwo+IC0JaWYgKCF1cmIpCj4gLQkJcmV0dXJuOwo+IC0KPiAt CWNtZCA9IHVyYi0+dHJhbnNmZXJfYnVmZmVyOwo+IC0KPiAtCS8qIHdhbGsgdGhlIHdyaXR0ZW4g cGFnZSBsaXN0IGFuZCByZW5kZXIgZWFjaCB0byBkZXZpY2UgKi8KPiAtCWxpc3RfZm9yX2VhY2hf ZW50cnkoY3VyLCAmZmJkZWZpby0+cGFnZWxpc3QsIGxydSkgewo+IC0KPiAtCQlpZiAodWRsX3Jl bmRlcl9obGluZShkZXYsICh1ZmJkZXYtPnVmYi5iYXNlLmJpdHNfcGVyX3BpeGVsIC8gOCksCj4g LQkJCQkgICAgICZ1cmIsIChjaGFyICopIGluZm8tPmZpeC5zbWVtX3N0YXJ0LAo+IC0JCQkJICAg ICAmY21kLCBjdXItPmluZGV4IDw8IFBBR0VfU0hJRlQsCj4gLQkJCQkgICAgIGN1ci0+aW5kZXgg PDwgUEFHRV9TSElGVCwKPiAtCQkJCSAgICAgUEFHRV9TSVpFLCAmYnl0ZXNfaWRlbnRpY2FsLCAm Ynl0ZXNfc2VudCkpCj4gLQkJCWdvdG8gZXJyb3I7Cj4gLQkJYnl0ZXNfcmVuZGVyZWQgKz0gUEFH RV9TSVpFOwo+IC0JfQo+IC0KPiAtCWlmIChjbWQgPiAoY2hhciAqKSB1cmItPnRyYW5zZmVyX2J1 ZmZlcikgewo+IC0JCS8qIFNlbmQgcGFydGlhbCBidWZmZXIgcmVtYWluaW5nIGJlZm9yZSBleGl0 aW5nICovCj4gLQkJaW50IGxlbiA9IGNtZCAtIChjaGFyICopIHVyYi0+dHJhbnNmZXJfYnVmZmVy Owo+IC0JCXVkbF9zdWJtaXRfdXJiKGRldiwgdXJiLCBsZW4pOwo+IC0JCWJ5dGVzX3NlbnQgKz0g bGVuOwo+IC0JfSBlbHNlCj4gLQkJdWRsX3VyYl9jb21wbGV0aW9uKHVyYik7Cj4gLQo+IC1lcnJv cjoKPiAtCWF0b21pY19hZGQoYnl0ZXNfc2VudCwgJnVkbC0+Ynl0ZXNfc2VudCk7Cj4gLQlhdG9t aWNfYWRkKGJ5dGVzX2lkZW50aWNhbCwgJnVkbC0+Ynl0ZXNfaWRlbnRpY2FsKTsKPiAtCWF0b21p Y19hZGQoYnl0ZXNfcmVuZGVyZWQsICZ1ZGwtPmJ5dGVzX3JlbmRlcmVkKTsKPiAtCWVuZF9jeWNs ZXMgPSBnZXRfY3ljbGVzKCk7Cj4gLQlhdG9taWNfYWRkKCgodW5zaWduZWQgaW50KSAoKGVuZF9j eWNsZXMgLSBzdGFydF9jeWNsZXMpCj4gLQkJICAgID4+IDEwKSksIC8qIEtjeWNsZXMgKi8KPiAt CQkgICAmdWRsLT5jcHVfa2N5Y2xlc191c2VkKTsKPiAtfQo+IC0KPiAgaW50IHVkbF9oYW5kbGVf ZGFtYWdlKHN0cnVjdCB1ZGxfZnJhbWVidWZmZXIgKmZiLCBpbnQgeCwgaW50IHksCj4gIAkJICAg ICAgaW50IHdpZHRoLCBpbnQgaGVpZ2h0KQo+ICB7Cj4gQEAgLTE1Miw5ICs5MCw2IEBAIGludCB1 ZGxfaGFuZGxlX2RhbWFnZShzdHJ1Y3QgdWRsX2ZyYW1lYnVmZmVyICpmYiwgaW50IHgsIGludCB5 LAo+ICAJc3RydWN0IHVyYiAqdXJiOwo+ICAJaW50IGFsaWduZWRfeDsKPiAgCWludCBicHAgPSAo ZmItPmJhc2UuYml0c19wZXJfcGl4ZWwgLyA4KTsKPiAtCWludCB4MiwgeTI7Cj4gLQlib29sIHN0 b3JlX2Zvcl9sYXRlciA9IGZhbHNlOwo+IC0JdW5zaWduZWQgbG9uZyBmbGFnczsKPiAKPiAgCWlm ICghZmItPmFjdGl2ZV8xNikKPiAgCQlyZXR1cm4gMDsKPiBAQCAtMTgwLDM4ICsxMTUsNiBAQCBp bnQgdWRsX2hhbmRsZV9kYW1hZ2Uoc3RydWN0IHVkbF9mcmFtZWJ1ZmZlciAqZmIsIGludCB4LCBp bnQgeSwKPiAgCSAgICAoeSArIGhlaWdodCA+IGZiLT5iYXNlLmhlaWdodCkpCj4gIAkJcmV0dXJu IC1FSU5WQUw7Cj4gCj4gLQkvKiBpZiB3ZSBhcmUgaW4gYXRvbWljIGp1c3Qgc3RvcmUgdGhlIGlu Zm8KPiAtCSAgIGNhbid0IHRlc3QgaW5zaWRlIHNwaW4gbG9jayAqLwo+IC0JaWYgKGluX2F0b21p YygpKQo+IC0JCXN0b3JlX2Zvcl9sYXRlciA9IHRydWU7Cj4gLQo+IC0JeDIgPSB4ICsgd2lkdGgg LSAxOwo+IC0JeTIgPSB5ICsgaGVpZ2h0IC0gMTsKPiAtCj4gLQlzcGluX2xvY2tfaXJxc2F2ZSgm ZmItPmRpcnR5X2xvY2ssIGZsYWdzKTsKPiAtCj4gLQlpZiAoZmItPnkxIDwgeSkKPiAtCQl5ID0g ZmItPnkxOwo+IC0JaWYgKGZiLT55MiA+IHkyKQo+IC0JCXkyID0gZmItPnkyOwo+IC0JaWYgKGZi LT54MSA8IHgpCj4gLQkJeCA9IGZiLT54MTsKPiAtCWlmIChmYi0+eDIgPiB4MikKPiAtCQl4MiA9 IGZiLT54MjsKPiAtCj4gLQlpZiAoc3RvcmVfZm9yX2xhdGVyKSB7Cj4gLQkJZmItPngxID0geDsK PiAtCQlmYi0+eDIgPSB4MjsKPiAtCQlmYi0+eTEgPSB5Owo+IC0JCWZiLT55MiA9IHkyOwo+IC0J CXNwaW5fdW5sb2NrX2lycXJlc3RvcmUoJmZiLT5kaXJ0eV9sb2NrLCBmbGFncyk7Cj4gLQkJcmV0 dXJuIDA7Cj4gLQl9Cj4gLQo+IC0JZmItPngxID0gZmItPnkxID0gSU5UX01BWDsKPiAtCWZiLT54 MiA9IGZiLT55MiA9IDA7Cj4gLQo+IC0Jc3Bpbl91bmxvY2tfaXJxcmVzdG9yZSgmZmItPmRpcnR5 X2xvY2ssIGZsYWdzKTsKPiAgCXN0YXJ0X2N5Y2xlcyA9IGdldF9jeWNsZXMoKTsKPiAKPiAgCXVy YiA9IHVkbF9nZXRfdXJiKGRldik7Cj4gQEAgLTIxOSwxNCArMTIyLDE0IEBAIGludCB1ZGxfaGFu ZGxlX2RhbWFnZShzdHJ1Y3QgdWRsX2ZyYW1lYnVmZmVyICpmYiwgaW50IHgsIGludCB5LAo+ICAJ CXJldHVybiAwOwo+ICAJY21kID0gdXJiLT50cmFuc2Zlcl9idWZmZXI7Cj4gCj4gLQlmb3IgKGkg PSB5OyBpIDw9IHkyIDsgaSsrKSB7Cj4gKwlmb3IgKGkgPSB5OyBpIDwgaGVpZ2h0IDsgaSsrKSB7 Cj4gIAkJY29uc3QgaW50IGxpbmVfb2Zmc2V0ID0gZmItPmJhc2UucGl0Y2hlc1swXSAqIGk7Cj4g IAkJY29uc3QgaW50IGJ5dGVfb2Zmc2V0ID0gbGluZV9vZmZzZXQgKyAoeCAqIGJwcCk7Cj4gIAkJ Y29uc3QgaW50IGRldl9ieXRlX29mZnNldCA9IChmYi0+YmFzZS53aWR0aCAqIGJwcCAqIGkpICsg KHggKiBicHApOwo+ICAJCWlmICh1ZGxfcmVuZGVyX2hsaW5lKGRldiwgYnBwLCAmdXJiLAo+ICAJ CQkJICAgICAoY2hhciAqKSBmYi0+b2JqLT52bWFwcGluZywKPiAgCQkJCSAgICAgJmNtZCwgYnl0 ZV9vZmZzZXQsIGRldl9ieXRlX29mZnNldCwKPiAtCQkJCSAgICAgKHgyIC0geCArIDEpICogYnBw LAo+ICsJCQkJICAgICB3aWR0aCAqIGJwcCwKPiAgCQkJCSAgICAgJmJ5dGVzX2lkZW50aWNhbCwg JmJ5dGVzX3NlbnQpKQo+ICAJCQlnb3RvIGVycm9yOwo+ICAJfQo+IEBAIC0yODMsMzYgKzE4Niw2 IEBAIHN0YXRpYyBpbnQgdWRsX2ZiX21tYXAoc3RydWN0IGZiX2luZm8gKmluZm8sIHN0cnVjdCB2 bV9hcmVhX3N0cnVjdCAqdm1hKQo+ICAJcmV0dXJuIDA7Cj4gIH0KPiAKPiAtc3RhdGljIHZvaWQg dWRsX2ZiX2ZpbGxyZWN0KHN0cnVjdCBmYl9pbmZvICppbmZvLCBjb25zdCBzdHJ1Y3QgZmJfZmls bHJlY3QgKnJlY3QpCj4gLXsKPiAtCXN0cnVjdCB1ZGxfZmJkZXYgKnVmYmRldiA9IGluZm8tPnBh cjsKPiAtCj4gLQlzeXNfZmlsbHJlY3QoaW5mbywgcmVjdCk7Cj4gLQo+IC0JdWRsX2hhbmRsZV9k YW1hZ2UoJnVmYmRldi0+dWZiLCByZWN0LT5keCwgcmVjdC0+ZHksIHJlY3QtPndpZHRoLAo+IC0J CQkgIHJlY3QtPmhlaWdodCk7Cj4gLX0KPiAtCj4gLXN0YXRpYyB2b2lkIHVkbF9mYl9jb3B5YXJl YShzdHJ1Y3QgZmJfaW5mbyAqaW5mbywgY29uc3Qgc3RydWN0IGZiX2NvcHlhcmVhICpyZWdpb24p Cj4gLXsKPiAtCXN0cnVjdCB1ZGxfZmJkZXYgKnVmYmRldiA9IGluZm8tPnBhcjsKPiAtCj4gLQlz eXNfY29weWFyZWEoaW5mbywgcmVnaW9uKTsKPiAtCj4gLQl1ZGxfaGFuZGxlX2RhbWFnZSgmdWZi ZGV2LT51ZmIsIHJlZ2lvbi0+ZHgsIHJlZ2lvbi0+ZHksIHJlZ2lvbi0+d2lkdGgsCj4gLQkJCSAg cmVnaW9uLT5oZWlnaHQpOwo+IC19Cj4gLQo+IC1zdGF0aWMgdm9pZCB1ZGxfZmJfaW1hZ2VibGl0 KHN0cnVjdCBmYl9pbmZvICppbmZvLCBjb25zdCBzdHJ1Y3QgZmJfaW1hZ2UgKmltYWdlKQo+IC17 Cj4gLQlzdHJ1Y3QgdWRsX2ZiZGV2ICp1ZmJkZXYgPSBpbmZvLT5wYXI7Cj4gLQo+IC0Jc3lzX2lt YWdlYmxpdChpbmZvLCBpbWFnZSk7Cj4gLQo+IC0JdWRsX2hhbmRsZV9kYW1hZ2UoJnVmYmRldi0+ dWZiLCBpbWFnZS0+ZHgsIGltYWdlLT5keSwgaW1hZ2UtPndpZHRoLAo+IC0JCQkgIGltYWdlLT5o ZWlnaHQpOwo+IC19Cj4gLQo+ICAvKgo+ICAgKiBJdCdzIGNvbW1vbiBmb3Igc2V2ZXJhbCBjbGll bnRzIHRvIGhhdmUgZnJhbWVidWZmZXIgb3BlbiBzaW11bHRhbmVvdXNseS4KPiAgICogZS5nLiBi b3RoIGZiY29uIGFuZCBYLiBNYWtlcyB0aGluZ3MgaW50ZXJlc3RpbmcuCj4gQEAgLTMzOSw3ICsy MTIsNyBAQCBzdGF0aWMgaW50IHVkbF9mYl9vcGVuKHN0cnVjdCBmYl9pbmZvICppbmZvLCBpbnQg dXNlcikKPiAKPiAgCQlpZiAoZmJkZWZpbykgewo+ICAJCQlmYmRlZmlvLT5kZWxheSA9IERMX0RF RklPX1dSSVRFX0RFTEFZOwo+IC0JCQlmYmRlZmlvLT5kZWZlcnJlZF9pbyA9IHVkbGZiX2RweV9k ZWZlcnJlZF9pbzsKPiArCQkJZmJkZWZpby0+ZGVmZXJyZWRfaW8gPSBkcm1fZmJfaGVscGVyX2Rl ZmVycmVkX2lvOwo+ICAJCX0KPiAKPiAgCQlpbmZvLT5mYmRlZmlvID0gZmJkZWZpbzsKPiBAQCAt Mzc5LDkgKzI1Miw5IEBAIHN0YXRpYyBzdHJ1Y3QgZmJfb3BzIHVkbGZiX29wcyA9IHsKPiAgCS5v d25lciA9IFRISVNfTU9EVUxFLAo+ICAJLmZiX2NoZWNrX3ZhciA9IGRybV9mYl9oZWxwZXJfY2hl Y2tfdmFyLAo+ICAJLmZiX3NldF9wYXIgPSBkcm1fZmJfaGVscGVyX3NldF9wYXIsCj4gLQkuZmJf ZmlsbHJlY3QgPSB1ZGxfZmJfZmlsbHJlY3QsCj4gLQkuZmJfY29weWFyZWEgPSB1ZGxfZmJfY29w eWFyZWEsCj4gLQkuZmJfaW1hZ2VibGl0ID0gdWRsX2ZiX2ltYWdlYmxpdCwKPiArCS5mYl9maWxs cmVjdCA9IGRybV9mYl9oZWxwZXJfc3lzX2ZpbGxyZWN0LAo+ICsJLmZiX2NvcHlhcmVhID0gZHJt X2ZiX2hlbHBlcl9zeXNfY29weWFyZWEsCj4gKwkuZmJfaW1hZ2VibGl0ID0gZHJtX2ZiX2hlbHBl cl9zeXNfaW1hZ2VibGl0LAo+ICAJLmZiX3Bhbl9kaXNwbGF5ID0gZHJtX2ZiX2hlbHBlcl9wYW5f ZGlzcGxheSwKPiAgCS5mYl9ibGFuayA9IGRybV9mYl9oZWxwZXJfYmxhbmssCj4gIAkuZmJfc2V0 Y21hcCA9IGRybV9mYl9oZWxwZXJfc2V0Y21hcCwKPiBAQCAtNDU4LDcgKzMzMSw2IEBAIHVkbF9m cmFtZWJ1ZmZlcl9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCj4gIHsKPiAgCWludCByZXQ7 Cj4gCj4gLQlzcGluX2xvY2tfaW5pdCgmdWZiLT5kaXJ0eV9sb2NrKTsKPiAgCXVmYi0+b2JqID0g b2JqOwo+ICAJZHJtX2hlbHBlcl9tb2RlX2ZpbGxfZmJfc3RydWN0KCZ1ZmItPmJhc2UsIG1vZGVf Y21kKTsKPiAgCXJldCA9IGRybV9mcmFtZWJ1ZmZlcl9pbml0KGRldiwgJnVmYi0+YmFzZSwgJnVk bGZiX2Z1bmNzKTsKPiAtLQo+IDIuMi4yCj4gCgotLSAKRGFuaWVsIFZldHRlcgpTb2Z0d2FyZSBF bmdpbmVlciwgSW50ZWwgQ29ycG9yYXRpb24KaHR0cDovL2Jsb2cuZmZ3bGwuY2gKX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcg bGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRl c2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg==