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 B8A70C072B5 for ; Fri, 24 May 2019 08:55:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6B1E22184E for ; Fri, 24 May 2019 08:55:29 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=ffwll.ch header.i=@ffwll.ch header.b="jzYFxe7z" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390362AbfEXIz2 (ORCPT ); Fri, 24 May 2019 04:55:28 -0400 Received: from mail-ed1-f66.google.com ([209.85.208.66]:40700 "EHLO mail-ed1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390127AbfEXIyd (ORCPT ); Fri, 24 May 2019 04:54:33 -0400 Received: by mail-ed1-f66.google.com with SMTP id j12so13319916eds.7 for ; Fri, 24 May 2019 01:54:31 -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=KKTKGhsbv7VsgvEL5zWhJm4bSTrXoG2quXr/om1qy0w=; b=jzYFxe7zbdTLFLirqyF3l84Lj/IU/QUuH8wzXWljEfiAHXHPma03OhH0jDUYnWIuJp rQbVOIuPkZQK1ta70ZmZ+qXTfHRS+ysFTTHfTwQQ2qPRBsmB+yMt3k9rd2/CjFbNdgIR hS3VFvJ9DptOsfpVsfx3AQzlb3F+CCx9ErJFA= 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=KKTKGhsbv7VsgvEL5zWhJm4bSTrXoG2quXr/om1qy0w=; b=NubY7A0f64B25tjDEibPVwKvVVru7S3MQNEJTU8cRmRRv4yPxIPAZlJU1anZZXo8yf 927ijD/vLg1/aXawdU9gneVWesML9DMvhovgyrwQnKYGynANNYEHSul7OndzWFmNVuf+ iqhsYjdYiSV1QWCJqpiB1OYJDyva4uTPZcIeqt6HaEQZCxSNIuVmjnBhh3VL8roE3+s9 OPqO2xIJ/Go78Co+Ae/Y+7tTDTugsfJHyV/HdJwtIv+dQzCPWRfUj8YNCN10M7Pr/SWl GVxXb9aetuuIlu7cjyCB1so59Y+TZGYW+E3hF0dvOK7PbybZeZycs/GK48gCe5UIr0Xr yzOw== X-Gm-Message-State: APjAAAUI2+6pIs6LLegE1jpIEb5i+8W5o6q0MLxqKLsG1DD7GQQzx1EU R9ZwSKFAFBpBZCTSQlg88dk54rphgw0= X-Google-Smtp-Source: APXvYqyeayYhyiaDuJ1eZ78DuwtWgIdV7k/yFMRgqPrM/KMb/elL9Ha/cg/myn+iB8QVchEj153ozg== X-Received: by 2002:a17:906:5c12:: with SMTP id e18mr14538535ejq.157.1558688071022; Fri, 24 May 2019 01:54:31 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:569e:0:3106:d637:d723:e855]) by smtp.gmail.com with ESMTPSA id 96sm567082edq.68.2019.05.24.01.54.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 24 May 2019 01:54:30 -0700 (PDT) From: Daniel Vetter To: LKML Cc: Intel Graphics Development , DRI Development , Daniel Vetter , Daniel Vetter , Bartlomiej Zolnierkiewicz , Hans de Goede , Mikulas Patocka , Sergey Senozhatsky , Kees Cook , Peter Rosin , Yisheng Xie , =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= , linux-fbdev@vger.kernel.org Subject: [PATCH 22/33] fbcon: Call fbcon_mode_deleted/new_modelist directly Date: Fri, 24 May 2019 10:53:43 +0200 Message-Id: <20190524085354.27411-23-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190524085354.27411-1-daniel.vetter@ffwll.ch> References: <20190524085354.27411-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 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 24ea6e4fbee0..35ecd25b385c 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: Fri, 24 May 2019 08:53:43 +0000 Subject: [PATCH 22/33] fbcon: Call fbcon_mode_deleted/new_modelist directly Message-Id: <20190524085354.27411-23-daniel.vetter@ffwll.ch> List-Id: References: <20190524085354.27411-1-daniel.vetter@ffwll.ch> In-Reply-To: <20190524085354.27411-1-daniel.vetter@ffwll.ch> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit To: LKML Cc: linux-fbdev@vger.kernel.org, Sergey Senozhatsky , Kees Cook , Bartlomiej Zolnierkiewicz , Daniel Vetter , Intel Graphics Development , DRI Development , =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= , Yisheng Xie , Mikulas Patocka , Daniel Vetter , 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 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 24ea6e4fbee0..35ecd25b385c 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: Fri, 24 May 2019 10:53:43 +0200 Message-ID: <20190524085354.27411-23-daniel.vetter@ffwll.ch> References: <20190524085354.27411-1-daniel.vetter@ffwll.ch> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20190524085354.27411-1-daniel.vetter@ffwll.ch> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: LKML Cc: linux-fbdev@vger.kernel.org, Sergey Senozhatsky , Kees Cook , Bartlomiej Zolnierkiewicz , Daniel Vetter , Intel Graphics Development , DRI Development , =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= , Yisheng Xie , Mikulas Patocka , Daniel Vetter , Peter Rosin List-Id: dri-devel@lists.freedesktop.org SSdtIG5vdCBlbnRpcmVseSBjbGVhciBvbiB3aGF0IG5ld19tb2RlbGlzdCBhY3R1YWxseSBkb2Vz LCBpdCBzZWVtcwpleGNsdXNpdmVseSBmb3IgYSBzeXNmcyBpbnRlcmZhY2UuIFdoaWNoIGluIHRo ZSBlbmQgZG9lcyBhbW91bnQgdG8gYQpub3JtYWwgZmJfc2V0X3BhciB0byBjaGVjayB0aGUgbW9k ZSwgYnV0IHRoZW4gdGFrZXMgYSBkaWZmZXJlbnQgcGF0aAppbiBib3RoIGZibWVtLmMgYW5kIGZi Y29uLmMuCgpJIGhhdmUgbm8gaWRlYSB3aHkgdGhlc2UgMiBwYXRocyBhcmUgZGlmZmVyZW50LCBi dXQgdGhlbiBJIGFsc28gZG9uJ3QKcmVhbGx5IHdhbnQgdG8gZmluZCBvdXQuIFNvIGp1c3QgZG8g dGhlIHNpbXBsZSBjb252ZXJzaW9uIHRvIGEgZGlyZWN0CmZ1bmN0aW9uIGNhbGwuCgp2Mjogc3Rh dGljIGlubGluZSBmb3IgdGhlIGR1bW15IHZlcnNpb25zLCBJIGZvcmdvdC4KClNpZ25lZC1vZmYt Ynk6IERhbmllbCBWZXR0ZXIgPGRhbmllbC52ZXR0ZXJAaW50ZWwuY29tPgpDYzogQmFydGxvbWll aiBab2xuaWVya2lld2ljeiA8Yi56b2xuaWVya2llQHNhbXN1bmcuY29tPgpDYzogRGFuaWVsIFZl dHRlciA8ZGFuaWVsLnZldHRlckBmZndsbC5jaD4KQ2M6IEhhbnMgZGUgR29lZGUgPGhkZWdvZWRl QHJlZGhhdC5jb20+CkNjOiBNaWt1bGFzIFBhdG9ja2EgPG1wYXRvY2thQHJlZGhhdC5jb20+CkNj OiBTZXJnZXkgU2Vub3poYXRza3kgPHNlcmdleS5zZW5vemhhdHNreUBnbWFpbC5jb20+CkNjOiBL ZWVzIENvb2sgPGtlZXNjb29rQGNocm9taXVtLm9yZz4KQ2M6IFBldGVyIFJvc2luIDxwZWRhQGF4 ZW50aWEuc2U+CkNjOiBZaXNoZW5nIFhpZSA8eXN4aWVAZm94bWFpbC5jb20+CkNjOiAiTWljaGHF giBNaXJvc8WCYXciIDxtaXJxLWxpbnV4QHJlcmUucW1xbS5wbD4KQ2M6IGxpbnV4LWZiZGV2QHZn ZXIua2VybmVsLm9yZwotLS0KIGRyaXZlcnMvdmlkZW8vZmJkZXYvY29yZS9mYmNvbi5jIHwgMTQg KysrLS0tLS0tLS0tLS0KIGRyaXZlcnMvdmlkZW8vZmJkZXYvY29yZS9mYm1lbS5jIHwgMjIgKysr KysrKy0tLS0tLS0tLS0tLS0tLQogaW5jbHVkZS9saW51eC9mYi5oICAgICAgICAgICAgICAgfCAg NSAtLS0tLQogaW5jbHVkZS9saW51eC9mYmNvbi5oICAgICAgICAgICAgfCAgNiArKysrKysKIDQg ZmlsZXMgY2hhbmdlZCwgMTYgaW5zZXJ0aW9ucygrKSwgMzEgZGVsZXRpb25zKC0pCgpkaWZmIC0t Z2l0IGEvZHJpdmVycy92aWRlby9mYmRldi9jb3JlL2ZiY29uLmMgYi9kcml2ZXJzL3ZpZGVvL2Zi ZGV2L2NvcmUvZmJjb24uYwppbmRleCAyNGVhNmU0ZmJlZTAuLjM1ZWNkMjViMzg1YyAxMDA2NDQK LS0tIGEvZHJpdmVycy92aWRlby9mYmRldi9jb3JlL2ZiY29uLmMKKysrIGIvZHJpdmVycy92aWRl by9mYmRldi9jb3JlL2ZiY29uLmMKQEAgLTMwMTksOCArMzAxOSw4IEBAIHN0YXRpYyB2b2lkIGZi Y29uX3NldF9hbGxfdmNzKHN0cnVjdCBmYl9pbmZvICppbmZvKQogCQlmYmNvbl9tb2RlY2hhbmdl ZChpbmZvKTsKIH0KIAotc3RhdGljIGludCBmYmNvbl9tb2RlX2RlbGV0ZWQoc3RydWN0IGZiX2lu Zm8gKmluZm8sCi0JCQkgICAgICBzdHJ1Y3QgZmJfdmlkZW9tb2RlICptb2RlKQoraW50IGZiY29u X21vZGVfZGVsZXRlZChzdHJ1Y3QgZmJfaW5mbyAqaW5mbywKKwkJICAgICAgIHN0cnVjdCBmYl92 aWRlb21vZGUgKm1vZGUpCiB7CiAJc3RydWN0IGZiX2luZm8gKmZiX2luZm87CiAJc3RydWN0IGZi Y29uX2Rpc3BsYXkgKnA7CkBAIC0zMjYyLDcgKzMyNjIsNyBAQCBzdGF0aWMgdm9pZCBmYmNvbl9m Yl9ibGFua2VkKHN0cnVjdCBmYl9pbmZvICppbmZvLCBpbnQgYmxhbmspCiAJb3BzLT5ibGFua19z dGF0ZSA9IGJsYW5rOwogfQogCi1zdGF0aWMgdm9pZCBmYmNvbl9uZXdfbW9kZWxpc3Qoc3RydWN0 IGZiX2luZm8gKmluZm8pCit2b2lkIGZiY29uX25ld19tb2RlbGlzdChzdHJ1Y3QgZmJfaW5mbyAq aW5mbykKIHsKIAlpbnQgaTsKIAlzdHJ1Y3QgdmNfZGF0YSAqdmM7CkBAIC0zMzI0LDcgKzMzMjQs NiBAQCBzdGF0aWMgaW50IGZiY29uX2V2ZW50X25vdGlmeShzdHJ1Y3Qgbm90aWZpZXJfYmxvY2sg KnNlbGYsCiB7CiAJc3RydWN0IGZiX2V2ZW50ICpldmVudCA9IGRhdGE7CiAJc3RydWN0IGZiX2lu Zm8gKmluZm8gPSBldmVudC0+aW5mbzsKLQlzdHJ1Y3QgZmJfdmlkZW9tb2RlICptb2RlOwogCXN0 cnVjdCBmYl9jb24yZmJtYXAgKmNvbjJmYjsKIAlzdHJ1Y3QgZmJfYmxpdF9jYXBzICpjYXBzOwog CWludCBpZHgsIHJldCA9IDA7CkBAIC0zMzM2LDEwICszMzM1LDYgQEAgc3RhdGljIGludCBmYmNv bl9ldmVudF9ub3RpZnkoc3RydWN0IG5vdGlmaWVyX2Jsb2NrICpzZWxmLAogCWNhc2UgRkJfRVZF TlRfTU9ERV9DSEFOR0VfQUxMOgogCQlmYmNvbl9zZXRfYWxsX3ZjcyhpbmZvKTsKIAkJYnJlYWs7 Ci0JY2FzZSBGQl9FVkVOVF9NT0RFX0RFTEVURToKLQkJbW9kZSA9IGV2ZW50LT5kYXRhOwotCQly ZXQgPSBmYmNvbl9tb2RlX2RlbGV0ZWQoaW5mbywgbW9kZSk7Ci0JCWJyZWFrOwogCWNhc2UgRkJf RVZFTlRfU0VUX0NPTlNPTEVfTUFQOgogCQkvKiBjYWxsZWQgd2l0aCBjb25zb2xlIGxvY2sgaGVs ZCAqLwogCQljb24yZmIgPSBldmVudC0+ZGF0YTsKQEAgLTMzNTMsOSArMzM0OCw2IEBAIHN0YXRp YyBpbnQgZmJjb25fZXZlbnRfbm90aWZ5KHN0cnVjdCBub3RpZmllcl9ibG9jayAqc2VsZiwKIAlj YXNlIEZCX0VWRU5UX0JMQU5LOgogCQlmYmNvbl9mYl9ibGFua2VkKGluZm8sICooaW50ICopZXZl bnQtPmRhdGEpOwogCQlicmVhazsKLQljYXNlIEZCX0VWRU5UX05FV19NT0RFTElTVDoKLQkJZmJj b25fbmV3X21vZGVsaXN0KGluZm8pOwotCQlicmVhazsKIAljYXNlIEZCX0VWRU5UX0dFVF9SRVE6 CiAJCWNhcHMgPSBldmVudC0+ZGF0YTsKIAkJZmJjb25fZ2V0X3JlcXVpcmVtZW50KGluZm8sIGNh cHMpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy92aWRlby9mYmRldi9jb3JlL2ZibWVtLmMgYi9kcml2 ZXJzL3ZpZGVvL2ZiZGV2L2NvcmUvZmJtZW0uYwppbmRleCA3MzI2OWRlZGNkNDUuLmNiZGQxNDFl NzY5NSAxMDA2NDQKLS0tIGEvZHJpdmVycy92aWRlby9mYmRldi9jb3JlL2ZibWVtLmMKKysrIGIv ZHJpdmVycy92aWRlby9mYmRldi9jb3JlL2ZibWVtLmMKQEAgLTk2NiwxNiArOTY2LDExIEBAIGZi X3NldF92YXIoc3RydWN0IGZiX2luZm8gKmluZm8sIHN0cnVjdCBmYl92YXJfc2NyZWVuaW5mbyAq dmFyKQogCQkvKiBtYWtlIHN1cmUgd2UgZG9uJ3QgZGVsZXRlIHRoZSB2aWRlb21vZGUgb2YgY3Vy cmVudCB2YXIgKi8KIAkJcmV0ID0gZmJfbW9kZV9pc19lcXVhbCgmbW9kZTEsICZtb2RlMik7CiAK LQkJaWYgKCFyZXQpIHsKLQkJICAgIHN0cnVjdCBmYl9ldmVudCBldmVudDsKLQotCQkgICAgZXZl bnQuaW5mbyA9IGluZm87Ci0JCSAgICBldmVudC5kYXRhID0gJm1vZGUxOwotCQkgICAgcmV0ID0g ZmJfbm90aWZpZXJfY2FsbF9jaGFpbihGQl9FVkVOVF9NT0RFX0RFTEVURSwgJmV2ZW50KTsKLQkJ fQorCQlpZiAoIXJldCkKKwkJCWZiY29uX21vZGVfZGVsZXRlZChpbmZvLCAmbW9kZTEpOwogCiAJ CWlmICghcmV0KQotCQkgICAgZmJfZGVsZXRlX3ZpZGVvbW9kZSgmbW9kZTEsICZpbmZvLT5tb2Rl bGlzdCk7CisJCQlmYl9kZWxldGVfdmlkZW9tb2RlKCZtb2RlMSwgJmluZm8tPm1vZGVsaXN0KTsK IAogCiAJCXJldCA9IChyZXQpID8gLUVJTlZBTCA6IDA7CkBAIC0xOTkyLDcgKzE5ODcsNiBAQCBz dWJzeXNfaW5pdGNhbGwoZmJtZW1faW5pdCk7CiAKIGludCBmYl9uZXdfbW9kZWxpc3Qoc3RydWN0 IGZiX2luZm8gKmluZm8pCiB7Ci0Jc3RydWN0IGZiX2V2ZW50IGV2ZW50OwogCXN0cnVjdCBmYl92 YXJfc2NyZWVuaW5mbyB2YXIgPSBpbmZvLT52YXI7CiAJc3RydWN0IGxpc3RfaGVhZCAqcG9zLCAq bjsKIAlzdHJ1Y3QgZmJfbW9kZWxpc3QgKm1vZGVsaXN0OwpAQCAtMjAxMiwxNCArMjAwNiwxMiBA QCBpbnQgZmJfbmV3X21vZGVsaXN0KHN0cnVjdCBmYl9pbmZvICppbmZvKQogCQl9CiAJfQogCi0J ZXJyID0gMTsKKwlpZiAobGlzdF9lbXB0eSgmaW5mby0+bW9kZWxpc3QpKQorCQlyZXR1cm4gMTsK IAotCWlmICghbGlzdF9lbXB0eSgmaW5mby0+bW9kZWxpc3QpKSB7Ci0JCWV2ZW50LmluZm8gPSBp bmZvOwotCQllcnIgPSBmYl9ub3RpZmllcl9jYWxsX2NoYWluKEZCX0VWRU5UX05FV19NT0RFTElT VCwgJmV2ZW50KTsKLQl9CisJZmJjb25fbmV3X21vZGVsaXN0KGluZm8pOwogCi0JcmV0dXJuIGVy cjsKKwlyZXR1cm4gMDsKIH0KIAogTU9EVUxFX0xJQ0VOU0UoIkdQTCIpOwpkaWZmIC0tZ2l0IGEv aW5jbHVkZS9saW51eC9mYi5oIGIvaW5jbHVkZS9saW51eC9mYi5oCmluZGV4IDc5NGIzODY0MTVi Ny4uN2E3ODhlZDhjN2I1IDEwMDY0NAotLS0gYS9pbmNsdWRlL2xpbnV4L2ZiLmgKKysrIGIvaW5j bHVkZS9saW51eC9mYi5oCkBAIC0xMjYsOCArMTI2LDYgQEAgc3RydWN0IGZiX2N1cnNvcl91c2Vy IHsKIAogLyoJVGhlIHJlc29sdXRpb24gb2YgdGhlIHBhc3NlZCBpbiBmYl9pbmZvIGFib3V0IHRv IGNoYW5nZSAqLyAKICNkZWZpbmUgRkJfRVZFTlRfTU9ERV9DSEFOR0UJCTB4MDEKLS8qICAgICAg QW4gZW50cnkgZnJvbSB0aGUgbW9kZWxpc3Qgd2FzIHJlbW92ZWQgKi8KLSNkZWZpbmUgRkJfRVZF TlRfTU9ERV9ERUxFVEUgICAgICAgICAgICAweDA0CiAKICNpZmRlZiBDT05GSUdfR1VNU1RJWF9B TTIwMEVQRAogLyogb25seSB1c2VkIGJ5IG1hY2gtcHhhL2FtMjAwZXBkLmMgKi8KQEAgLTE0Miw5 ICsxNDAsNiBAQCBzdHJ1Y3QgZmJfY3Vyc29yX3VzZXIgewogLyogICAgICBBIGhhcmR3YXJlIGRp c3BsYXkgYmxhbmsgY2hhbmdlIG9jY3VycmVkICovCiAjZGVmaW5lIEZCX0VWRU5UX0JMQU5LICAg ICAgICAgICAgICAgICAgMHgwOQogLyogICAgICBQcml2YXRlIG1vZGVsaXN0IGlzIHRvIGJlIHJl cGxhY2VkICovCi0jZGVmaW5lIEZCX0VWRU5UX05FV19NT0RFTElTVCAgICAgICAgICAgMHgwQQot LyoJVGhlIHJlc29sdXRpb24gb2YgdGhlIHBhc3NlZCBpbiBmYl9pbmZvIGFib3V0IHRvIGNoYW5n ZSBhbmQKLSAgICAgICAgYWxsIHZjJ3Mgc2hvdWxkIGJlIGNoYW5nZWQgICAgICAgICAqLwogI2Rl ZmluZSBGQl9FVkVOVF9NT0RFX0NIQU5HRV9BTEwJMHgwQgogLyoJQSBzb2Z0d2FyZSBkaXNwbGF5 IGJsYW5rIGNoYW5nZSBvY2N1cnJlZCAqLwogI2RlZmluZSBGQl9FVkVOVF9DT05CTEFOSyAgICAg ICAgICAgICAgIDB4MEMKZGlmZiAtLWdpdCBhL2luY2x1ZGUvbGludXgvZmJjb24uaCBiL2luY2x1 ZGUvbGludXgvZmJjb24uaAppbmRleCA3OTBjNDJlYzdiNWQuLmMxMzk4MzQzNDJmNSAxMDA2NDQK LS0tIGEvaW5jbHVkZS9saW51eC9mYmNvbi5oCisrKyBiL2luY2x1ZGUvbGludXgvZmJjb24uaApA QCAtOSw2ICs5LDkgQEAgdm9pZCBmYmNvbl9mYl91bnJlZ2lzdGVyZWQoc3RydWN0IGZiX2luZm8g KmluZm8pOwogdm9pZCBmYmNvbl9mYl91bmJpbmQoc3RydWN0IGZiX2luZm8gKmluZm8pOwogdm9p ZCBmYmNvbl9zdXNwZW5kZWQoc3RydWN0IGZiX2luZm8gKmluZm8pOwogdm9pZCBmYmNvbl9yZXN1 bWVkKHN0cnVjdCBmYl9pbmZvICppbmZvKTsKK2ludCBmYmNvbl9tb2RlX2RlbGV0ZWQoc3RydWN0 IGZiX2luZm8gKmluZm8sCisJCSAgICAgICBzdHJ1Y3QgZmJfdmlkZW9tb2RlICptb2RlKTsKK3Zv aWQgZmJjb25fbmV3X21vZGVsaXN0KHN0cnVjdCBmYl9pbmZvICppbmZvKTsKICNlbHNlCiBzdGF0 aWMgaW5saW5lIHZvaWQgZmJfY29uc29sZV9pbml0KHZvaWQpIHt9CiBzdGF0aWMgaW5saW5lIHZv aWQgZmJfY29uc29sZV9leGl0KHZvaWQpIHt9CkBAIC0xNyw2ICsyMCw5IEBAIHN0YXRpYyBpbmxp bmUgdm9pZCBmYmNvbl9mYl91bnJlZ2lzdGVyZWQoc3RydWN0IGZiX2luZm8gKmluZm8pIHt9CiBz dGF0aWMgaW5saW5lIHZvaWQgZmJjb25fZmJfdW5iaW5kKHN0cnVjdCBmYl9pbmZvICppbmZvKSB7 fQogc3RhdGljIGlubGluZSB2b2lkIGZiY29uX3N1c3BlbmRlZChzdHJ1Y3QgZmJfaW5mbyAqaW5m bykge30KIHN0YXRpYyBpbmxpbmUgdm9pZCBmYmNvbl9yZXN1bWVkKHN0cnVjdCBmYl9pbmZvICpp bmZvKSB7fQorc3RhdGljIGlubGluZSBpbnQgZmJjb25fbW9kZV9kZWxldGVkKHN0cnVjdCBmYl9p bmZvICppbmZvLAorCQkJCSAgICAgc3RydWN0IGZiX3ZpZGVvbW9kZSAqbW9kZSkgeyByZXR1cm4g MDsgfQorc3RhdGljIGlubGluZSB2b2lkIGZiY29uX25ld19tb2RlbGlzdChzdHJ1Y3QgZmJfaW5m byAqaW5mbykge30KICNlbmRpZgogCiAjZW5kaWYgLyogX0xJTlVYX0ZCQ09OX0ggKi8KLS0gCjIu MjAuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50 ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBz Oi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4