From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753916AbdLMTsx (ORCPT ); Wed, 13 Dec 2017 14:48:53 -0500 Received: from mx2.suse.de ([195.135.220.15]:53738 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753552AbdLMTso (ORCPT ); Wed, 13 Dec 2017 14:48:44 -0500 From: Max Staudt To: b.zolnierkie@samsung.com, linux-fbdev@vger.kernel.org Cc: mstaudt@suse.de, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, tiwai@suse.com, oneukum@suse.com, msrb@suse.com, sndirsch@suse.com, michal@markovi.net, philm@manjaro.org, bernhard.rosenkranzer@linaro.org Subject: [RFC PATCH v2 04/13] bootsplash: Add corner positioning Date: Wed, 13 Dec 2017 20:47:46 +0100 Message-Id: <20171213194755.3409-5-mstaudt@suse.de> X-Mailer: git-send-email 2.12.3 In-Reply-To: <20171213194755.3409-1-mstaudt@suse.de> References: <20171213194755.3409-1-mstaudt@suse.de> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This allows showing multiple logos, each in its own position, relative to the eight screen corners. Signed-off-by: Max Staudt --- drivers/video/fbdev/core/bootsplash_render.c | 136 ++++++++++++++++++++++++++- include/uapi/linux/bootsplash_file.h | 45 ++++++++- 2 files changed, 178 insertions(+), 3 deletions(-) diff --git a/drivers/video/fbdev/core/bootsplash_render.c b/drivers/video/fbdev/core/bootsplash_render.c index 8c09c306ff67..07e3a4eab811 100644 --- a/drivers/video/fbdev/core/bootsplash_render.c +++ b/drivers/video/fbdev/core/bootsplash_render.c @@ -155,6 +155,7 @@ void bootsplash_do_render_pictures(struct fb_info *info, for (i = 0; i < fp->header->num_pics; i++) { struct splash_blob_priv *bp; struct splash_pic_priv *pp = &fp->pics[i]; + const struct splash_pic_header *ph = pp->pic_header; long dst_xoff, dst_yoff; if (pp->blobs_loaded < 1) @@ -165,8 +166,139 @@ void bootsplash_do_render_pictures(struct fb_info *info, if (!bp || bp->blob_header->type != 0) continue; - dst_xoff = (info->var.xres - pp->pic_header->width) / 2; - dst_yoff = (info->var.yres - pp->pic_header->height) / 2; + switch (ph->position) { + case SPLASH_POS_FLAG_CORNER | SPLASH_CORNER_TOP_LEFT: + dst_xoff = 0; + dst_yoff = 0; + + dst_xoff += ph->position_offset; + dst_yoff += ph->position_offset; + break; + case SPLASH_POS_FLAG_CORNER | SPLASH_CORNER_TOP: + dst_xoff = info->var.xres - pp->pic_header->width; + dst_xoff /= 2; + dst_yoff = 0; + + dst_yoff += ph->position_offset; + break; + case SPLASH_POS_FLAG_CORNER | SPLASH_CORNER_TOP_RIGHT: + dst_xoff = info->var.xres - pp->pic_header->width; + dst_yoff = 0; + + dst_xoff -= ph->position_offset; + dst_yoff += ph->position_offset; + break; + case SPLASH_POS_FLAG_CORNER | SPLASH_CORNER_RIGHT: + dst_xoff = info->var.xres - pp->pic_header->width; + dst_yoff = info->var.yres - pp->pic_header->height; + dst_yoff /= 2; + + dst_xoff -= ph->position_offset; + break; + case SPLASH_POS_FLAG_CORNER | SPLASH_CORNER_BOTTOM_RIGHT: + dst_xoff = info->var.xres - pp->pic_header->width; + dst_yoff = info->var.yres - pp->pic_header->height; + + dst_xoff -= ph->position_offset; + dst_yoff -= ph->position_offset; + break; + case SPLASH_POS_FLAG_CORNER | SPLASH_CORNER_BOTTOM: + dst_xoff = info->var.xres - pp->pic_header->width; + dst_xoff /= 2; + dst_yoff = info->var.yres - pp->pic_header->height; + + dst_yoff -= ph->position_offset; + break; + case SPLASH_POS_FLAG_CORNER | SPLASH_CORNER_BOTTOM_LEFT: + dst_xoff = 0 + ph->position_offset; + dst_yoff = info->var.yres - pp->pic_header->height + - ph->position_offset; + break; + case SPLASH_POS_FLAG_CORNER | SPLASH_CORNER_LEFT: + dst_xoff = 0; + dst_yoff = info->var.yres - pp->pic_header->height; + dst_yoff /= 2; + + dst_xoff += ph->position_offset; + break; + + case SPLASH_CORNER_TOP_LEFT: + dst_xoff = info->var.xres - pp->pic_header->width; + dst_xoff /= 2; + dst_yoff = info->var.yres - pp->pic_header->height; + dst_yoff /= 2; + + dst_xoff -= ph->position_offset; + dst_yoff -= ph->position_offset; + break; + case SPLASH_CORNER_TOP: + dst_xoff = info->var.xres - pp->pic_header->width; + dst_xoff /= 2; + dst_yoff = info->var.yres - pp->pic_header->height; + dst_yoff /= 2; + + dst_yoff -= ph->position_offset; + break; + case SPLASH_CORNER_TOP_RIGHT: + dst_xoff = info->var.xres - pp->pic_header->width; + dst_xoff /= 2; + dst_yoff = info->var.yres - pp->pic_header->height; + dst_yoff /= 2; + + dst_xoff += ph->position_offset; + dst_yoff -= ph->position_offset; + break; + case SPLASH_CORNER_RIGHT: + dst_xoff = info->var.xres - pp->pic_header->width; + dst_xoff /= 2; + dst_yoff = info->var.yres - pp->pic_header->height; + dst_yoff /= 2; + + dst_xoff += ph->position_offset; + break; + case SPLASH_CORNER_BOTTOM_RIGHT: + dst_xoff = info->var.xres - pp->pic_header->width; + dst_xoff /= 2; + dst_yoff = info->var.yres - pp->pic_header->height; + dst_yoff /= 2; + + dst_xoff += ph->position_offset; + dst_yoff += ph->position_offset; + break; + case SPLASH_CORNER_BOTTOM: + dst_xoff = info->var.xres - pp->pic_header->width; + dst_xoff /= 2; + dst_yoff = info->var.yres - pp->pic_header->height; + dst_yoff /= 2; + + dst_yoff += ph->position_offset; + break; + case SPLASH_CORNER_BOTTOM_LEFT: + dst_xoff = info->var.xres - pp->pic_header->width; + dst_xoff /= 2; + dst_yoff = info->var.yres - pp->pic_header->height; + dst_yoff /= 2; + + dst_xoff -= ph->position_offset; + dst_yoff += ph->position_offset; + break; + case SPLASH_CORNER_LEFT: + dst_xoff = info->var.xres - pp->pic_header->width; + dst_xoff /= 2; + dst_yoff = info->var.yres - pp->pic_header->height; + dst_yoff /= 2; + + dst_xoff -= ph->position_offset; + break; + + default: + /* As a fallback, center the picture. */ + dst_xoff = info->var.xres - pp->pic_header->width; + dst_xoff /= 2; + dst_yoff = info->var.yres - pp->pic_header->height; + dst_yoff /= 2; + break; + } if (dst_xoff < 0 || dst_yoff < 0 diff --git a/include/uapi/linux/bootsplash_file.h b/include/uapi/linux/bootsplash_file.h index 89dc9cca8f0c..71cedcc68933 100644 --- a/include/uapi/linux/bootsplash_file.h +++ b/include/uapi/linux/bootsplash_file.h @@ -91,7 +91,32 @@ struct splash_pic_header { */ uint8_t num_blobs; - uint8_t padding[27]; + /* + * Corner to move the picture to / from. + * 0x00 - Top left + * 0x01 - Top + * 0x02 - Top right + * 0x03 - Right + * 0x04 - Bottom right + * 0x05 - Bottom + * 0x06 - Bottom left + * 0x07 - Left + * + * Flags: + * 0x10 - Calculate offset from the corner towards the center, + * rather than from the center towards the corner + */ + uint8_t position; + + /* + * Pixel offset from the selected position. + * Example: If the picture is in the top right corner, it will + * be placed position_offset pixels from the top and + * position_offset pixels from the right margin. + */ + uint16_t position_offset; + + uint8_t padding[24]; } __attribute__((__packed__)); @@ -115,4 +140,22 @@ struct splash_blob_header { uint8_t padding[9]; } __attribute__((__packed__)); + + + +/* + * Enums for on-disk types + */ +enum splash_position { + SPLASH_CORNER_TOP_LEFT = 0, + SPLASH_CORNER_TOP = 1, + SPLASH_CORNER_TOP_RIGHT = 2, + SPLASH_CORNER_RIGHT = 3, + SPLASH_CORNER_BOTTOM_RIGHT = 4, + SPLASH_CORNER_BOTTOM = 5, + SPLASH_CORNER_BOTTOM_LEFT = 6, + SPLASH_CORNER_LEFT = 7, + SPLASH_POS_FLAG_CORNER = 0x10, +}; + #endif -- 2.12.3 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Max Staudt Date: Wed, 13 Dec 2017 19:47:46 +0000 Subject: [RFC PATCH v2 04/13] bootsplash: Add corner positioning Message-Id: <20171213194755.3409-5-mstaudt@suse.de> List-Id: References: <20171213194755.3409-1-mstaudt@suse.de> In-Reply-To: <20171213194755.3409-1-mstaudt@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: b.zolnierkie@samsung.com, linux-fbdev@vger.kernel.org Cc: michal@markovi.net, sndirsch@suse.com, oneukum@suse.com, tiwai@suse.com, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, mstaudt@suse.de, bernhard.rosenkranzer@linaro.org, philm@manjaro.org This allows showing multiple logos, each in its own position, relative to the eight screen corners. Signed-off-by: Max Staudt --- drivers/video/fbdev/core/bootsplash_render.c | 136 ++++++++++++++++++++++++++- include/uapi/linux/bootsplash_file.h | 45 ++++++++- 2 files changed, 178 insertions(+), 3 deletions(-) diff --git a/drivers/video/fbdev/core/bootsplash_render.c b/drivers/video/fbdev/core/bootsplash_render.c index 8c09c306ff67..07e3a4eab811 100644 --- a/drivers/video/fbdev/core/bootsplash_render.c +++ b/drivers/video/fbdev/core/bootsplash_render.c @@ -155,6 +155,7 @@ void bootsplash_do_render_pictures(struct fb_info *info, for (i = 0; i < fp->header->num_pics; i++) { struct splash_blob_priv *bp; struct splash_pic_priv *pp = &fp->pics[i]; + const struct splash_pic_header *ph = pp->pic_header; long dst_xoff, dst_yoff; if (pp->blobs_loaded < 1) @@ -165,8 +166,139 @@ void bootsplash_do_render_pictures(struct fb_info *info, if (!bp || bp->blob_header->type != 0) continue; - dst_xoff = (info->var.xres - pp->pic_header->width) / 2; - dst_yoff = (info->var.yres - pp->pic_header->height) / 2; + switch (ph->position) { + case SPLASH_POS_FLAG_CORNER | SPLASH_CORNER_TOP_LEFT: + dst_xoff = 0; + dst_yoff = 0; + + dst_xoff += ph->position_offset; + dst_yoff += ph->position_offset; + break; + case SPLASH_POS_FLAG_CORNER | SPLASH_CORNER_TOP: + dst_xoff = info->var.xres - pp->pic_header->width; + dst_xoff /= 2; + dst_yoff = 0; + + dst_yoff += ph->position_offset; + break; + case SPLASH_POS_FLAG_CORNER | SPLASH_CORNER_TOP_RIGHT: + dst_xoff = info->var.xres - pp->pic_header->width; + dst_yoff = 0; + + dst_xoff -= ph->position_offset; + dst_yoff += ph->position_offset; + break; + case SPLASH_POS_FLAG_CORNER | SPLASH_CORNER_RIGHT: + dst_xoff = info->var.xres - pp->pic_header->width; + dst_yoff = info->var.yres - pp->pic_header->height; + dst_yoff /= 2; + + dst_xoff -= ph->position_offset; + break; + case SPLASH_POS_FLAG_CORNER | SPLASH_CORNER_BOTTOM_RIGHT: + dst_xoff = info->var.xres - pp->pic_header->width; + dst_yoff = info->var.yres - pp->pic_header->height; + + dst_xoff -= ph->position_offset; + dst_yoff -= ph->position_offset; + break; + case SPLASH_POS_FLAG_CORNER | SPLASH_CORNER_BOTTOM: + dst_xoff = info->var.xres - pp->pic_header->width; + dst_xoff /= 2; + dst_yoff = info->var.yres - pp->pic_header->height; + + dst_yoff -= ph->position_offset; + break; + case SPLASH_POS_FLAG_CORNER | SPLASH_CORNER_BOTTOM_LEFT: + dst_xoff = 0 + ph->position_offset; + dst_yoff = info->var.yres - pp->pic_header->height + - ph->position_offset; + break; + case SPLASH_POS_FLAG_CORNER | SPLASH_CORNER_LEFT: + dst_xoff = 0; + dst_yoff = info->var.yres - pp->pic_header->height; + dst_yoff /= 2; + + dst_xoff += ph->position_offset; + break; + + case SPLASH_CORNER_TOP_LEFT: + dst_xoff = info->var.xres - pp->pic_header->width; + dst_xoff /= 2; + dst_yoff = info->var.yres - pp->pic_header->height; + dst_yoff /= 2; + + dst_xoff -= ph->position_offset; + dst_yoff -= ph->position_offset; + break; + case SPLASH_CORNER_TOP: + dst_xoff = info->var.xres - pp->pic_header->width; + dst_xoff /= 2; + dst_yoff = info->var.yres - pp->pic_header->height; + dst_yoff /= 2; + + dst_yoff -= ph->position_offset; + break; + case SPLASH_CORNER_TOP_RIGHT: + dst_xoff = info->var.xres - pp->pic_header->width; + dst_xoff /= 2; + dst_yoff = info->var.yres - pp->pic_header->height; + dst_yoff /= 2; + + dst_xoff += ph->position_offset; + dst_yoff -= ph->position_offset; + break; + case SPLASH_CORNER_RIGHT: + dst_xoff = info->var.xres - pp->pic_header->width; + dst_xoff /= 2; + dst_yoff = info->var.yres - pp->pic_header->height; + dst_yoff /= 2; + + dst_xoff += ph->position_offset; + break; + case SPLASH_CORNER_BOTTOM_RIGHT: + dst_xoff = info->var.xres - pp->pic_header->width; + dst_xoff /= 2; + dst_yoff = info->var.yres - pp->pic_header->height; + dst_yoff /= 2; + + dst_xoff += ph->position_offset; + dst_yoff += ph->position_offset; + break; + case SPLASH_CORNER_BOTTOM: + dst_xoff = info->var.xres - pp->pic_header->width; + dst_xoff /= 2; + dst_yoff = info->var.yres - pp->pic_header->height; + dst_yoff /= 2; + + dst_yoff += ph->position_offset; + break; + case SPLASH_CORNER_BOTTOM_LEFT: + dst_xoff = info->var.xres - pp->pic_header->width; + dst_xoff /= 2; + dst_yoff = info->var.yres - pp->pic_header->height; + dst_yoff /= 2; + + dst_xoff -= ph->position_offset; + dst_yoff += ph->position_offset; + break; + case SPLASH_CORNER_LEFT: + dst_xoff = info->var.xres - pp->pic_header->width; + dst_xoff /= 2; + dst_yoff = info->var.yres - pp->pic_header->height; + dst_yoff /= 2; + + dst_xoff -= ph->position_offset; + break; + + default: + /* As a fallback, center the picture. */ + dst_xoff = info->var.xres - pp->pic_header->width; + dst_xoff /= 2; + dst_yoff = info->var.yres - pp->pic_header->height; + dst_yoff /= 2; + break; + } if (dst_xoff < 0 || dst_yoff < 0 diff --git a/include/uapi/linux/bootsplash_file.h b/include/uapi/linux/bootsplash_file.h index 89dc9cca8f0c..71cedcc68933 100644 --- a/include/uapi/linux/bootsplash_file.h +++ b/include/uapi/linux/bootsplash_file.h @@ -91,7 +91,32 @@ struct splash_pic_header { */ uint8_t num_blobs; - uint8_t padding[27]; + /* + * Corner to move the picture to / from. + * 0x00 - Top left + * 0x01 - Top + * 0x02 - Top right + * 0x03 - Right + * 0x04 - Bottom right + * 0x05 - Bottom + * 0x06 - Bottom left + * 0x07 - Left + * + * Flags: + * 0x10 - Calculate offset from the corner towards the center, + * rather than from the center towards the corner + */ + uint8_t position; + + /* + * Pixel offset from the selected position. + * Example: If the picture is in the top right corner, it will + * be placed position_offset pixels from the top and + * position_offset pixels from the right margin. + */ + uint16_t position_offset; + + uint8_t padding[24]; } __attribute__((__packed__)); @@ -115,4 +140,22 @@ struct splash_blob_header { uint8_t padding[9]; } __attribute__((__packed__)); + + + +/* + * Enums for on-disk types + */ +enum splash_position { + SPLASH_CORNER_TOP_LEFT = 0, + SPLASH_CORNER_TOP = 1, + SPLASH_CORNER_TOP_RIGHT = 2, + SPLASH_CORNER_RIGHT = 3, + SPLASH_CORNER_BOTTOM_RIGHT = 4, + SPLASH_CORNER_BOTTOM = 5, + SPLASH_CORNER_BOTTOM_LEFT = 6, + SPLASH_CORNER_LEFT = 7, + SPLASH_POS_FLAG_CORNER = 0x10, +}; + #endif -- 2.12.3 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Max Staudt Subject: [RFC PATCH v2 04/13] bootsplash: Add corner positioning Date: Wed, 13 Dec 2017 20:47:46 +0100 Message-ID: <20171213194755.3409-5-mstaudt@suse.de> References: <20171213194755.3409-1-mstaudt@suse.de> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) by gabe.freedesktop.org (Postfix) with ESMTPS id A89676E598 for ; Wed, 13 Dec 2017 19:48:44 +0000 (UTC) In-Reply-To: <20171213194755.3409-1-mstaudt@suse.de> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: b.zolnierkie@samsung.com, linux-fbdev@vger.kernel.org Cc: michal@markovi.net, sndirsch@suse.com, oneukum@suse.com, tiwai@suse.com, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, mstaudt@suse.de, bernhard.rosenkranzer@linaro.org, philm@manjaro.org List-Id: dri-devel@lists.freedesktop.org VGhpcyBhbGxvd3Mgc2hvd2luZyBtdWx0aXBsZSBsb2dvcywgZWFjaCBpbiBpdHMgb3duIHBvc2l0 aW9uLApyZWxhdGl2ZSB0byB0aGUgZWlnaHQgc2NyZWVuIGNvcm5lcnMuCgpTaWduZWQtb2ZmLWJ5 OiBNYXggU3RhdWR0IDxtc3RhdWR0QHN1c2UuZGU+Ci0tLQogZHJpdmVycy92aWRlby9mYmRldi9j b3JlL2Jvb3RzcGxhc2hfcmVuZGVyLmMgfCAxMzYgKysrKysrKysrKysrKysrKysrKysrKysrKyst CiBpbmNsdWRlL3VhcGkvbGludXgvYm9vdHNwbGFzaF9maWxlLmggICAgICAgICB8ICA0NSArKysr KysrKy0KIDIgZmlsZXMgY2hhbmdlZCwgMTc4IGluc2VydGlvbnMoKyksIDMgZGVsZXRpb25zKC0p CgpkaWZmIC0tZ2l0IGEvZHJpdmVycy92aWRlby9mYmRldi9jb3JlL2Jvb3RzcGxhc2hfcmVuZGVy LmMgYi9kcml2ZXJzL3ZpZGVvL2ZiZGV2L2NvcmUvYm9vdHNwbGFzaF9yZW5kZXIuYwppbmRleCA4 YzA5YzMwNmZmNjcuLjA3ZTNhNGVhYjgxMSAxMDA2NDQKLS0tIGEvZHJpdmVycy92aWRlby9mYmRl di9jb3JlL2Jvb3RzcGxhc2hfcmVuZGVyLmMKKysrIGIvZHJpdmVycy92aWRlby9mYmRldi9jb3Jl L2Jvb3RzcGxhc2hfcmVuZGVyLmMKQEAgLTE1NSw2ICsxNTUsNyBAQCB2b2lkIGJvb3RzcGxhc2hf ZG9fcmVuZGVyX3BpY3R1cmVzKHN0cnVjdCBmYl9pbmZvICppbmZvLAogCWZvciAoaSA9IDA7IGkg PCBmcC0+aGVhZGVyLT5udW1fcGljczsgaSsrKSB7CiAJCXN0cnVjdCBzcGxhc2hfYmxvYl9wcml2 ICpicDsKIAkJc3RydWN0IHNwbGFzaF9waWNfcHJpdiAqcHAgPSAmZnAtPnBpY3NbaV07CisJCWNv bnN0IHN0cnVjdCBzcGxhc2hfcGljX2hlYWRlciAqcGggPSBwcC0+cGljX2hlYWRlcjsKIAkJbG9u ZyBkc3RfeG9mZiwgZHN0X3lvZmY7CiAKIAkJaWYgKHBwLT5ibG9ic19sb2FkZWQgPCAxKQpAQCAt MTY1LDggKzE2NiwxMzkgQEAgdm9pZCBib290c3BsYXNoX2RvX3JlbmRlcl9waWN0dXJlcyhzdHJ1 Y3QgZmJfaW5mbyAqaW5mbywKIAkJaWYgKCFicCB8fCBicC0+YmxvYl9oZWFkZXItPnR5cGUgIT0g MCkKIAkJCWNvbnRpbnVlOwogCi0JCWRzdF94b2ZmID0gKGluZm8tPnZhci54cmVzIC0gcHAtPnBp Y19oZWFkZXItPndpZHRoKSAvIDI7Ci0JCWRzdF95b2ZmID0gKGluZm8tPnZhci55cmVzIC0gcHAt PnBpY19oZWFkZXItPmhlaWdodCkgLyAyOworCQlzd2l0Y2ggKHBoLT5wb3NpdGlvbikgeworCQlj YXNlIFNQTEFTSF9QT1NfRkxBR19DT1JORVIgfCBTUExBU0hfQ09STkVSX1RPUF9MRUZUOgorCQkJ ZHN0X3hvZmYgPSAwOworCQkJZHN0X3lvZmYgPSAwOworCisJCQlkc3RfeG9mZiArPSBwaC0+cG9z aXRpb25fb2Zmc2V0OworCQkJZHN0X3lvZmYgKz0gcGgtPnBvc2l0aW9uX29mZnNldDsKKwkJCWJy ZWFrOworCQljYXNlIFNQTEFTSF9QT1NfRkxBR19DT1JORVIgfCBTUExBU0hfQ09STkVSX1RPUDoK KwkJCWRzdF94b2ZmID0gaW5mby0+dmFyLnhyZXMgLSBwcC0+cGljX2hlYWRlci0+d2lkdGg7CisJ CQlkc3RfeG9mZiAvPSAyOworCQkJZHN0X3lvZmYgPSAwOworCisJCQlkc3RfeW9mZiArPSBwaC0+ cG9zaXRpb25fb2Zmc2V0OworCQkJYnJlYWs7CisJCWNhc2UgU1BMQVNIX1BPU19GTEFHX0NPUk5F UiB8IFNQTEFTSF9DT1JORVJfVE9QX1JJR0hUOgorCQkJZHN0X3hvZmYgPSBpbmZvLT52YXIueHJl cyAtIHBwLT5waWNfaGVhZGVyLT53aWR0aDsKKwkJCWRzdF95b2ZmID0gMDsKKworCQkJZHN0X3hv ZmYgLT0gcGgtPnBvc2l0aW9uX29mZnNldDsKKwkJCWRzdF95b2ZmICs9IHBoLT5wb3NpdGlvbl9v ZmZzZXQ7CisJCQlicmVhazsKKwkJY2FzZSBTUExBU0hfUE9TX0ZMQUdfQ09STkVSIHwgU1BMQVNI X0NPUk5FUl9SSUdIVDoKKwkJCWRzdF94b2ZmID0gaW5mby0+dmFyLnhyZXMgLSBwcC0+cGljX2hl YWRlci0+d2lkdGg7CisJCQlkc3RfeW9mZiA9IGluZm8tPnZhci55cmVzIC0gcHAtPnBpY19oZWFk ZXItPmhlaWdodDsKKwkJCWRzdF95b2ZmIC89IDI7CisKKwkJCWRzdF94b2ZmIC09IHBoLT5wb3Np dGlvbl9vZmZzZXQ7CisJCQlicmVhazsKKwkJY2FzZSBTUExBU0hfUE9TX0ZMQUdfQ09STkVSIHwg U1BMQVNIX0NPUk5FUl9CT1RUT01fUklHSFQ6CisJCQlkc3RfeG9mZiA9IGluZm8tPnZhci54cmVz IC0gcHAtPnBpY19oZWFkZXItPndpZHRoOworCQkJZHN0X3lvZmYgPSBpbmZvLT52YXIueXJlcyAt IHBwLT5waWNfaGVhZGVyLT5oZWlnaHQ7CisKKwkJCWRzdF94b2ZmIC09IHBoLT5wb3NpdGlvbl9v ZmZzZXQ7CisJCQlkc3RfeW9mZiAtPSBwaC0+cG9zaXRpb25fb2Zmc2V0OworCQkJYnJlYWs7CisJ CWNhc2UgU1BMQVNIX1BPU19GTEFHX0NPUk5FUiB8IFNQTEFTSF9DT1JORVJfQk9UVE9NOgorCQkJ ZHN0X3hvZmYgPSBpbmZvLT52YXIueHJlcyAtIHBwLT5waWNfaGVhZGVyLT53aWR0aDsKKwkJCWRz dF94b2ZmIC89IDI7CisJCQlkc3RfeW9mZiA9IGluZm8tPnZhci55cmVzIC0gcHAtPnBpY19oZWFk ZXItPmhlaWdodDsKKworCQkJZHN0X3lvZmYgLT0gcGgtPnBvc2l0aW9uX29mZnNldDsKKwkJCWJy ZWFrOworCQljYXNlIFNQTEFTSF9QT1NfRkxBR19DT1JORVIgfCBTUExBU0hfQ09STkVSX0JPVFRP TV9MRUZUOgorCQkJZHN0X3hvZmYgPSAwICsgcGgtPnBvc2l0aW9uX29mZnNldDsKKwkJCWRzdF95 b2ZmID0gaW5mby0+dmFyLnlyZXMgLSBwcC0+cGljX2hlYWRlci0+aGVpZ2h0CisJCQkJCQkgIC0g cGgtPnBvc2l0aW9uX29mZnNldDsKKwkJCWJyZWFrOworCQljYXNlIFNQTEFTSF9QT1NfRkxBR19D T1JORVIgfCBTUExBU0hfQ09STkVSX0xFRlQ6CisJCQlkc3RfeG9mZiA9IDA7CisJCQlkc3RfeW9m ZiA9IGluZm8tPnZhci55cmVzIC0gcHAtPnBpY19oZWFkZXItPmhlaWdodDsKKwkJCWRzdF95b2Zm IC89IDI7CisKKwkJCWRzdF94b2ZmICs9IHBoLT5wb3NpdGlvbl9vZmZzZXQ7CisJCQlicmVhazsK KworCQljYXNlIFNQTEFTSF9DT1JORVJfVE9QX0xFRlQ6CisJCQlkc3RfeG9mZiA9IGluZm8tPnZh ci54cmVzIC0gcHAtPnBpY19oZWFkZXItPndpZHRoOworCQkJZHN0X3hvZmYgLz0gMjsKKwkJCWRz dF95b2ZmID0gaW5mby0+dmFyLnlyZXMgLSBwcC0+cGljX2hlYWRlci0+aGVpZ2h0OworCQkJZHN0 X3lvZmYgLz0gMjsKKworCQkJZHN0X3hvZmYgLT0gcGgtPnBvc2l0aW9uX29mZnNldDsKKwkJCWRz dF95b2ZmIC09IHBoLT5wb3NpdGlvbl9vZmZzZXQ7CisJCQlicmVhazsKKwkJY2FzZSBTUExBU0hf Q09STkVSX1RPUDoKKwkJCWRzdF94b2ZmID0gaW5mby0+dmFyLnhyZXMgLSBwcC0+cGljX2hlYWRl ci0+d2lkdGg7CisJCQlkc3RfeG9mZiAvPSAyOworCQkJZHN0X3lvZmYgPSBpbmZvLT52YXIueXJl cyAtIHBwLT5waWNfaGVhZGVyLT5oZWlnaHQ7CisJCQlkc3RfeW9mZiAvPSAyOworCisJCQlkc3Rf eW9mZiAtPSBwaC0+cG9zaXRpb25fb2Zmc2V0OworCQkJYnJlYWs7CisJCWNhc2UgU1BMQVNIX0NP Uk5FUl9UT1BfUklHSFQ6CisJCQlkc3RfeG9mZiA9IGluZm8tPnZhci54cmVzIC0gcHAtPnBpY19o ZWFkZXItPndpZHRoOworCQkJZHN0X3hvZmYgLz0gMjsKKwkJCWRzdF95b2ZmID0gaW5mby0+dmFy LnlyZXMgLSBwcC0+cGljX2hlYWRlci0+aGVpZ2h0OworCQkJZHN0X3lvZmYgLz0gMjsKKworCQkJ ZHN0X3hvZmYgKz0gcGgtPnBvc2l0aW9uX29mZnNldDsKKwkJCWRzdF95b2ZmIC09IHBoLT5wb3Np dGlvbl9vZmZzZXQ7CisJCQlicmVhazsKKwkJY2FzZSBTUExBU0hfQ09STkVSX1JJR0hUOgorCQkJ ZHN0X3hvZmYgPSBpbmZvLT52YXIueHJlcyAtIHBwLT5waWNfaGVhZGVyLT53aWR0aDsKKwkJCWRz dF94b2ZmIC89IDI7CisJCQlkc3RfeW9mZiA9IGluZm8tPnZhci55cmVzIC0gcHAtPnBpY19oZWFk ZXItPmhlaWdodDsKKwkJCWRzdF95b2ZmIC89IDI7CisKKwkJCWRzdF94b2ZmICs9IHBoLT5wb3Np dGlvbl9vZmZzZXQ7CisJCQlicmVhazsKKwkJY2FzZSBTUExBU0hfQ09STkVSX0JPVFRPTV9SSUdI VDoKKwkJCWRzdF94b2ZmID0gaW5mby0+dmFyLnhyZXMgLSBwcC0+cGljX2hlYWRlci0+d2lkdGg7 CisJCQlkc3RfeG9mZiAvPSAyOworCQkJZHN0X3lvZmYgPSBpbmZvLT52YXIueXJlcyAtIHBwLT5w aWNfaGVhZGVyLT5oZWlnaHQ7CisJCQlkc3RfeW9mZiAvPSAyOworCisJCQlkc3RfeG9mZiArPSBw aC0+cG9zaXRpb25fb2Zmc2V0OworCQkJZHN0X3lvZmYgKz0gcGgtPnBvc2l0aW9uX29mZnNldDsK KwkJCWJyZWFrOworCQljYXNlIFNQTEFTSF9DT1JORVJfQk9UVE9NOgorCQkJZHN0X3hvZmYgPSBp bmZvLT52YXIueHJlcyAtIHBwLT5waWNfaGVhZGVyLT53aWR0aDsKKwkJCWRzdF94b2ZmIC89IDI7 CisJCQlkc3RfeW9mZiA9IGluZm8tPnZhci55cmVzIC0gcHAtPnBpY19oZWFkZXItPmhlaWdodDsK KwkJCWRzdF95b2ZmIC89IDI7CisKKwkJCWRzdF95b2ZmICs9IHBoLT5wb3NpdGlvbl9vZmZzZXQ7 CisJCQlicmVhazsKKwkJY2FzZSBTUExBU0hfQ09STkVSX0JPVFRPTV9MRUZUOgorCQkJZHN0X3hv ZmYgPSBpbmZvLT52YXIueHJlcyAtIHBwLT5waWNfaGVhZGVyLT53aWR0aDsKKwkJCWRzdF94b2Zm IC89IDI7CisJCQlkc3RfeW9mZiA9IGluZm8tPnZhci55cmVzIC0gcHAtPnBpY19oZWFkZXItPmhl aWdodDsKKwkJCWRzdF95b2ZmIC89IDI7CisKKwkJCWRzdF94b2ZmIC09IHBoLT5wb3NpdGlvbl9v ZmZzZXQ7CisJCQlkc3RfeW9mZiArPSBwaC0+cG9zaXRpb25fb2Zmc2V0OworCQkJYnJlYWs7CisJ CWNhc2UgU1BMQVNIX0NPUk5FUl9MRUZUOgorCQkJZHN0X3hvZmYgPSBpbmZvLT52YXIueHJlcyAt IHBwLT5waWNfaGVhZGVyLT53aWR0aDsKKwkJCWRzdF94b2ZmIC89IDI7CisJCQlkc3RfeW9mZiA9 IGluZm8tPnZhci55cmVzIC0gcHAtPnBpY19oZWFkZXItPmhlaWdodDsKKwkJCWRzdF95b2ZmIC89 IDI7CisKKwkJCWRzdF94b2ZmIC09IHBoLT5wb3NpdGlvbl9vZmZzZXQ7CisJCQlicmVhazsKKwor CQlkZWZhdWx0OgorCQkJLyogQXMgYSBmYWxsYmFjaywgY2VudGVyIHRoZSBwaWN0dXJlLiAqLwor CQkJZHN0X3hvZmYgPSBpbmZvLT52YXIueHJlcyAtIHBwLT5waWNfaGVhZGVyLT53aWR0aDsKKwkJ CWRzdF94b2ZmIC89IDI7CisJCQlkc3RfeW9mZiA9IGluZm8tPnZhci55cmVzIC0gcHAtPnBpY19o ZWFkZXItPmhlaWdodDsKKwkJCWRzdF95b2ZmIC89IDI7CisJCQlicmVhazsKKwkJfQogCiAJCWlm IChkc3RfeG9mZiA8IDAKIAkJICAgIHx8IGRzdF95b2ZmIDwgMApkaWZmIC0tZ2l0IGEvaW5jbHVk ZS91YXBpL2xpbnV4L2Jvb3RzcGxhc2hfZmlsZS5oIGIvaW5jbHVkZS91YXBpL2xpbnV4L2Jvb3Rz cGxhc2hfZmlsZS5oCmluZGV4IDg5ZGM5Y2NhOGYwYy4uNzFjZWRjYzY4OTMzIDEwMDY0NAotLS0g YS9pbmNsdWRlL3VhcGkvbGludXgvYm9vdHNwbGFzaF9maWxlLmgKKysrIGIvaW5jbHVkZS91YXBp L2xpbnV4L2Jvb3RzcGxhc2hfZmlsZS5oCkBAIC05MSw3ICs5MSwzMiBAQCBzdHJ1Y3Qgc3BsYXNo X3BpY19oZWFkZXIgewogCSAqLwogCXVpbnQ4X3QgbnVtX2Jsb2JzOwogCi0JdWludDhfdCBwYWRk aW5nWzI3XTsKKwkvKgorCSAqIENvcm5lciB0byBtb3ZlIHRoZSBwaWN0dXJlIHRvIC8gZnJvbS4K KwkgKiAgMHgwMCAtIFRvcCBsZWZ0CisJICogIDB4MDEgLSBUb3AKKwkgKiAgMHgwMiAtIFRvcCBy aWdodAorCSAqICAweDAzIC0gUmlnaHQKKwkgKiAgMHgwNCAtIEJvdHRvbSByaWdodAorCSAqICAw eDA1IC0gQm90dG9tCisJICogIDB4MDYgLSBCb3R0b20gbGVmdAorCSAqICAweDA3IC0gTGVmdAor CSAqCisJICogRmxhZ3M6CisJICogIDB4MTAgLSBDYWxjdWxhdGUgb2Zmc2V0IGZyb20gdGhlIGNv cm5lciB0b3dhcmRzIHRoZSBjZW50ZXIsCisJICogICAgICAgICByYXRoZXIgdGhhbiBmcm9tIHRo ZSBjZW50ZXIgdG93YXJkcyB0aGUgY29ybmVyCisJICovCisJdWludDhfdCBwb3NpdGlvbjsKKwor CS8qCisJICogUGl4ZWwgb2Zmc2V0IGZyb20gdGhlIHNlbGVjdGVkIHBvc2l0aW9uLgorCSAqIEV4 YW1wbGU6IElmIHRoZSBwaWN0dXJlIGlzIGluIHRoZSB0b3AgcmlnaHQgY29ybmVyLCBpdCB3aWxs CisJICogICAgICAgICAgYmUgcGxhY2VkIHBvc2l0aW9uX29mZnNldCBwaXhlbHMgZnJvbSB0aGUg dG9wIGFuZAorCSAqICAgICAgICAgIHBvc2l0aW9uX29mZnNldCBwaXhlbHMgZnJvbSB0aGUgcmln aHQgbWFyZ2luLgorCSAqLworCXVpbnQxNl90IHBvc2l0aW9uX29mZnNldDsKKworCXVpbnQ4X3Qg cGFkZGluZ1syNF07CiB9IF9fYXR0cmlidXRlX18oKF9fcGFja2VkX18pKTsKIAogCkBAIC0xMTUs NCArMTQwLDIyIEBAIHN0cnVjdCBzcGxhc2hfYmxvYl9oZWFkZXIgewogCXVpbnQ4X3QgcGFkZGlu Z1s5XTsKIH0gX19hdHRyaWJ1dGVfXygoX19wYWNrZWRfXykpOwogCisKKworCisvKgorICogRW51 bXMgZm9yIG9uLWRpc2sgdHlwZXMKKyAqLworZW51bSBzcGxhc2hfcG9zaXRpb24geworCVNQTEFT SF9DT1JORVJfVE9QX0xFRlQgPSAwLAorCVNQTEFTSF9DT1JORVJfVE9QID0gMSwKKwlTUExBU0hf Q09STkVSX1RPUF9SSUdIVCA9IDIsCisJU1BMQVNIX0NPUk5FUl9SSUdIVCA9IDMsCisJU1BMQVNI X0NPUk5FUl9CT1RUT01fUklHSFQgPSA0LAorCVNQTEFTSF9DT1JORVJfQk9UVE9NID0gNSwKKwlT UExBU0hfQ09STkVSX0JPVFRPTV9MRUZUID0gNiwKKwlTUExBU0hfQ09STkVSX0xFRlQgPSA3LAor CVNQTEFTSF9QT1NfRkxBR19DT1JORVIgPSAweDEwLAorfTsKKwogI2VuZGlmCi0tIAoyLjEyLjMK Cl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZl bCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xp c3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo=