From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1DA5AC04AB6 for ; Tue, 28 May 2019 09:04:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DED7420B7C for ; Tue, 28 May 2019 09:04:34 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=ffwll.ch header.i=@ffwll.ch header.b="dYYBlrvt" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727417AbfE1JEe (ORCPT ); Tue, 28 May 2019 05:04:34 -0400 Received: from mail-ed1-f68.google.com ([209.85.208.68]:33607 "EHLO mail-ed1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727179AbfE1JDq (ORCPT ); Tue, 28 May 2019 05:03:46 -0400 Received: by mail-ed1-f68.google.com with SMTP id n17so30689151edb.0 for ; Tue, 28 May 2019 02:03:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=rNBJhiQm3QtWHoSITdA9k7CBQWZOP0J/7NNptnKcbZo=; b=dYYBlrvtmXuD/rIq0AB0jguBiU/CNNLAbA6WmSlJQIZ+yRCtx/LctjbM1MQD0W/b1y qLcBRd2UA/UxgxFxWmst9VBs+4cNWDRtceOXBTs/vxprZ2s4IAYBexP6TqvhJX1JQKPQ 7DiZ1IZlG5hVp9FoIf3aOBg1jXZNd+XeHj29g= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=rNBJhiQm3QtWHoSITdA9k7CBQWZOP0J/7NNptnKcbZo=; b=lFN72gwSkngkMcGZsgB3EdZK5pisED0o7MV/GD1Zc95JZ/R8XzJhcOB+rIDtpTZLB9 xPs2PI2ItKGGDdGoXCyOYAdBOKd/reHmfcYg137KBDoNfW/Wl61ow6kf7D4l51zgfNsC cmA6Zu0Q2I61gMFTx8Zf3+T442eXbb33GmHmIFA99t7+HtN0y5KR08uRrwjD89h2Iy+b Y241N8/tfm2LQWyYewwsCxTqKQeIfSK7j0KOmv7H33OWHx4W1gG6Zbu6QCcSLCg96y7C bSgSW6EpPRmGKlnxfLuf1pN9VaVBRQ9Av8Y+U0174Gcv9xz9z+NtCc0zh3tD9oL5XEuq 7a4A== X-Gm-Message-State: APjAAAVYZId0c+AF58IAkOUkV5VAyl1bRtEvDvlZaZpaAe0djGUXFUND 76VH+kJ2GFOnItXmSTolBGR/WaAgBh8= X-Google-Smtp-Source: APXvYqxNNixKWrlzaYumQEkWdIfNSLuYtCKS5s2p8GnMvuoJF4Q+3V//pjVusGXfoJ8b89my2E1rng== X-Received: by 2002:a17:906:cd08:: with SMTP id oz8mr55467207ejb.67.1559034223020; Tue, 28 May 2019 02:03:43 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:569e:0:3106:d637:d723:e855]) by smtp.gmail.com with ESMTPSA id x49sm4072656edm.25.2019.05.28.02.03.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 28 May 2019 02:03:42 -0700 (PDT) From: Daniel Vetter To: LKML Cc: DRI Development , Intel Graphics Development , linux-fbdev@vger.kernel.org, Daniel Thompson , Bartlomiej Zolnierkiewicz , Daniel Vetter , Daniel Vetter , Sam Ravnborg , Maarten Lankhorst , Hans de Goede , Mikulas Patocka , Sergey Senozhatsky , Kees Cook , Peter Rosin , Yisheng Xie , =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= Subject: [PATCH 22/33] fbcon: Call fbcon_mode_deleted/new_modelist directly Date: Tue, 28 May 2019 11:02:53 +0200 Message-Id: <20190528090304.9388-23-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190528090304.9388-1-daniel.vetter@ffwll.ch> References: <20190528090304.9388-1-daniel.vetter@ffwll.ch> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org I'm not entirely clear on what new_modelist actually does, it seems exclusively for a sysfs interface. Which in the end does amount to a normal fb_set_par to check the mode, but then takes a different path in both fbmem.c and fbcon.c. I have no idea why these 2 paths are different, but then I also don't really want to find out. So just do the simple conversion to a direct function call. v2: static inline for the dummy versions, I forgot. Signed-off-by: Daniel Vetter Reviewed-by: Sam Ravnborg Reviewed-by: Maarten Lankhorst Cc: Bartlomiej Zolnierkiewicz Cc: Daniel Vetter Cc: Hans de Goede Cc: Mikulas Patocka Cc: Sergey Senozhatsky Cc: Kees Cook Cc: Peter Rosin Cc: Yisheng Xie Cc: "Michał Mirosław" Cc: linux-fbdev@vger.kernel.org --- drivers/video/fbdev/core/fbcon.c | 14 +++----------- drivers/video/fbdev/core/fbmem.c | 22 +++++++--------------- include/linux/fb.h | 5 ----- include/linux/fbcon.h | 6 ++++++ 4 files changed, 16 insertions(+), 31 deletions(-) diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fbcon.c index e3267d71395c..515366308537 100644 --- a/drivers/video/fbdev/core/fbcon.c +++ b/drivers/video/fbdev/core/fbcon.c @@ -3019,8 +3019,8 @@ static void fbcon_set_all_vcs(struct fb_info *info) fbcon_modechanged(info); } -static int fbcon_mode_deleted(struct fb_info *info, - struct fb_videomode *mode) +int fbcon_mode_deleted(struct fb_info *info, + struct fb_videomode *mode) { struct fb_info *fb_info; struct fbcon_display *p; @@ -3262,7 +3262,7 @@ static void fbcon_fb_blanked(struct fb_info *info, int blank) ops->blank_state = blank; } -static void fbcon_new_modelist(struct fb_info *info) +void fbcon_new_modelist(struct fb_info *info) { int i; struct vc_data *vc; @@ -3324,7 +3324,6 @@ static int fbcon_event_notify(struct notifier_block *self, { struct fb_event *event = data; struct fb_info *info = event->info; - struct fb_videomode *mode; struct fb_con2fbmap *con2fb; struct fb_blit_caps *caps; int idx, ret = 0; @@ -3336,10 +3335,6 @@ static int fbcon_event_notify(struct notifier_block *self, case FB_EVENT_MODE_CHANGE_ALL: fbcon_set_all_vcs(info); break; - case FB_EVENT_MODE_DELETE: - mode = event->data; - ret = fbcon_mode_deleted(info, mode); - break; case FB_EVENT_SET_CONSOLE_MAP: /* called with console lock held */ con2fb = event->data; @@ -3353,9 +3348,6 @@ static int fbcon_event_notify(struct notifier_block *self, case FB_EVENT_BLANK: fbcon_fb_blanked(info, *(int *)event->data); break; - case FB_EVENT_NEW_MODELIST: - fbcon_new_modelist(info); - break; case FB_EVENT_GET_REQ: caps = event->data; fbcon_get_requirement(info, caps); diff --git a/drivers/video/fbdev/core/fbmem.c b/drivers/video/fbdev/core/fbmem.c index 73269dedcd45..cbdd141e7695 100644 --- a/drivers/video/fbdev/core/fbmem.c +++ b/drivers/video/fbdev/core/fbmem.c @@ -966,16 +966,11 @@ fb_set_var(struct fb_info *info, struct fb_var_screeninfo *var) /* make sure we don't delete the videomode of current var */ ret = fb_mode_is_equal(&mode1, &mode2); - if (!ret) { - struct fb_event event; - - event.info = info; - event.data = &mode1; - ret = fb_notifier_call_chain(FB_EVENT_MODE_DELETE, &event); - } + if (!ret) + fbcon_mode_deleted(info, &mode1); if (!ret) - fb_delete_videomode(&mode1, &info->modelist); + fb_delete_videomode(&mode1, &info->modelist); ret = (ret) ? -EINVAL : 0; @@ -1992,7 +1987,6 @@ subsys_initcall(fbmem_init); int fb_new_modelist(struct fb_info *info) { - struct fb_event event; struct fb_var_screeninfo var = info->var; struct list_head *pos, *n; struct fb_modelist *modelist; @@ -2012,14 +2006,12 @@ int fb_new_modelist(struct fb_info *info) } } - err = 1; + if (list_empty(&info->modelist)) + return 1; - if (!list_empty(&info->modelist)) { - event.info = info; - err = fb_notifier_call_chain(FB_EVENT_NEW_MODELIST, &event); - } + fbcon_new_modelist(info); - return err; + return 0; } MODULE_LICENSE("GPL"); diff --git a/include/linux/fb.h b/include/linux/fb.h index 794b386415b7..7a788ed8c7b5 100644 --- a/include/linux/fb.h +++ b/include/linux/fb.h @@ -126,8 +126,6 @@ struct fb_cursor_user { /* The resolution of the passed in fb_info about to change */ #define FB_EVENT_MODE_CHANGE 0x01 -/* An entry from the modelist was removed */ -#define FB_EVENT_MODE_DELETE 0x04 #ifdef CONFIG_GUMSTIX_AM200EPD /* only used by mach-pxa/am200epd.c */ @@ -142,9 +140,6 @@ struct fb_cursor_user { /* A hardware display blank change occurred */ #define FB_EVENT_BLANK 0x09 /* Private modelist is to be replaced */ -#define FB_EVENT_NEW_MODELIST 0x0A -/* The resolution of the passed in fb_info about to change and - all vc's should be changed */ #define FB_EVENT_MODE_CHANGE_ALL 0x0B /* A software display blank change occurred */ #define FB_EVENT_CONBLANK 0x0C diff --git a/include/linux/fbcon.h b/include/linux/fbcon.h index 790c42ec7b5d..c139834342f5 100644 --- a/include/linux/fbcon.h +++ b/include/linux/fbcon.h @@ -9,6 +9,9 @@ void fbcon_fb_unregistered(struct fb_info *info); void fbcon_fb_unbind(struct fb_info *info); void fbcon_suspended(struct fb_info *info); void fbcon_resumed(struct fb_info *info); +int fbcon_mode_deleted(struct fb_info *info, + struct fb_videomode *mode); +void fbcon_new_modelist(struct fb_info *info); #else static inline void fb_console_init(void) {} static inline void fb_console_exit(void) {} @@ -17,6 +20,9 @@ static inline void fbcon_fb_unregistered(struct fb_info *info) {} static inline void fbcon_fb_unbind(struct fb_info *info) {} static inline void fbcon_suspended(struct fb_info *info) {} static inline void fbcon_resumed(struct fb_info *info) {} +static inline int fbcon_mode_deleted(struct fb_info *info, + struct fb_videomode *mode) { return 0; } +static inline void fbcon_new_modelist(struct fb_info *info) {} #endif #endif /* _LINUX_FBCON_H */ -- 2.20.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Date: Tue, 28 May 2019 09:02:53 +0000 Subject: [PATCH 22/33] fbcon: Call fbcon_mode_deleted/new_modelist directly Message-Id: <20190528090304.9388-23-daniel.vetter@ffwll.ch> List-Id: References: <20190528090304.9388-1-daniel.vetter@ffwll.ch> In-Reply-To: <20190528090304.9388-1-daniel.vetter@ffwll.ch> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit To: LKML Cc: Daniel Thompson , Sergey Senozhatsky , Kees Cook , Bartlomiej Zolnierkiewicz , Daniel Vetter , Intel Graphics Development , linux-fbdev@vger.kernel.org, DRI Development , =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= , Yisheng Xie , Hans de Goede , Mikulas Patocka , Daniel Vetter , Sam Ravnborg , Peter Rosin I'm not entirely clear on what new_modelist actually does, it seems exclusively for a sysfs interface. Which in the end does amount to a normal fb_set_par to check the mode, but then takes a different path in both fbmem.c and fbcon.c. I have no idea why these 2 paths are different, but then I also don't really want to find out. So just do the simple conversion to a direct function call. v2: static inline for the dummy versions, I forgot. Signed-off-by: Daniel Vetter Reviewed-by: Sam Ravnborg Reviewed-by: Maarten Lankhorst Cc: Bartlomiej Zolnierkiewicz Cc: Daniel Vetter Cc: Hans de Goede Cc: Mikulas Patocka Cc: Sergey Senozhatsky Cc: Kees Cook Cc: Peter Rosin Cc: Yisheng Xie Cc: "Michał Mirosław" Cc: linux-fbdev@vger.kernel.org --- drivers/video/fbdev/core/fbcon.c | 14 +++----------- drivers/video/fbdev/core/fbmem.c | 22 +++++++--------------- include/linux/fb.h | 5 ----- include/linux/fbcon.h | 6 ++++++ 4 files changed, 16 insertions(+), 31 deletions(-) diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fbcon.c index e3267d71395c..515366308537 100644 --- a/drivers/video/fbdev/core/fbcon.c +++ b/drivers/video/fbdev/core/fbcon.c @@ -3019,8 +3019,8 @@ static void fbcon_set_all_vcs(struct fb_info *info) fbcon_modechanged(info); } -static int fbcon_mode_deleted(struct fb_info *info, - struct fb_videomode *mode) +int fbcon_mode_deleted(struct fb_info *info, + struct fb_videomode *mode) { struct fb_info *fb_info; struct fbcon_display *p; @@ -3262,7 +3262,7 @@ static void fbcon_fb_blanked(struct fb_info *info, int blank) ops->blank_state = blank; } -static void fbcon_new_modelist(struct fb_info *info) +void fbcon_new_modelist(struct fb_info *info) { int i; struct vc_data *vc; @@ -3324,7 +3324,6 @@ static int fbcon_event_notify(struct notifier_block *self, { struct fb_event *event = data; struct fb_info *info = event->info; - struct fb_videomode *mode; struct fb_con2fbmap *con2fb; struct fb_blit_caps *caps; int idx, ret = 0; @@ -3336,10 +3335,6 @@ static int fbcon_event_notify(struct notifier_block *self, case FB_EVENT_MODE_CHANGE_ALL: fbcon_set_all_vcs(info); break; - case FB_EVENT_MODE_DELETE: - mode = event->data; - ret = fbcon_mode_deleted(info, mode); - break; case FB_EVENT_SET_CONSOLE_MAP: /* called with console lock held */ con2fb = event->data; @@ -3353,9 +3348,6 @@ static int fbcon_event_notify(struct notifier_block *self, case FB_EVENT_BLANK: fbcon_fb_blanked(info, *(int *)event->data); break; - case FB_EVENT_NEW_MODELIST: - fbcon_new_modelist(info); - break; case FB_EVENT_GET_REQ: caps = event->data; fbcon_get_requirement(info, caps); diff --git a/drivers/video/fbdev/core/fbmem.c b/drivers/video/fbdev/core/fbmem.c index 73269dedcd45..cbdd141e7695 100644 --- a/drivers/video/fbdev/core/fbmem.c +++ b/drivers/video/fbdev/core/fbmem.c @@ -966,16 +966,11 @@ fb_set_var(struct fb_info *info, struct fb_var_screeninfo *var) /* make sure we don't delete the videomode of current var */ ret = fb_mode_is_equal(&mode1, &mode2); - if (!ret) { - struct fb_event event; - - event.info = info; - event.data = &mode1; - ret = fb_notifier_call_chain(FB_EVENT_MODE_DELETE, &event); - } + if (!ret) + fbcon_mode_deleted(info, &mode1); if (!ret) - fb_delete_videomode(&mode1, &info->modelist); + fb_delete_videomode(&mode1, &info->modelist); ret = (ret) ? -EINVAL : 0; @@ -1992,7 +1987,6 @@ subsys_initcall(fbmem_init); int fb_new_modelist(struct fb_info *info) { - struct fb_event event; struct fb_var_screeninfo var = info->var; struct list_head *pos, *n; struct fb_modelist *modelist; @@ -2012,14 +2006,12 @@ int fb_new_modelist(struct fb_info *info) } } - err = 1; + if (list_empty(&info->modelist)) + return 1; - if (!list_empty(&info->modelist)) { - event.info = info; - err = fb_notifier_call_chain(FB_EVENT_NEW_MODELIST, &event); - } + fbcon_new_modelist(info); - return err; + return 0; } MODULE_LICENSE("GPL"); diff --git a/include/linux/fb.h b/include/linux/fb.h index 794b386415b7..7a788ed8c7b5 100644 --- a/include/linux/fb.h +++ b/include/linux/fb.h @@ -126,8 +126,6 @@ struct fb_cursor_user { /* The resolution of the passed in fb_info about to change */ #define FB_EVENT_MODE_CHANGE 0x01 -/* An entry from the modelist was removed */ -#define FB_EVENT_MODE_DELETE 0x04 #ifdef CONFIG_GUMSTIX_AM200EPD /* only used by mach-pxa/am200epd.c */ @@ -142,9 +140,6 @@ struct fb_cursor_user { /* A hardware display blank change occurred */ #define FB_EVENT_BLANK 0x09 /* Private modelist is to be replaced */ -#define FB_EVENT_NEW_MODELIST 0x0A -/* The resolution of the passed in fb_info about to change and - all vc's should be changed */ #define FB_EVENT_MODE_CHANGE_ALL 0x0B /* A software display blank change occurred */ #define FB_EVENT_CONBLANK 0x0C diff --git a/include/linux/fbcon.h b/include/linux/fbcon.h index 790c42ec7b5d..c139834342f5 100644 --- a/include/linux/fbcon.h +++ b/include/linux/fbcon.h @@ -9,6 +9,9 @@ void fbcon_fb_unregistered(struct fb_info *info); void fbcon_fb_unbind(struct fb_info *info); void fbcon_suspended(struct fb_info *info); void fbcon_resumed(struct fb_info *info); +int fbcon_mode_deleted(struct fb_info *info, + struct fb_videomode *mode); +void fbcon_new_modelist(struct fb_info *info); #else static inline void fb_console_init(void) {} static inline void fb_console_exit(void) {} @@ -17,6 +20,9 @@ static inline void fbcon_fb_unregistered(struct fb_info *info) {} static inline void fbcon_fb_unbind(struct fb_info *info) {} static inline void fbcon_suspended(struct fb_info *info) {} static inline void fbcon_resumed(struct fb_info *info) {} +static inline int fbcon_mode_deleted(struct fb_info *info, + struct fb_videomode *mode) { return 0; } +static inline void fbcon_new_modelist(struct fb_info *info) {} #endif #endif /* _LINUX_FBCON_H */ -- 2.20.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: [PATCH 22/33] fbcon: Call fbcon_mode_deleted/new_modelist directly Date: Tue, 28 May 2019 11:02:53 +0200 Message-ID: <20190528090304.9388-23-daniel.vetter@ffwll.ch> References: <20190528090304.9388-1-daniel.vetter@ffwll.ch> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-ed1-x544.google.com (mail-ed1-x544.google.com [IPv6:2a00:1450:4864:20::544]) by gabe.freedesktop.org (Postfix) with ESMTPS id 70E6289E52 for ; Tue, 28 May 2019 09:03:46 +0000 (UTC) Received: by mail-ed1-x544.google.com with SMTP id m4so30617351edd.8 for ; Tue, 28 May 2019 02:03:46 -0700 (PDT) In-Reply-To: <20190528090304.9388-1-daniel.vetter@ffwll.ch> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: LKML Cc: Daniel Thompson , Sergey Senozhatsky , Kees Cook , Bartlomiej Zolnierkiewicz , Daniel Vetter , Intel Graphics Development , linux-fbdev@vger.kernel.org, DRI Development , =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= , Yisheng Xie , Hans de Goede , Mikulas Patocka , Daniel Vetter , Sam Ravnborg , Peter Rosin List-Id: dri-devel@lists.freedesktop.org SSdtIG5vdCBlbnRpcmVseSBjbGVhciBvbiB3aGF0IG5ld19tb2RlbGlzdCBhY3R1YWxseSBkb2Vz LCBpdCBzZWVtcwpleGNsdXNpdmVseSBmb3IgYSBzeXNmcyBpbnRlcmZhY2UuIFdoaWNoIGluIHRo ZSBlbmQgZG9lcyBhbW91bnQgdG8gYQpub3JtYWwgZmJfc2V0X3BhciB0byBjaGVjayB0aGUgbW9k ZSwgYnV0IHRoZW4gdGFrZXMgYSBkaWZmZXJlbnQgcGF0aAppbiBib3RoIGZibWVtLmMgYW5kIGZi Y29uLmMuCgpJIGhhdmUgbm8gaWRlYSB3aHkgdGhlc2UgMiBwYXRocyBhcmUgZGlmZmVyZW50LCBi dXQgdGhlbiBJIGFsc28gZG9uJ3QKcmVhbGx5IHdhbnQgdG8gZmluZCBvdXQuIFNvIGp1c3QgZG8g dGhlIHNpbXBsZSBjb252ZXJzaW9uIHRvIGEgZGlyZWN0CmZ1bmN0aW9uIGNhbGwuCgp2Mjogc3Rh dGljIGlubGluZSBmb3IgdGhlIGR1bW15IHZlcnNpb25zLCBJIGZvcmdvdC4KClNpZ25lZC1vZmYt Ynk6IERhbmllbCBWZXR0ZXIgPGRhbmllbC52ZXR0ZXJAaW50ZWwuY29tPgpSZXZpZXdlZC1ieTog U2FtIFJhdm5ib3JnIDxzYW1AcmF2bmJvcmcub3JnPgpSZXZpZXdlZC1ieTogTWFhcnRlbiBMYW5r aG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4LmludGVsLmNvbT4KQ2M6IEJhcnRsb21pZWog Wm9sbmllcmtpZXdpY3ogPGIuem9sbmllcmtpZUBzYW1zdW5nLmNvbT4KQ2M6IERhbmllbCBWZXR0 ZXIgPGRhbmllbC52ZXR0ZXJAZmZ3bGwuY2g+CkNjOiBIYW5zIGRlIEdvZWRlIDxoZGVnb2VkZUBy ZWRoYXQuY29tPgpDYzogTWlrdWxhcyBQYXRvY2thIDxtcGF0b2NrYUByZWRoYXQuY29tPgpDYzog U2VyZ2V5IFNlbm96aGF0c2t5IDxzZXJnZXkuc2Vub3poYXRza3lAZ21haWwuY29tPgpDYzogS2Vl cyBDb29rIDxrZWVzY29va0BjaHJvbWl1bS5vcmc+CkNjOiBQZXRlciBSb3NpbiA8cGVkYUBheGVu dGlhLnNlPgpDYzogWWlzaGVuZyBYaWUgPHlzeGllQGZveG1haWwuY29tPgpDYzogIk1pY2hhxYIg TWlyb3PFgmF3IiA8bWlycS1saW51eEByZXJlLnFtcW0ucGw+CkNjOiBsaW51eC1mYmRldkB2Z2Vy Lmtlcm5lbC5vcmcKLS0tCiBkcml2ZXJzL3ZpZGVvL2ZiZGV2L2NvcmUvZmJjb24uYyB8IDE0ICsr Ky0tLS0tLS0tLS0tCiBkcml2ZXJzL3ZpZGVvL2ZiZGV2L2NvcmUvZmJtZW0uYyB8IDIyICsrKysr KystLS0tLS0tLS0tLS0tLS0KIGluY2x1ZGUvbGludXgvZmIuaCAgICAgICAgICAgICAgIHwgIDUg LS0tLS0KIGluY2x1ZGUvbGludXgvZmJjb24uaCAgICAgICAgICAgIHwgIDYgKysrKysrCiA0IGZp bGVzIGNoYW5nZWQsIDE2IGluc2VydGlvbnMoKyksIDMxIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdp dCBhL2RyaXZlcnMvdmlkZW8vZmJkZXYvY29yZS9mYmNvbi5jIGIvZHJpdmVycy92aWRlby9mYmRl di9jb3JlL2ZiY29uLmMKaW5kZXggZTMyNjdkNzEzOTVjLi41MTUzNjYzMDg1MzcgMTAwNjQ0Ci0t LSBhL2RyaXZlcnMvdmlkZW8vZmJkZXYvY29yZS9mYmNvbi5jCisrKyBiL2RyaXZlcnMvdmlkZW8v ZmJkZXYvY29yZS9mYmNvbi5jCkBAIC0zMDE5LDggKzMwMTksOCBAQCBzdGF0aWMgdm9pZCBmYmNv bl9zZXRfYWxsX3ZjcyhzdHJ1Y3QgZmJfaW5mbyAqaW5mbykKIAkJZmJjb25fbW9kZWNoYW5nZWQo aW5mbyk7CiB9CiAKLXN0YXRpYyBpbnQgZmJjb25fbW9kZV9kZWxldGVkKHN0cnVjdCBmYl9pbmZv ICppbmZvLAotCQkJICAgICAgc3RydWN0IGZiX3ZpZGVvbW9kZSAqbW9kZSkKK2ludCBmYmNvbl9t b2RlX2RlbGV0ZWQoc3RydWN0IGZiX2luZm8gKmluZm8sCisJCSAgICAgICBzdHJ1Y3QgZmJfdmlk ZW9tb2RlICptb2RlKQogewogCXN0cnVjdCBmYl9pbmZvICpmYl9pbmZvOwogCXN0cnVjdCBmYmNv bl9kaXNwbGF5ICpwOwpAQCAtMzI2Miw3ICszMjYyLDcgQEAgc3RhdGljIHZvaWQgZmJjb25fZmJf YmxhbmtlZChzdHJ1Y3QgZmJfaW5mbyAqaW5mbywgaW50IGJsYW5rKQogCW9wcy0+Ymxhbmtfc3Rh dGUgPSBibGFuazsKIH0KIAotc3RhdGljIHZvaWQgZmJjb25fbmV3X21vZGVsaXN0KHN0cnVjdCBm Yl9pbmZvICppbmZvKQordm9pZCBmYmNvbl9uZXdfbW9kZWxpc3Qoc3RydWN0IGZiX2luZm8gKmlu Zm8pCiB7CiAJaW50IGk7CiAJc3RydWN0IHZjX2RhdGEgKnZjOwpAQCAtMzMyNCw3ICszMzI0LDYg QEAgc3RhdGljIGludCBmYmNvbl9ldmVudF9ub3RpZnkoc3RydWN0IG5vdGlmaWVyX2Jsb2NrICpz ZWxmLAogewogCXN0cnVjdCBmYl9ldmVudCAqZXZlbnQgPSBkYXRhOwogCXN0cnVjdCBmYl9pbmZv ICppbmZvID0gZXZlbnQtPmluZm87Ci0Jc3RydWN0IGZiX3ZpZGVvbW9kZSAqbW9kZTsKIAlzdHJ1 Y3QgZmJfY29uMmZibWFwICpjb24yZmI7CiAJc3RydWN0IGZiX2JsaXRfY2FwcyAqY2FwczsKIAlp bnQgaWR4LCByZXQgPSAwOwpAQCAtMzMzNiwxMCArMzMzNSw2IEBAIHN0YXRpYyBpbnQgZmJjb25f ZXZlbnRfbm90aWZ5KHN0cnVjdCBub3RpZmllcl9ibG9jayAqc2VsZiwKIAljYXNlIEZCX0VWRU5U X01PREVfQ0hBTkdFX0FMTDoKIAkJZmJjb25fc2V0X2FsbF92Y3MoaW5mbyk7CiAJCWJyZWFrOwot CWNhc2UgRkJfRVZFTlRfTU9ERV9ERUxFVEU6Ci0JCW1vZGUgPSBldmVudC0+ZGF0YTsKLQkJcmV0 ID0gZmJjb25fbW9kZV9kZWxldGVkKGluZm8sIG1vZGUpOwotCQlicmVhazsKIAljYXNlIEZCX0VW RU5UX1NFVF9DT05TT0xFX01BUDoKIAkJLyogY2FsbGVkIHdpdGggY29uc29sZSBsb2NrIGhlbGQg Ki8KIAkJY29uMmZiID0gZXZlbnQtPmRhdGE7CkBAIC0zMzUzLDkgKzMzNDgsNiBAQCBzdGF0aWMg aW50IGZiY29uX2V2ZW50X25vdGlmeShzdHJ1Y3Qgbm90aWZpZXJfYmxvY2sgKnNlbGYsCiAJY2Fz ZSBGQl9FVkVOVF9CTEFOSzoKIAkJZmJjb25fZmJfYmxhbmtlZChpbmZvLCAqKGludCAqKWV2ZW50 LT5kYXRhKTsKIAkJYnJlYWs7Ci0JY2FzZSBGQl9FVkVOVF9ORVdfTU9ERUxJU1Q6Ci0JCWZiY29u X25ld19tb2RlbGlzdChpbmZvKTsKLQkJYnJlYWs7CiAJY2FzZSBGQl9FVkVOVF9HRVRfUkVROgog CQljYXBzID0gZXZlbnQtPmRhdGE7CiAJCWZiY29uX2dldF9yZXF1aXJlbWVudChpbmZvLCBjYXBz KTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvdmlkZW8vZmJkZXYvY29yZS9mYm1lbS5jIGIvZHJpdmVy cy92aWRlby9mYmRldi9jb3JlL2ZibWVtLmMKaW5kZXggNzMyNjlkZWRjZDQ1Li5jYmRkMTQxZTc2 OTUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvdmlkZW8vZmJkZXYvY29yZS9mYm1lbS5jCisrKyBiL2Ry aXZlcnMvdmlkZW8vZmJkZXYvY29yZS9mYm1lbS5jCkBAIC05NjYsMTYgKzk2NiwxMSBAQCBmYl9z ZXRfdmFyKHN0cnVjdCBmYl9pbmZvICppbmZvLCBzdHJ1Y3QgZmJfdmFyX3NjcmVlbmluZm8gKnZh cikKIAkJLyogbWFrZSBzdXJlIHdlIGRvbid0IGRlbGV0ZSB0aGUgdmlkZW9tb2RlIG9mIGN1cnJl bnQgdmFyICovCiAJCXJldCA9IGZiX21vZGVfaXNfZXF1YWwoJm1vZGUxLCAmbW9kZTIpOwogCi0J CWlmICghcmV0KSB7Ci0JCSAgICBzdHJ1Y3QgZmJfZXZlbnQgZXZlbnQ7Ci0KLQkJICAgIGV2ZW50 LmluZm8gPSBpbmZvOwotCQkgICAgZXZlbnQuZGF0YSA9ICZtb2RlMTsKLQkJICAgIHJldCA9IGZi X25vdGlmaWVyX2NhbGxfY2hhaW4oRkJfRVZFTlRfTU9ERV9ERUxFVEUsICZldmVudCk7Ci0JCX0K KwkJaWYgKCFyZXQpCisJCQlmYmNvbl9tb2RlX2RlbGV0ZWQoaW5mbywgJm1vZGUxKTsKIAogCQlp ZiAoIXJldCkKLQkJICAgIGZiX2RlbGV0ZV92aWRlb21vZGUoJm1vZGUxLCAmaW5mby0+bW9kZWxp c3QpOworCQkJZmJfZGVsZXRlX3ZpZGVvbW9kZSgmbW9kZTEsICZpbmZvLT5tb2RlbGlzdCk7CiAK IAogCQlyZXQgPSAocmV0KSA/IC1FSU5WQUwgOiAwOwpAQCAtMTk5Miw3ICsxOTg3LDYgQEAgc3Vi c3lzX2luaXRjYWxsKGZibWVtX2luaXQpOwogCiBpbnQgZmJfbmV3X21vZGVsaXN0KHN0cnVjdCBm Yl9pbmZvICppbmZvKQogewotCXN0cnVjdCBmYl9ldmVudCBldmVudDsKIAlzdHJ1Y3QgZmJfdmFy X3NjcmVlbmluZm8gdmFyID0gaW5mby0+dmFyOwogCXN0cnVjdCBsaXN0X2hlYWQgKnBvcywgKm47 CiAJc3RydWN0IGZiX21vZGVsaXN0ICptb2RlbGlzdDsKQEAgLTIwMTIsMTQgKzIwMDYsMTIgQEAg aW50IGZiX25ld19tb2RlbGlzdChzdHJ1Y3QgZmJfaW5mbyAqaW5mbykKIAkJfQogCX0KIAotCWVy ciA9IDE7CisJaWYgKGxpc3RfZW1wdHkoJmluZm8tPm1vZGVsaXN0KSkKKwkJcmV0dXJuIDE7CiAK LQlpZiAoIWxpc3RfZW1wdHkoJmluZm8tPm1vZGVsaXN0KSkgewotCQlldmVudC5pbmZvID0gaW5m bzsKLQkJZXJyID0gZmJfbm90aWZpZXJfY2FsbF9jaGFpbihGQl9FVkVOVF9ORVdfTU9ERUxJU1Qs ICZldmVudCk7Ci0JfQorCWZiY29uX25ld19tb2RlbGlzdChpbmZvKTsKIAotCXJldHVybiBlcnI7 CisJcmV0dXJuIDA7CiB9CiAKIE1PRFVMRV9MSUNFTlNFKCJHUEwiKTsKZGlmZiAtLWdpdCBhL2lu Y2x1ZGUvbGludXgvZmIuaCBiL2luY2x1ZGUvbGludXgvZmIuaAppbmRleCA3OTRiMzg2NDE1Yjcu LjdhNzg4ZWQ4YzdiNSAxMDA2NDQKLS0tIGEvaW5jbHVkZS9saW51eC9mYi5oCisrKyBiL2luY2x1 ZGUvbGludXgvZmIuaApAQCAtMTI2LDggKzEyNiw2IEBAIHN0cnVjdCBmYl9jdXJzb3JfdXNlciB7 CiAKIC8qCVRoZSByZXNvbHV0aW9uIG9mIHRoZSBwYXNzZWQgaW4gZmJfaW5mbyBhYm91dCB0byBj aGFuZ2UgKi8gCiAjZGVmaW5lIEZCX0VWRU5UX01PREVfQ0hBTkdFCQkweDAxCi0vKiAgICAgIEFu IGVudHJ5IGZyb20gdGhlIG1vZGVsaXN0IHdhcyByZW1vdmVkICovCi0jZGVmaW5lIEZCX0VWRU5U X01PREVfREVMRVRFICAgICAgICAgICAgMHgwNAogCiAjaWZkZWYgQ09ORklHX0dVTVNUSVhfQU0y MDBFUEQKIC8qIG9ubHkgdXNlZCBieSBtYWNoLXB4YS9hbTIwMGVwZC5jICovCkBAIC0xNDIsOSAr MTQwLDYgQEAgc3RydWN0IGZiX2N1cnNvcl91c2VyIHsKIC8qICAgICAgQSBoYXJkd2FyZSBkaXNw bGF5IGJsYW5rIGNoYW5nZSBvY2N1cnJlZCAqLwogI2RlZmluZSBGQl9FVkVOVF9CTEFOSyAgICAg ICAgICAgICAgICAgIDB4MDkKIC8qICAgICAgUHJpdmF0ZSBtb2RlbGlzdCBpcyB0byBiZSByZXBs YWNlZCAqLwotI2RlZmluZSBGQl9FVkVOVF9ORVdfTU9ERUxJU1QgICAgICAgICAgIDB4MEEKLS8q CVRoZSByZXNvbHV0aW9uIG9mIHRoZSBwYXNzZWQgaW4gZmJfaW5mbyBhYm91dCB0byBjaGFuZ2Ug YW5kCi0gICAgICAgIGFsbCB2YydzIHNob3VsZCBiZSBjaGFuZ2VkICAgICAgICAgKi8KICNkZWZp bmUgRkJfRVZFTlRfTU9ERV9DSEFOR0VfQUxMCTB4MEIKIC8qCUEgc29mdHdhcmUgZGlzcGxheSBi bGFuayBjaGFuZ2Ugb2NjdXJyZWQgKi8KICNkZWZpbmUgRkJfRVZFTlRfQ09OQkxBTksgICAgICAg ICAgICAgICAweDBDCmRpZmYgLS1naXQgYS9pbmNsdWRlL2xpbnV4L2ZiY29uLmggYi9pbmNsdWRl L2xpbnV4L2ZiY29uLmgKaW5kZXggNzkwYzQyZWM3YjVkLi5jMTM5ODM0MzQyZjUgMTAwNjQ0Ci0t LSBhL2luY2x1ZGUvbGludXgvZmJjb24uaAorKysgYi9pbmNsdWRlL2xpbnV4L2ZiY29uLmgKQEAg LTksNiArOSw5IEBAIHZvaWQgZmJjb25fZmJfdW5yZWdpc3RlcmVkKHN0cnVjdCBmYl9pbmZvICpp bmZvKTsKIHZvaWQgZmJjb25fZmJfdW5iaW5kKHN0cnVjdCBmYl9pbmZvICppbmZvKTsKIHZvaWQg ZmJjb25fc3VzcGVuZGVkKHN0cnVjdCBmYl9pbmZvICppbmZvKTsKIHZvaWQgZmJjb25fcmVzdW1l ZChzdHJ1Y3QgZmJfaW5mbyAqaW5mbyk7CitpbnQgZmJjb25fbW9kZV9kZWxldGVkKHN0cnVjdCBm Yl9pbmZvICppbmZvLAorCQkgICAgICAgc3RydWN0IGZiX3ZpZGVvbW9kZSAqbW9kZSk7Cit2b2lk IGZiY29uX25ld19tb2RlbGlzdChzdHJ1Y3QgZmJfaW5mbyAqaW5mbyk7CiAjZWxzZQogc3RhdGlj IGlubGluZSB2b2lkIGZiX2NvbnNvbGVfaW5pdCh2b2lkKSB7fQogc3RhdGljIGlubGluZSB2b2lk IGZiX2NvbnNvbGVfZXhpdCh2b2lkKSB7fQpAQCAtMTcsNiArMjAsOSBAQCBzdGF0aWMgaW5saW5l IHZvaWQgZmJjb25fZmJfdW5yZWdpc3RlcmVkKHN0cnVjdCBmYl9pbmZvICppbmZvKSB7fQogc3Rh dGljIGlubGluZSB2b2lkIGZiY29uX2ZiX3VuYmluZChzdHJ1Y3QgZmJfaW5mbyAqaW5mbykge30K IHN0YXRpYyBpbmxpbmUgdm9pZCBmYmNvbl9zdXNwZW5kZWQoc3RydWN0IGZiX2luZm8gKmluZm8p IHt9CiBzdGF0aWMgaW5saW5lIHZvaWQgZmJjb25fcmVzdW1lZChzdHJ1Y3QgZmJfaW5mbyAqaW5m bykge30KK3N0YXRpYyBpbmxpbmUgaW50IGZiY29uX21vZGVfZGVsZXRlZChzdHJ1Y3QgZmJfaW5m byAqaW5mbywKKwkJCQkgICAgIHN0cnVjdCBmYl92aWRlb21vZGUgKm1vZGUpIHsgcmV0dXJuIDA7 IH0KK3N0YXRpYyBpbmxpbmUgdm9pZCBmYmNvbl9uZXdfbW9kZWxpc3Qoc3RydWN0IGZiX2luZm8g KmluZm8pIHt9CiAjZW5kaWYKIAogI2VuZGlmIC8qIF9MSU5VWF9GQkNPTl9IICovCi0tIAoyLjIw LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1k ZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczov L2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbA==