From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-108-mta29.mxroute.com (mail-108-mta29.mxroute.com [136.175.108.29]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C8008153BD0 for ; Wed, 27 Mar 2024 22:25:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=136.175.108.29 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711578359; cv=none; b=BV4rHcfrS50ClajzoeJTZ7d3G6HYWOBCaLFMuvvSszaf6WHFS+CQfToYy6vV54d4YwtN6B2g6YrGA3UrS9OIa4w3dofahBjJm3JCYEmFlo6b6HppahnXRtpqMKb9Am3CLiTOZeoRF5nyCo7aSSSoO6YaXKyN9Ng3VTqPG5jey2w= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711578359; c=relaxed/simple; bh=jNP2p08WMq4rAvPD5G7zFc0QqU8Ssu6AvUGSAXAqNqE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=S+PnjH1NdEyx7iwEQzcCETco+oYbNuCSwjMEgZc/DFEq/jT4aqJaowShI2KRE0bXWHRHHtrln/SJBsaeIfL72fFVHaMxmAYgGeYsbCEi+TFVZZoW+yAJqf3Ew5ov1AiAfxKI9goee8o3uhcPGpOA13sxE2vlyVHqj7Vp1oChjOs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=luigi311.com; spf=pass smtp.mailfrom=luigi311.com; dkim=pass (2048-bit key) header.d=luigi311.com header.i=@luigi311.com header.b=B9ff2Ubw; arc=none smtp.client-ip=136.175.108.29 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=luigi311.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=luigi311.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=luigi311.com header.i=@luigi311.com header.b="B9ff2Ubw" Received: from filter006.mxroute.com ([136.175.111.2] filter006.mxroute.com) (Authenticated sender: mN4UYu2MZsgR) by mail-108-mta29.mxroute.com (ZoneMTA) with ESMTPSA id 18e82006d5c0003bea.00a for (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384); Wed, 27 Mar 2024 22:20:49 +0000 X-Zone-Loop: eb30997c9d27e0844d316c5398f05d202427ef8f18e0 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=luigi311.com; s=x; h=Content-Transfer-Encoding:Content-Type:MIME-Version: References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=pF+o/HwmqytRK3VcYcqwANjTHrDtZUjVJoHdG1r7wW4=; b=B9ff2UbwQIo2dGt/8jliHkC86K 1X65lupM9IL10DCFtqVqNnxhhE6T1t9Sawp0WHl1NMRiVEWhndkcJN3NyPJMOZUm8f7AzGMP2126I vwil6teubbCObwrkk0WhXa0eTDBrs5eVJqsItdxpT5f8CtD5l4QgViLmAGAmGGyJf0drQwbgKOFTz UMqQf0+bydgTl6NpyiCDTZhHX00czOLICnstXJbobPZqoCkPmIK+92aWBBBxRgypzJvYWiyQQmozH vIGWL6ig70yumWRfLP3w//kM7vva3W0T3uyoCXlYzNSWQFwHegtCtDnpPFVY4Db4fSgMOmMaHM7Jj d3zbq4Mg==; From: git@luigi311.com To: linux-media@vger.kernel.org Cc: dave.stevenson@raspberrypi.com, jacopo.mondi@ideasonboard.com, mchehab@kernel.org, robh@kernel.org, krzysztof.kozlowski+dt@linaro.org, conor+dt@kernel.org, shawnguo@kernel.org, s.hauer@pengutronix.de, kernel@pengutronix.de, festevam@gmail.com, sakari.ailus@linux.intel.com, devicetree@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, x@xnux.eu Subject: [PATCH 02/23] media: i2c: imx258: Make image geometry meet sensor requirements Date: Wed, 27 Mar 2024 16:20:14 -0600 Message-ID: <20240327222035.47208-3-git@luigi311.com> In-Reply-To: <20240327222035.47208-1-git@luigi311.com> References: <20240327222035.47208-1-git@luigi311.com> Precedence: bulk X-Mailing-List: imx@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Authenticated-Id: personal@luigi311.com From: Dave Stevenson The output image is defined as being 4208x3118 pixels in size. Y_ADD_STA register was set to 0, and Y_ADD_END to 3118, giving 3119 lines total. The datasheet lists a requirement for Y_ADD_STA to be a multiple of a power of 2 depending on binning/scaling mode (2 for full pixel, 4 for x2-bin/scale, 8 for (x2-bin)+(x2-subsample) or x4-bin, or 16 for (x4-bin)+(x2-subsample)). (Y_ADD_END – Y_ADD_STA + 1) also has to be a similar power of 2. The current configuration for the full res modes breaks that second requirement, and we can't increase Y_ADD_STA to 1 to retain exactly the same field of view as that then breaks the first requirement. For the binned modes, they are worse off as 3118 is not a multiple of 4. Increase the main mode to 4208x3120 so that it is the same FOV as the binned modes, with Y_ADD_STA at 0. Fix Y_ADD_STA and Y_ADD_END for the binned modes so that they meet the sensor requirements. This does change the Bayer order as the default configuration is for H&V flips to be enabled, so readout is from Y_STA_END to Y_ADD_STA, and this patch has changed Y_STA_END. Signed-off-by: Dave Stevenson Reviewed-by: Jacopo Mondi --- drivers/media/i2c/imx258.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/drivers/media/i2c/imx258.c b/drivers/media/i2c/imx258.c index 2dbafd21dd70..4a7048d834c6 100644 --- a/drivers/media/i2c/imx258.c +++ b/drivers/media/i2c/imx258.c @@ -111,7 +111,7 @@ struct imx258_mode { struct imx258_reg_list reg_list; }; -/* 4208x3118 needs 1267Mbps/lane, 4 lanes */ +/* 4208x3120 needs 1267Mbps/lane, 4 lanes */ static const struct imx258_reg mipi_data_rate_1267mbps[] = { { 0x0301, 0x05 }, { 0x0303, 0x02 }, @@ -148,7 +148,7 @@ static const struct imx258_reg mipi_data_rate_640mbps[] = { { 0x0823, 0x00 }, }; -static const struct imx258_reg mode_4208x3118_regs[] = { +static const struct imx258_reg mode_4208x3120_regs[] = { { 0x0136, 0x13 }, { 0x0137, 0x33 }, { 0x3051, 0x00 }, @@ -210,7 +210,7 @@ static const struct imx258_reg mode_4208x3118_regs[] = { { 0x0348, 0x10 }, { 0x0349, 0x6F }, { 0x034A, 0x0C }, - { 0x034B, 0x2E }, + { 0x034B, 0x2F }, { 0x0381, 0x01 }, { 0x0383, 0x01 }, { 0x0385, 0x01 }, @@ -329,7 +329,7 @@ static const struct imx258_reg mode_2104_1560_regs[] = { { 0x0348, 0x10 }, { 0x0349, 0x6F }, { 0x034A, 0x0C }, - { 0x034B, 0x2E }, + { 0x034B, 0x2F }, { 0x0381, 0x01 }, { 0x0383, 0x01 }, { 0x0385, 0x01 }, @@ -448,7 +448,7 @@ static const struct imx258_reg mode_1048_780_regs[] = { { 0x0348, 0x10 }, { 0x0349, 0x6F }, { 0x034A, 0x0C }, - { 0x034B, 0x2E }, + { 0x034B, 0x2F }, { 0x0381, 0x01 }, { 0x0383, 0x01 }, { 0x0385, 0x01 }, @@ -562,12 +562,12 @@ static const struct imx258_link_freq_config link_freq_configs[] = { static const struct imx258_mode supported_modes[] = { { .width = 4208, - .height = 3118, + .height = 3120, .vts_def = IMX258_VTS_30FPS, .vts_min = IMX258_VTS_30FPS, .reg_list = { - .num_of_regs = ARRAY_SIZE(mode_4208x3118_regs), - .regs = mode_4208x3118_regs, + .num_of_regs = ARRAY_SIZE(mode_4208x3120_regs), + .regs = mode_4208x3120_regs, }, .link_freq_index = IMX258_LINK_FREQ_1267MBPS, }, @@ -707,7 +707,7 @@ static int imx258_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh) /* Initialize try_fmt */ try_fmt->width = supported_modes[0].width; try_fmt->height = supported_modes[0].height; - try_fmt->code = MEDIA_BUS_FMT_SGRBG10_1X10; + try_fmt->code = MEDIA_BUS_FMT_SBGGR10_1X10; try_fmt->field = V4L2_FIELD_NONE; return 0; @@ -819,7 +819,7 @@ static int imx258_enum_mbus_code(struct v4l2_subdev *sd, if (code->index > 0) return -EINVAL; - code->code = MEDIA_BUS_FMT_SGRBG10_1X10; + code->code = MEDIA_BUS_FMT_SBGGR10_1X10; return 0; } @@ -831,7 +831,7 @@ static int imx258_enum_frame_size(struct v4l2_subdev *sd, if (fse->index >= ARRAY_SIZE(supported_modes)) return -EINVAL; - if (fse->code != MEDIA_BUS_FMT_SGRBG10_1X10) + if (fse->code != MEDIA_BUS_FMT_SBGGR10_1X10) return -EINVAL; fse->min_width = supported_modes[fse->index].width; @@ -847,7 +847,7 @@ static void imx258_update_pad_format(const struct imx258_mode *mode, { fmt->format.width = mode->width; fmt->format.height = mode->height; - fmt->format.code = MEDIA_BUS_FMT_SGRBG10_1X10; + fmt->format.code = MEDIA_BUS_FMT_SBGGR10_1X10; fmt->format.field = V4L2_FIELD_NONE; } @@ -894,7 +894,7 @@ static int imx258_set_pad_format(struct v4l2_subdev *sd, mutex_lock(&imx258->mutex); /* Only one raw bayer(GBRG) order is supported */ - fmt->format.code = MEDIA_BUS_FMT_SGRBG10_1X10; + fmt->format.code = MEDIA_BUS_FMT_SBGGR10_1X10; mode = v4l2_find_nearest_size(supported_modes, ARRAY_SIZE(supported_modes), width, height, -- 2.42.0 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 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 14DF5CD1284 for ; Wed, 27 Mar 2024 22:26:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=yygdp3NA6a3pwmmt7WE3zCgYazBroiXZ1o7Ur9PKPXA=; b=DOGc4ULdUIJq5d Wou+S6XWcTZ5glJVKG3Z4gPleAS+2PUEXOBhMmACfPKQHOmXCSL+W4OiTVYJRze9Nd3nXd981cd40 myBv6ZckIVPygpbVqCfNr47HQU432O9O38ltX52wY24Ytgf6Yse7LVYPJB2CZsa53D7YHaAq6nzE7 8h2q2INzKUK4QRYellro6iQ1UBUX1hIbxGo+oJlIiJtlO0fsimJJ68i+Cxz6USBeUE/b2wYb2lc7i 0Ce6B7ls3qUTHI6L5YWEO9Yc8Aw2++N1LLu4i8ejq2uXbYU65y4A91edMfw4B6TkdRefJHTK9IpF0 o0LOgmCOT1f8ybDahq2w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rpbic-0000000BOu6-3ywK; Wed, 27 Mar 2024 22:26:02 +0000 Received: from mail-108-mta51.mxroute.com ([136.175.108.51]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rpbiX-0000000BOrp-3mOy for linux-arm-kernel@lists.infradead.org; Wed, 27 Mar 2024 22:25:59 +0000 Received: from filter006.mxroute.com ([136.175.111.2] filter006.mxroute.com) (Authenticated sender: mN4UYu2MZsgR) by mail-108-mta51.mxroute.com (ZoneMTA) with ESMTPSA id 18e82006d5c0003bea.009 for (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384); Wed, 27 Mar 2024 22:20:49 +0000 X-Zone-Loop: 33a4310889d50da687cb909f3743b2961ed7768d0d67 X-Originating-IP: [136.175.111.2] DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=luigi311.com; s=x; h=Content-Transfer-Encoding:Content-Type:MIME-Version: References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=pF+o/HwmqytRK3VcYcqwANjTHrDtZUjVJoHdG1r7wW4=; b=B9ff2UbwQIo2dGt/8jliHkC86K 1X65lupM9IL10DCFtqVqNnxhhE6T1t9Sawp0WHl1NMRiVEWhndkcJN3NyPJMOZUm8f7AzGMP2126I vwil6teubbCObwrkk0WhXa0eTDBrs5eVJqsItdxpT5f8CtD5l4QgViLmAGAmGGyJf0drQwbgKOFTz UMqQf0+bydgTl6NpyiCDTZhHX00czOLICnstXJbobPZqoCkPmIK+92aWBBBxRgypzJvYWiyQQmozH vIGWL6ig70yumWRfLP3w//kM7vva3W0T3uyoCXlYzNSWQFwHegtCtDnpPFVY4Db4fSgMOmMaHM7Jj d3zbq4Mg==; From: git@luigi311.com To: linux-media@vger.kernel.org Cc: dave.stevenson@raspberrypi.com, jacopo.mondi@ideasonboard.com, mchehab@kernel.org, robh@kernel.org, krzysztof.kozlowski+dt@linaro.org, conor+dt@kernel.org, shawnguo@kernel.org, s.hauer@pengutronix.de, kernel@pengutronix.de, festevam@gmail.com, sakari.ailus@linux.intel.com, devicetree@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, x@xnux.eu Subject: [PATCH 02/23] media: i2c: imx258: Make image geometry meet sensor requirements Date: Wed, 27 Mar 2024 16:20:14 -0600 Message-ID: <20240327222035.47208-3-git@luigi311.com> In-Reply-To: <20240327222035.47208-1-git@luigi311.com> References: <20240327222035.47208-1-git@luigi311.com> MIME-Version: 1.0 X-Authenticated-Id: personal@luigi311.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240327_152558_171150_1EF985DE X-CRM114-Status: GOOD ( 18.51 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org RnJvbTogRGF2ZSBTdGV2ZW5zb24gPGRhdmUuc3RldmVuc29uQHJhc3BiZXJyeXBpLmNvbT4KClRo ZSBvdXRwdXQgaW1hZ2UgaXMgZGVmaW5lZCBhcyBiZWluZyA0MjA4eDMxMTggcGl4ZWxzIGluIHNp emUuCllfQUREX1NUQSByZWdpc3RlciB3YXMgc2V0IHRvIDAsIGFuZCBZX0FERF9FTkQgdG8gMzEx OCwgZ2l2aW5nCjMxMTkgbGluZXMgdG90YWwuCgpUaGUgZGF0YXNoZWV0IGxpc3RzIGEgcmVxdWly ZW1lbnQgZm9yIFlfQUREX1NUQSB0byBiZSBhIG11bHRpcGxlCm9mIGEgcG93ZXIgb2YgMiBkZXBl bmRpbmcgb24gYmlubmluZy9zY2FsaW5nIG1vZGUgKDIgZm9yIGZ1bGwgcGl4ZWwsCjQgZm9yIHgy LWJpbi9zY2FsZSwgOCBmb3IgKHgyLWJpbikrKHgyLXN1YnNhbXBsZSkgb3IgeDQtYmluLCBvciAx Ngpmb3IgKHg0LWJpbikrKHgyLXN1YnNhbXBsZSkpLgooWV9BRERfRU5EIOKAkyBZX0FERF9TVEEg KyAxKSBhbHNvIGhhcyB0byBiZSBhIHNpbWlsYXIgcG93ZXIgb2YgMi4KClRoZSBjdXJyZW50IGNv bmZpZ3VyYXRpb24gZm9yIHRoZSBmdWxsIHJlcyBtb2RlcyBicmVha3MgdGhhdCBzZWNvbmQKcmVx dWlyZW1lbnQsIGFuZCB3ZSBjYW4ndCBpbmNyZWFzZSBZX0FERF9TVEEgdG8gMSB0byByZXRhaW4g ZXhhY3RseQp0aGUgc2FtZSBmaWVsZCBvZiB2aWV3IGFzIHRoYXQgdGhlbiBicmVha3MgdGhlIGZp cnN0IHJlcXVpcmVtZW50LgpGb3IgdGhlIGJpbm5lZCBtb2RlcywgdGhleSBhcmUgd29yc2Ugb2Zm IGFzIDMxMTggaXMgbm90IGEgbXVsdGlwbGUgb2YKNC4KCkluY3JlYXNlIHRoZSBtYWluIG1vZGUg dG8gNDIwOHgzMTIwIHNvIHRoYXQgaXQgaXMgdGhlIHNhbWUgRk9WIGFzIHRoZQpiaW5uZWQgbW9k ZXMsIHdpdGggWV9BRERfU1RBIGF0IDAuCkZpeCBZX0FERF9TVEEgYW5kIFlfQUREX0VORCBmb3Ig dGhlIGJpbm5lZCBtb2RlcyBzbyB0aGF0IHRoZXkgbWVldCB0aGUKc2Vuc29yIHJlcXVpcmVtZW50 cy4KClRoaXMgZG9lcyBjaGFuZ2UgdGhlIEJheWVyIG9yZGVyIGFzIHRoZSBkZWZhdWx0IGNvbmZp Z3VyYXRpb24gaXMgZm9yCkgmViBmbGlwcyB0byBiZSBlbmFibGVkLCBzbyByZWFkb3V0IGlzIGZy b20gWV9TVEFfRU5EIHRvIFlfQUREX1NUQSwKYW5kIHRoaXMgcGF0Y2ggaGFzIGNoYW5nZWQgWV9T VEFfRU5ELgoKU2lnbmVkLW9mZi1ieTogRGF2ZSBTdGV2ZW5zb24gPGRhdmUuc3RldmVuc29uQHJh c3BiZXJyeXBpLmNvbT4KUmV2aWV3ZWQtYnk6IEphY29wbyBNb25kaSA8amFjb3BvLm1vbmRpQGlk ZWFzb25ib2FyZC5jb20+Ci0tLQogZHJpdmVycy9tZWRpYS9pMmMvaW14MjU4LmMgfCAyNiArKysr KysrKysrKysrLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDEzIGluc2VydGlvbnMoKyks IDEzIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvbWVkaWEvaTJjL2lteDI1OC5j IGIvZHJpdmVycy9tZWRpYS9pMmMvaW14MjU4LmMKaW5kZXggMmRiYWZkMjFkZDcwLi40YTcwNDhk ODM0YzYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvbWVkaWEvaTJjL2lteDI1OC5jCisrKyBiL2RyaXZl cnMvbWVkaWEvaTJjL2lteDI1OC5jCkBAIC0xMTEsNyArMTExLDcgQEAgc3RydWN0IGlteDI1OF9t b2RlIHsKIAlzdHJ1Y3QgaW14MjU4X3JlZ19saXN0IHJlZ19saXN0OwogfTsKIAotLyogNDIwOHgz MTE4IG5lZWRzIDEyNjdNYnBzL2xhbmUsIDQgbGFuZXMgKi8KKy8qIDQyMDh4MzEyMCBuZWVkcyAx MjY3TWJwcy9sYW5lLCA0IGxhbmVzICovCiBzdGF0aWMgY29uc3Qgc3RydWN0IGlteDI1OF9yZWcg bWlwaV9kYXRhX3JhdGVfMTI2N21icHNbXSA9IHsKIAl7IDB4MDMwMSwgMHgwNSB9LAogCXsgMHgw MzAzLCAweDAyIH0sCkBAIC0xNDgsNyArMTQ4LDcgQEAgc3RhdGljIGNvbnN0IHN0cnVjdCBpbXgy NThfcmVnIG1pcGlfZGF0YV9yYXRlXzY0MG1icHNbXSA9IHsKIAl7IDB4MDgyMywgMHgwMCB9LAog fTsKIAotc3RhdGljIGNvbnN0IHN0cnVjdCBpbXgyNThfcmVnIG1vZGVfNDIwOHgzMTE4X3JlZ3Nb XSA9IHsKK3N0YXRpYyBjb25zdCBzdHJ1Y3QgaW14MjU4X3JlZyBtb2RlXzQyMDh4MzEyMF9yZWdz W10gPSB7CiAJeyAweDAxMzYsIDB4MTMgfSwKIAl7IDB4MDEzNywgMHgzMyB9LAogCXsgMHgzMDUx LCAweDAwIH0sCkBAIC0yMTAsNyArMjEwLDcgQEAgc3RhdGljIGNvbnN0IHN0cnVjdCBpbXgyNThf cmVnIG1vZGVfNDIwOHgzMTE4X3JlZ3NbXSA9IHsKIAl7IDB4MDM0OCwgMHgxMCB9LAogCXsgMHgw MzQ5LCAweDZGIH0sCiAJeyAweDAzNEEsIDB4MEMgfSwKLQl7IDB4MDM0QiwgMHgyRSB9LAorCXsg MHgwMzRCLCAweDJGIH0sCiAJeyAweDAzODEsIDB4MDEgfSwKIAl7IDB4MDM4MywgMHgwMSB9LAog CXsgMHgwMzg1LCAweDAxIH0sCkBAIC0zMjksNyArMzI5LDcgQEAgc3RhdGljIGNvbnN0IHN0cnVj dCBpbXgyNThfcmVnIG1vZGVfMjEwNF8xNTYwX3JlZ3NbXSA9IHsKIAl7IDB4MDM0OCwgMHgxMCB9 LAogCXsgMHgwMzQ5LCAweDZGIH0sCiAJeyAweDAzNEEsIDB4MEMgfSwKLQl7IDB4MDM0QiwgMHgy RSB9LAorCXsgMHgwMzRCLCAweDJGIH0sCiAJeyAweDAzODEsIDB4MDEgfSwKIAl7IDB4MDM4Mywg MHgwMSB9LAogCXsgMHgwMzg1LCAweDAxIH0sCkBAIC00NDgsNyArNDQ4LDcgQEAgc3RhdGljIGNv bnN0IHN0cnVjdCBpbXgyNThfcmVnIG1vZGVfMTA0OF83ODBfcmVnc1tdID0gewogCXsgMHgwMzQ4 LCAweDEwIH0sCiAJeyAweDAzNDksIDB4NkYgfSwKIAl7IDB4MDM0QSwgMHgwQyB9LAotCXsgMHgw MzRCLCAweDJFIH0sCisJeyAweDAzNEIsIDB4MkYgfSwKIAl7IDB4MDM4MSwgMHgwMSB9LAogCXsg MHgwMzgzLCAweDAxIH0sCiAJeyAweDAzODUsIDB4MDEgfSwKQEAgLTU2MiwxMiArNTYyLDEyIEBA IHN0YXRpYyBjb25zdCBzdHJ1Y3QgaW14MjU4X2xpbmtfZnJlcV9jb25maWcgbGlua19mcmVxX2Nv bmZpZ3NbXSA9IHsKIHN0YXRpYyBjb25zdCBzdHJ1Y3QgaW14MjU4X21vZGUgc3VwcG9ydGVkX21v ZGVzW10gPSB7CiAJewogCQkud2lkdGggPSA0MjA4LAotCQkuaGVpZ2h0ID0gMzExOCwKKwkJLmhl aWdodCA9IDMxMjAsCiAJCS52dHNfZGVmID0gSU1YMjU4X1ZUU18zMEZQUywKIAkJLnZ0c19taW4g PSBJTVgyNThfVlRTXzMwRlBTLAogCQkucmVnX2xpc3QgPSB7Ci0JCQkubnVtX29mX3JlZ3MgPSBB UlJBWV9TSVpFKG1vZGVfNDIwOHgzMTE4X3JlZ3MpLAotCQkJLnJlZ3MgPSBtb2RlXzQyMDh4MzEx OF9yZWdzLAorCQkJLm51bV9vZl9yZWdzID0gQVJSQVlfU0laRShtb2RlXzQyMDh4MzEyMF9yZWdz KSwKKwkJCS5yZWdzID0gbW9kZV80MjA4eDMxMjBfcmVncywKIAkJfSwKIAkJLmxpbmtfZnJlcV9p bmRleCA9IElNWDI1OF9MSU5LX0ZSRVFfMTI2N01CUFMsCiAJfSwKQEAgLTcwNyw3ICs3MDcsNyBA QCBzdGF0aWMgaW50IGlteDI1OF9vcGVuKHN0cnVjdCB2NGwyX3N1YmRldiAqc2QsIHN0cnVjdCB2 NGwyX3N1YmRldl9maCAqZmgpCiAJLyogSW5pdGlhbGl6ZSB0cnlfZm10ICovCiAJdHJ5X2ZtdC0+ d2lkdGggPSBzdXBwb3J0ZWRfbW9kZXNbMF0ud2lkdGg7CiAJdHJ5X2ZtdC0+aGVpZ2h0ID0gc3Vw cG9ydGVkX21vZGVzWzBdLmhlaWdodDsKLQl0cnlfZm10LT5jb2RlID0gTUVESUFfQlVTX0ZNVF9T R1JCRzEwXzFYMTA7CisJdHJ5X2ZtdC0+Y29kZSA9IE1FRElBX0JVU19GTVRfU0JHR1IxMF8xWDEw OwogCXRyeV9mbXQtPmZpZWxkID0gVjRMMl9GSUVMRF9OT05FOwogCiAJcmV0dXJuIDA7CkBAIC04 MTksNyArODE5LDcgQEAgc3RhdGljIGludCBpbXgyNThfZW51bV9tYnVzX2NvZGUoc3RydWN0IHY0 bDJfc3ViZGV2ICpzZCwKIAlpZiAoY29kZS0+aW5kZXggPiAwKQogCQlyZXR1cm4gLUVJTlZBTDsK IAotCWNvZGUtPmNvZGUgPSBNRURJQV9CVVNfRk1UX1NHUkJHMTBfMVgxMDsKKwljb2RlLT5jb2Rl ID0gTUVESUFfQlVTX0ZNVF9TQkdHUjEwXzFYMTA7CiAKIAlyZXR1cm4gMDsKIH0KQEAgLTgzMSw3 ICs4MzEsNyBAQCBzdGF0aWMgaW50IGlteDI1OF9lbnVtX2ZyYW1lX3NpemUoc3RydWN0IHY0bDJf c3ViZGV2ICpzZCwKIAlpZiAoZnNlLT5pbmRleCA+PSBBUlJBWV9TSVpFKHN1cHBvcnRlZF9tb2Rl cykpCiAJCXJldHVybiAtRUlOVkFMOwogCi0JaWYgKGZzZS0+Y29kZSAhPSBNRURJQV9CVVNfRk1U X1NHUkJHMTBfMVgxMCkKKwlpZiAoZnNlLT5jb2RlICE9IE1FRElBX0JVU19GTVRfU0JHR1IxMF8x WDEwKQogCQlyZXR1cm4gLUVJTlZBTDsKIAogCWZzZS0+bWluX3dpZHRoID0gc3VwcG9ydGVkX21v ZGVzW2ZzZS0+aW5kZXhdLndpZHRoOwpAQCAtODQ3LDcgKzg0Nyw3IEBAIHN0YXRpYyB2b2lkIGlt eDI1OF91cGRhdGVfcGFkX2Zvcm1hdChjb25zdCBzdHJ1Y3QgaW14MjU4X21vZGUgKm1vZGUsCiB7 CiAJZm10LT5mb3JtYXQud2lkdGggPSBtb2RlLT53aWR0aDsKIAlmbXQtPmZvcm1hdC5oZWlnaHQg PSBtb2RlLT5oZWlnaHQ7Ci0JZm10LT5mb3JtYXQuY29kZSA9IE1FRElBX0JVU19GTVRfU0dSQkcx MF8xWDEwOworCWZtdC0+Zm9ybWF0LmNvZGUgPSBNRURJQV9CVVNfRk1UX1NCR0dSMTBfMVgxMDsK IAlmbXQtPmZvcm1hdC5maWVsZCA9IFY0TDJfRklFTERfTk9ORTsKIH0KIApAQCAtODk0LDcgKzg5 NCw3IEBAIHN0YXRpYyBpbnQgaW14MjU4X3NldF9wYWRfZm9ybWF0KHN0cnVjdCB2NGwyX3N1YmRl diAqc2QsCiAJbXV0ZXhfbG9jaygmaW14MjU4LT5tdXRleCk7CiAKIAkvKiBPbmx5IG9uZSByYXcg YmF5ZXIoR0JSRykgb3JkZXIgaXMgc3VwcG9ydGVkICovCi0JZm10LT5mb3JtYXQuY29kZSA9IE1F RElBX0JVU19GTVRfU0dSQkcxMF8xWDEwOworCWZtdC0+Zm9ybWF0LmNvZGUgPSBNRURJQV9CVVNf Rk1UX1NCR0dSMTBfMVgxMDsKIAogCW1vZGUgPSB2NGwyX2ZpbmRfbmVhcmVzdF9zaXplKHN1cHBv cnRlZF9tb2RlcywKIAkJQVJSQVlfU0laRShzdXBwb3J0ZWRfbW9kZXMpLCB3aWR0aCwgaGVpZ2h0 LAotLSAKMi40Mi4wCgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX18KbGludXgtYXJtLWtlcm5lbCBtYWlsaW5nIGxpc3QKbGludXgtYXJtLWtlcm5lbEBsaXN0 cy5pbmZyYWRlYWQub3JnCmh0dHA6Ly9saXN0cy5pbmZyYWRlYWQub3JnL21haWxtYW4vbGlzdGlu Zm8vbGludXgtYXJtLWtlcm5lbAo=