From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-108-mta88.mxroute.com (mail-108-mta88.mxroute.com [136.175.108.88]) (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 60B8F137753 for ; Sun, 14 Apr 2024 20:40:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=136.175.108.88 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713127233; cv=none; b=clcFC+qHfYI0GiO8pSDQytKcp2xU4fw+Ij/ueL6rUx2emjcdPHTSgdFIuRtFoOGdB8OgtVvRCfGggQXuOse/dQwxRZViOsQlDJ7/DWYBCw8C/4H2dDoZb3zhPzx5puMmSAAgdt82EARY7p1JOFIRYBkHhW2wulwpLWyOg+BpJmg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713127233; c=relaxed/simple; bh=8VdBRsDDSp5wkUn0ulACN2P9epAxMpmNx+w+XhJIpks=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=KDTONHYVsg44ZLxbKNtT604JsXVWgePLw9q0JmFXVXAwqOCdXumJPh0ANsZnhSaqn2n4v1hCBlSIcvC9OryXjHXcDB+Nc5SepqjYkCl6MoDXszEITFYHFZB6FQcmWVjkBdu6NB6MItRmdnkiHXcCk15TxCNckpT467seAMv6NWE= 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=IgQcXNWN; arc=none smtp.client-ip=136.175.108.88 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="IgQcXNWN" Received: from filter006.mxroute.com ([136.175.111.2] filter006.mxroute.com) (Authenticated sender: mN4UYu2MZsgR) by mail-108-mta88.mxroute.com (ZoneMTA) with ESMTPSA id 18ede523e200003bea.00a for (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384); Sun, 14 Apr 2024 20:35:15 +0000 X-Zone-Loop: d25d1a1dad8511cbb44cc2ed8f9eacb94f2cdfa977ef 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=IrtZw3b4fhqGfwqS79xHpjO252TynNZZi9NyZ5yPxfc=; b=IgQcXNWN7rz0/BNnEus978s7eV 0nMnsrfMnwNd8ubMnxUb2fwtESqFtpc1IPwL05kHAdBcOYLgiOSokXcGYtT7JMnzQFfmGQq1kJATQ Xni6Cej3SdKdZza2MCQoU+PlGZDnz34nfjz33B6+sFDuiZVL82mL6DUj0icXZHCH7HkEmil4sEB4G yAVjJdiuom+yBHuYhDCNC0hHluaP30nReJG5PqxR4egWuNzQtxlyEQtPveUda2FGHe4WI7tTQwXD7 ysPt7N40mrhbKa2vyCgexg7dELrHUJVlARQO+BouwGZVaGvDyA5rCjyNODbyHCW4B3eBOwzX6OlKd zEKR3rRA==; 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, pavel@ucw.cz, phone-devel@vger.kernel.org, Luis Garcia Subject: [PATCH v4 02/25] media: i2c: imx258: Make image geometry meet sensor requirements Date: Sun, 14 Apr 2024 14:34:40 -0600 Message-ID: <20240414203503.18402-3-git@luigi311.com> In-Reply-To: <20240414203503.18402-1-git@luigi311.com> References: <20240414203503.18402-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 Signed-off-by: Luis Garcia Reviewed-by: Pavel Machek --- 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.44.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 9755BC4345F for ; Sun, 14 Apr 2024 20:35:49 +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=+Wqbc9cMPZrKbON9EKdvB5q3joK6SJoH1xtLu+/fQBM=; b=3qJQOpVZ60c5eq i0x9ThOz6Z8kuoht2Tku9j/5Nbqdwc6gfZYkfD6uKH8eUkpavXRYdD7VhZzwBSjMEBwVqeb6asenj 1YVUdzkCCOFcxj4CJ2qyUOQnP9q99fLr/31OI+gSAhE6oUEhBRL1bVbnM92gmKl9UAXs57+3J6K5t NptLhSdxT399rO6YKJUQd9dJ+v6nGMmgoMoRA3tVZbu2myoB8L1aMiEjHo7Y2++H7B3D2fHUoEW8m yptuLBDDmG2LDxmUb9uENIqjJ44SqmHpActenizaMJflyt4o5E6p9bPiFsQBT3V8qgI0JDLVOs/hh ikIhesCO0ASXPiV5rj3g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rw6ZP-00000006JHa-1NzD; Sun, 14 Apr 2024 20:35:23 +0000 Received: from mail-108-mta78.mxroute.com ([136.175.108.78]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rw6ZL-00000006JGf-1y0U for linux-arm-kernel@lists.infradead.org; Sun, 14 Apr 2024 20:35:21 +0000 Received: from filter006.mxroute.com ([136.175.111.2] filter006.mxroute.com) (Authenticated sender: mN4UYu2MZsgR) by mail-108-mta78.mxroute.com (ZoneMTA) with ESMTPSA id 18ede523e200003bea.009 for (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384); Sun, 14 Apr 2024 20:35:15 +0000 X-Zone-Loop: f5dcc2b322f9d4c17f20e83731bf6af9134376f184f4 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=IrtZw3b4fhqGfwqS79xHpjO252TynNZZi9NyZ5yPxfc=; b=IgQcXNWN7rz0/BNnEus978s7eV 0nMnsrfMnwNd8ubMnxUb2fwtESqFtpc1IPwL05kHAdBcOYLgiOSokXcGYtT7JMnzQFfmGQq1kJATQ Xni6Cej3SdKdZza2MCQoU+PlGZDnz34nfjz33B6+sFDuiZVL82mL6DUj0icXZHCH7HkEmil4sEB4G yAVjJdiuom+yBHuYhDCNC0hHluaP30nReJG5PqxR4egWuNzQtxlyEQtPveUda2FGHe4WI7tTQwXD7 ysPt7N40mrhbKa2vyCgexg7dELrHUJVlARQO+BouwGZVaGvDyA5rCjyNODbyHCW4B3eBOwzX6OlKd zEKR3rRA==; 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, pavel@ucw.cz, phone-devel@vger.kernel.org, Luis Garcia Subject: [PATCH v4 02/25] media: i2c: imx258: Make image geometry meet sensor requirements Date: Sun, 14 Apr 2024 14:34:40 -0600 Message-ID: <20240414203503.18402-3-git@luigi311.com> In-Reply-To: <20240414203503.18402-1-git@luigi311.com> References: <20240414203503.18402-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-20240414_133519_701690_8A4ED557 X-CRM114-Status: GOOD ( 18.14 ) 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+ClNpZ25lZC1vZmYtYnk6IEx1aXMgR2FyY2lhIDxnaXRAbHVpZ2kzMTEu Y29tPgpSZXZpZXdlZC1ieTogUGF2ZWwgTWFjaGVrIDxwYXZlbEB1Y3cuY3o+Ci0tLQogZHJpdmVy cy9tZWRpYS9pMmMvaW14MjU4LmMgfCAyNiArKysrKysrKysrKysrLS0tLS0tLS0tLS0tLQogMSBm aWxlIGNoYW5nZWQsIDEzIGluc2VydGlvbnMoKyksIDEzIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdp dCBhL2RyaXZlcnMvbWVkaWEvaTJjL2lteDI1OC5jIGIvZHJpdmVycy9tZWRpYS9pMmMvaW14MjU4 LmMKaW5kZXggMmRiYWZkMjFkZDcwLi40YTcwNDhkODM0YzYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv bWVkaWEvaTJjL2lteDI1OC5jCisrKyBiL2RyaXZlcnMvbWVkaWEvaTJjL2lteDI1OC5jCkBAIC0x MTEsNyArMTExLDcgQEAgc3RydWN0IGlteDI1OF9tb2RlIHsKIAlzdHJ1Y3QgaW14MjU4X3JlZ19s aXN0IHJlZ19saXN0OwogfTsKIAotLyogNDIwOHgzMTE4IG5lZWRzIDEyNjdNYnBzL2xhbmUsIDQg bGFuZXMgKi8KKy8qIDQyMDh4MzEyMCBuZWVkcyAxMjY3TWJwcy9sYW5lLCA0IGxhbmVzICovCiBz dGF0aWMgY29uc3Qgc3RydWN0IGlteDI1OF9yZWcgbWlwaV9kYXRhX3JhdGVfMTI2N21icHNbXSA9 IHsKIAl7IDB4MDMwMSwgMHgwNSB9LAogCXsgMHgwMzAzLCAweDAyIH0sCkBAIC0xNDgsNyArMTQ4 LDcgQEAgc3RhdGljIGNvbnN0IHN0cnVjdCBpbXgyNThfcmVnIG1pcGlfZGF0YV9yYXRlXzY0MG1i cHNbXSA9IHsKIAl7IDB4MDgyMywgMHgwMCB9LAogfTsKIAotc3RhdGljIGNvbnN0IHN0cnVjdCBp bXgyNThfcmVnIG1vZGVfNDIwOHgzMTE4X3JlZ3NbXSA9IHsKK3N0YXRpYyBjb25zdCBzdHJ1Y3Qg aW14MjU4X3JlZyBtb2RlXzQyMDh4MzEyMF9yZWdzW10gPSB7CiAJeyAweDAxMzYsIDB4MTMgfSwK IAl7IDB4MDEzNywgMHgzMyB9LAogCXsgMHgzMDUxLCAweDAwIH0sCkBAIC0yMTAsNyArMjEwLDcg QEAgc3RhdGljIGNvbnN0IHN0cnVjdCBpbXgyNThfcmVnIG1vZGVfNDIwOHgzMTE4X3JlZ3NbXSA9 IHsKIAl7IDB4MDM0OCwgMHgxMCB9LAogCXsgMHgwMzQ5LCAweDZGIH0sCiAJeyAweDAzNEEsIDB4 MEMgfSwKLQl7IDB4MDM0QiwgMHgyRSB9LAorCXsgMHgwMzRCLCAweDJGIH0sCiAJeyAweDAzODEs IDB4MDEgfSwKIAl7IDB4MDM4MywgMHgwMSB9LAogCXsgMHgwMzg1LCAweDAxIH0sCkBAIC0zMjks NyArMzI5LDcgQEAgc3RhdGljIGNvbnN0IHN0cnVjdCBpbXgyNThfcmVnIG1vZGVfMjEwNF8xNTYw X3JlZ3NbXSA9IHsKIAl7IDB4MDM0OCwgMHgxMCB9LAogCXsgMHgwMzQ5LCAweDZGIH0sCiAJeyAw eDAzNEEsIDB4MEMgfSwKLQl7IDB4MDM0QiwgMHgyRSB9LAorCXsgMHgwMzRCLCAweDJGIH0sCiAJ eyAweDAzODEsIDB4MDEgfSwKIAl7IDB4MDM4MywgMHgwMSB9LAogCXsgMHgwMzg1LCAweDAxIH0s CkBAIC00NDgsNyArNDQ4LDcgQEAgc3RhdGljIGNvbnN0IHN0cnVjdCBpbXgyNThfcmVnIG1vZGVf MTA0OF83ODBfcmVnc1tdID0gewogCXsgMHgwMzQ4LCAweDEwIH0sCiAJeyAweDAzNDksIDB4NkYg fSwKIAl7IDB4MDM0QSwgMHgwQyB9LAotCXsgMHgwMzRCLCAweDJFIH0sCisJeyAweDAzNEIsIDB4 MkYgfSwKIAl7IDB4MDM4MSwgMHgwMSB9LAogCXsgMHgwMzgzLCAweDAxIH0sCiAJeyAweDAzODUs IDB4MDEgfSwKQEAgLTU2MiwxMiArNTYyLDEyIEBAIHN0YXRpYyBjb25zdCBzdHJ1Y3QgaW14MjU4 X2xpbmtfZnJlcV9jb25maWcgbGlua19mcmVxX2NvbmZpZ3NbXSA9IHsKIHN0YXRpYyBjb25zdCBz dHJ1Y3QgaW14MjU4X21vZGUgc3VwcG9ydGVkX21vZGVzW10gPSB7CiAJewogCQkud2lkdGggPSA0 MjA4LAotCQkuaGVpZ2h0ID0gMzExOCwKKwkJLmhlaWdodCA9IDMxMjAsCiAJCS52dHNfZGVmID0g SU1YMjU4X1ZUU18zMEZQUywKIAkJLnZ0c19taW4gPSBJTVgyNThfVlRTXzMwRlBTLAogCQkucmVn X2xpc3QgPSB7Ci0JCQkubnVtX29mX3JlZ3MgPSBBUlJBWV9TSVpFKG1vZGVfNDIwOHgzMTE4X3Jl Z3MpLAotCQkJLnJlZ3MgPSBtb2RlXzQyMDh4MzExOF9yZWdzLAorCQkJLm51bV9vZl9yZWdzID0g QVJSQVlfU0laRShtb2RlXzQyMDh4MzEyMF9yZWdzKSwKKwkJCS5yZWdzID0gbW9kZV80MjA4eDMx MjBfcmVncywKIAkJfSwKIAkJLmxpbmtfZnJlcV9pbmRleCA9IElNWDI1OF9MSU5LX0ZSRVFfMTI2 N01CUFMsCiAJfSwKQEAgLTcwNyw3ICs3MDcsNyBAQCBzdGF0aWMgaW50IGlteDI1OF9vcGVuKHN0 cnVjdCB2NGwyX3N1YmRldiAqc2QsIHN0cnVjdCB2NGwyX3N1YmRldl9maCAqZmgpCiAJLyogSW5p dGlhbGl6ZSB0cnlfZm10ICovCiAJdHJ5X2ZtdC0+d2lkdGggPSBzdXBwb3J0ZWRfbW9kZXNbMF0u d2lkdGg7CiAJdHJ5X2ZtdC0+aGVpZ2h0ID0gc3VwcG9ydGVkX21vZGVzWzBdLmhlaWdodDsKLQl0 cnlfZm10LT5jb2RlID0gTUVESUFfQlVTX0ZNVF9TR1JCRzEwXzFYMTA7CisJdHJ5X2ZtdC0+Y29k ZSA9IE1FRElBX0JVU19GTVRfU0JHR1IxMF8xWDEwOwogCXRyeV9mbXQtPmZpZWxkID0gVjRMMl9G SUVMRF9OT05FOwogCiAJcmV0dXJuIDA7CkBAIC04MTksNyArODE5LDcgQEAgc3RhdGljIGludCBp bXgyNThfZW51bV9tYnVzX2NvZGUoc3RydWN0IHY0bDJfc3ViZGV2ICpzZCwKIAlpZiAoY29kZS0+ aW5kZXggPiAwKQogCQlyZXR1cm4gLUVJTlZBTDsKIAotCWNvZGUtPmNvZGUgPSBNRURJQV9CVVNf Rk1UX1NHUkJHMTBfMVgxMDsKKwljb2RlLT5jb2RlID0gTUVESUFfQlVTX0ZNVF9TQkdHUjEwXzFY MTA7CiAKIAlyZXR1cm4gMDsKIH0KQEAgLTgzMSw3ICs4MzEsNyBAQCBzdGF0aWMgaW50IGlteDI1 OF9lbnVtX2ZyYW1lX3NpemUoc3RydWN0IHY0bDJfc3ViZGV2ICpzZCwKIAlpZiAoZnNlLT5pbmRl eCA+PSBBUlJBWV9TSVpFKHN1cHBvcnRlZF9tb2RlcykpCiAJCXJldHVybiAtRUlOVkFMOwogCi0J aWYgKGZzZS0+Y29kZSAhPSBNRURJQV9CVVNfRk1UX1NHUkJHMTBfMVgxMCkKKwlpZiAoZnNlLT5j b2RlICE9IE1FRElBX0JVU19GTVRfU0JHR1IxMF8xWDEwKQogCQlyZXR1cm4gLUVJTlZBTDsKIAog CWZzZS0+bWluX3dpZHRoID0gc3VwcG9ydGVkX21vZGVzW2ZzZS0+aW5kZXhdLndpZHRoOwpAQCAt ODQ3LDcgKzg0Nyw3IEBAIHN0YXRpYyB2b2lkIGlteDI1OF91cGRhdGVfcGFkX2Zvcm1hdChjb25z dCBzdHJ1Y3QgaW14MjU4X21vZGUgKm1vZGUsCiB7CiAJZm10LT5mb3JtYXQud2lkdGggPSBtb2Rl LT53aWR0aDsKIAlmbXQtPmZvcm1hdC5oZWlnaHQgPSBtb2RlLT5oZWlnaHQ7Ci0JZm10LT5mb3Jt YXQuY29kZSA9IE1FRElBX0JVU19GTVRfU0dSQkcxMF8xWDEwOworCWZtdC0+Zm9ybWF0LmNvZGUg PSBNRURJQV9CVVNfRk1UX1NCR0dSMTBfMVgxMDsKIAlmbXQtPmZvcm1hdC5maWVsZCA9IFY0TDJf RklFTERfTk9ORTsKIH0KIApAQCAtODk0LDcgKzg5NCw3IEBAIHN0YXRpYyBpbnQgaW14MjU4X3Nl dF9wYWRfZm9ybWF0KHN0cnVjdCB2NGwyX3N1YmRldiAqc2QsCiAJbXV0ZXhfbG9jaygmaW14MjU4 LT5tdXRleCk7CiAKIAkvKiBPbmx5IG9uZSByYXcgYmF5ZXIoR0JSRykgb3JkZXIgaXMgc3VwcG9y dGVkICovCi0JZm10LT5mb3JtYXQuY29kZSA9IE1FRElBX0JVU19GTVRfU0dSQkcxMF8xWDEwOwor CWZtdC0+Zm9ybWF0LmNvZGUgPSBNRURJQV9CVVNfRk1UX1NCR0dSMTBfMVgxMDsKIAogCW1vZGUg PSB2NGwyX2ZpbmRfbmVhcmVzdF9zaXplKHN1cHBvcnRlZF9tb2RlcywKIAkJQVJSQVlfU0laRShz dXBwb3J0ZWRfbW9kZXMpLCB3aWR0aCwgaGVpZ2h0LAotLSAKMi40NC4wCgoKX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KbGludXgtYXJtLWtlcm5lbCBtYWls aW5nIGxpc3QKbGludXgtYXJtLWtlcm5lbEBsaXN0cy5pbmZyYWRlYWQub3JnCmh0dHA6Ly9saXN0 cy5pbmZyYWRlYWQub3JnL21haWxtYW4vbGlzdGluZm8vbGludXgtYXJtLWtlcm5lbAo=