From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-108-mta64.mxroute.com (mail-108-mta64.mxroute.com [136.175.108.64]) (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 A11DA14BF86 for ; Wed, 3 Apr 2024 15:07:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=136.175.108.64 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712156855; cv=none; b=aEtXmkNwW9XcRfZvYOCCU/bx4OyAqeaf8Btg3L/lUxgXhyV2jzJd6WDlCx+p0ELcSGWrdvSyKTPy7H52CsCfSO7ZtWBysvsjGqihxNB8XvtxtmDhjKNGc2CvTustdobhcQzX6sV4DbCfu0QAV0GgX0TU6LGqZY5TVfY1slQSsZU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712156855; c=relaxed/simple; bh=p/2CjxpgGSHmngntZ4G3Mf8HbIeSWUTf08sZ3fpDyaQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=KDCzsafnDPeuVCnzUb4VG2V7zMp4APkN084zLQxPb7BY6w95nG9dI6aGufRtyMTe47mjzxFdw5/Bi/v8XpsGNsy+hOB1YGw0oWoND6Imarg0oXmSLzv5vlurMt+osD7YoRf9PvPbNYJjYGOx8rm+6YD/Dyfd7PYJxJW9Ouj2RQ8= 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=nriGqUvR; arc=none smtp.client-ip=136.175.108.64 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="nriGqUvR" Received: from filter006.mxroute.com ([136.175.111.2] filter006.mxroute.com) (Authenticated sender: mN4UYu2MZsgR) by mail-108-mta64.mxroute.com (ZoneMTA) with ESMTPSA id 18ea48019f50003bea.00a for (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384); Wed, 03 Apr 2024 15:07:22 +0000 X-Zone-Loop: 1c39636713d76ce7129cd6642a8d87ca255f71fe3152 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=oq7lZ8HrTywGSq7kzULa57nC/5tfOLJ5od2jKoW3WyA=; b=nriGqUvR9LYv5q30AgYiAgjDt6 WBe4xF4oMnA5j02acCzFf1Le0JHnN9VAhVAeB5vZ66+yvz5Nm3jQAXwk7M1PjWv8O4dL2L6U3ELiG xr5y312IO1ET62knHT9jiLnJf4Gyfi6vG/LiwXXzd6rBz+agfsGed6GJfMMdC+nBRiQG2qPkuPUgg YFIsH3XOy3852hlPvXB9j8GoVuM/k90SmvMwPLY7dRWNr/m/wuqk7HU8/wHhfHHZrQVscL+8L0gv2 uKLtnSltZoBt8O0mS+VIl9tIoo+4+52gSxYPrgq086cvik/gqh7VpsJSPs7DN1M/jSl5jY881m0cR 4+v0Er4Q==; 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 v3 02/25] media: i2c: imx258: Make image geometry meet sensor requirements Date: Wed, 3 Apr 2024 09:03:31 -0600 Message-ID: <20240403150355.189229-3-git@luigi311.com> In-Reply-To: <20240403150355.189229-1-git@luigi311.com> References: <20240403150355.189229-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 --- 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 E50D1CD1288 for ; Wed, 3 Apr 2024 16:19:29 +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=V4/kkgC63WD+9BKJGfa/Y6vcLkCXcJDrsW5VgpLt6FM=; b=sN4hxNQ+mZaaGZ vhLuQXpEQk8xcGc6BxbiOPtJd8JgKdsOo1R8Echhnff3Cylpw1fwwrbdbNG/KqGDUZ8aeB7OXbZ+h Mf8C16DsFnBLe1pxDc3XcutgBh/ygdUt+xg7cHV+2uXDS2ksddQudVSu/JZpFoFyygI7d/1uTeON8 j5DvMRFfM8UyS0JnHGKztikeQrkLp5ZvLSUwkODwH2BBwac0+mMjj8GyJJlMKI8bEJuRDUPvfNp0y AGWT1jQSbq0ARhqQxf9lIgiKQuo6S7da6rf99/IaYHOf3FiatVS/+AGy9LFqxhfsuQewAnksh0SYE aiTueDxxS8ZtxJqoPuhQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rs3KZ-0000000GvkT-1ybP; Wed, 03 Apr 2024 16:19:19 +0000 Received: from mail-108-mta102.mxroute.com ([136.175.108.102]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rs2D9-0000000GcrC-0Fhe for linux-arm-kernel@lists.infradead.org; Wed, 03 Apr 2024 15:07:36 +0000 Received: from filter006.mxroute.com ([136.175.111.2] filter006.mxroute.com) (Authenticated sender: mN4UYu2MZsgR) by mail-108-mta102.mxroute.com (ZoneMTA) with ESMTPSA id 18ea48019f50003bea.009 for (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384); Wed, 03 Apr 2024 15:07:22 +0000 X-Zone-Loop: ffae8bb680c613794745997b18b026e49b375ea93b48 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=oq7lZ8HrTywGSq7kzULa57nC/5tfOLJ5od2jKoW3WyA=; b=nriGqUvR9LYv5q30AgYiAgjDt6 WBe4xF4oMnA5j02acCzFf1Le0JHnN9VAhVAeB5vZ66+yvz5Nm3jQAXwk7M1PjWv8O4dL2L6U3ELiG xr5y312IO1ET62knHT9jiLnJf4Gyfi6vG/LiwXXzd6rBz+agfsGed6GJfMMdC+nBRiQG2qPkuPUgg YFIsH3XOy3852hlPvXB9j8GoVuM/k90SmvMwPLY7dRWNr/m/wuqk7HU8/wHhfHHZrQVscL+8L0gv2 uKLtnSltZoBt8O0mS+VIl9tIoo+4+52gSxYPrgq086cvik/gqh7VpsJSPs7DN1M/jSl5jY881m0cR 4+v0Er4Q==; 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 v3 02/25] media: i2c: imx258: Make image geometry meet sensor requirements Date: Wed, 3 Apr 2024 09:03:31 -0600 Message-ID: <20240403150355.189229-3-git@luigi311.com> In-Reply-To: <20240403150355.189229-1-git@luigi311.com> References: <20240403150355.189229-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-20240403_080735_274860_228A7A17 X-CRM114-Status: GOOD ( 18.53 ) 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 Y29tPgotLS0KIGRyaXZlcnMvbWVkaWEvaTJjL2lteDI1OC5jIHwgMjYgKysrKysrKysrKysrKy0t LS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAxMyBpbnNlcnRpb25zKCspLCAxMyBkZWxldGlv bnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL21lZGlhL2kyYy9pbXgyNTguYyBiL2RyaXZlcnMv bWVkaWEvaTJjL2lteDI1OC5jCmluZGV4IDJkYmFmZDIxZGQ3MC4uNGE3MDQ4ZDgzNGM2IDEwMDY0 NAotLS0gYS9kcml2ZXJzL21lZGlhL2kyYy9pbXgyNTguYworKysgYi9kcml2ZXJzL21lZGlhL2ky Yy9pbXgyNTguYwpAQCAtMTExLDcgKzExMSw3IEBAIHN0cnVjdCBpbXgyNThfbW9kZSB7CiAJc3Ry dWN0IGlteDI1OF9yZWdfbGlzdCByZWdfbGlzdDsKIH07CiAKLS8qIDQyMDh4MzExOCBuZWVkcyAx MjY3TWJwcy9sYW5lLCA0IGxhbmVzICovCisvKiA0MjA4eDMxMjAgbmVlZHMgMTI2N01icHMvbGFu ZSwgNCBsYW5lcyAqLwogc3RhdGljIGNvbnN0IHN0cnVjdCBpbXgyNThfcmVnIG1pcGlfZGF0YV9y YXRlXzEyNjdtYnBzW10gPSB7CiAJeyAweDAzMDEsIDB4MDUgfSwKIAl7IDB4MDMwMywgMHgwMiB9 LApAQCAtMTQ4LDcgKzE0OCw3IEBAIHN0YXRpYyBjb25zdCBzdHJ1Y3QgaW14MjU4X3JlZyBtaXBp X2RhdGFfcmF0ZV82NDBtYnBzW10gPSB7CiAJeyAweDA4MjMsIDB4MDAgfSwKIH07CiAKLXN0YXRp YyBjb25zdCBzdHJ1Y3QgaW14MjU4X3JlZyBtb2RlXzQyMDh4MzExOF9yZWdzW10gPSB7CitzdGF0 aWMgY29uc3Qgc3RydWN0IGlteDI1OF9yZWcgbW9kZV80MjA4eDMxMjBfcmVnc1tdID0gewogCXsg MHgwMTM2LCAweDEzIH0sCiAJeyAweDAxMzcsIDB4MzMgfSwKIAl7IDB4MzA1MSwgMHgwMCB9LApA QCAtMjEwLDcgKzIxMCw3IEBAIHN0YXRpYyBjb25zdCBzdHJ1Y3QgaW14MjU4X3JlZyBtb2RlXzQy MDh4MzExOF9yZWdzW10gPSB7CiAJeyAweDAzNDgsIDB4MTAgfSwKIAl7IDB4MDM0OSwgMHg2RiB9 LAogCXsgMHgwMzRBLCAweDBDIH0sCi0JeyAweDAzNEIsIDB4MkUgfSwKKwl7IDB4MDM0QiwgMHgy RiB9LAogCXsgMHgwMzgxLCAweDAxIH0sCiAJeyAweDAzODMsIDB4MDEgfSwKIAl7IDB4MDM4NSwg MHgwMSB9LApAQCAtMzI5LDcgKzMyOSw3IEBAIHN0YXRpYyBjb25zdCBzdHJ1Y3QgaW14MjU4X3Jl ZyBtb2RlXzIxMDRfMTU2MF9yZWdzW10gPSB7CiAJeyAweDAzNDgsIDB4MTAgfSwKIAl7IDB4MDM0 OSwgMHg2RiB9LAogCXsgMHgwMzRBLCAweDBDIH0sCi0JeyAweDAzNEIsIDB4MkUgfSwKKwl7IDB4 MDM0QiwgMHgyRiB9LAogCXsgMHgwMzgxLCAweDAxIH0sCiAJeyAweDAzODMsIDB4MDEgfSwKIAl7 IDB4MDM4NSwgMHgwMSB9LApAQCAtNDQ4LDcgKzQ0OCw3IEBAIHN0YXRpYyBjb25zdCBzdHJ1Y3Qg aW14MjU4X3JlZyBtb2RlXzEwNDhfNzgwX3JlZ3NbXSA9IHsKIAl7IDB4MDM0OCwgMHgxMCB9LAog CXsgMHgwMzQ5LCAweDZGIH0sCiAJeyAweDAzNEEsIDB4MEMgfSwKLQl7IDB4MDM0QiwgMHgyRSB9 LAorCXsgMHgwMzRCLCAweDJGIH0sCiAJeyAweDAzODEsIDB4MDEgfSwKIAl7IDB4MDM4MywgMHgw MSB9LAogCXsgMHgwMzg1LCAweDAxIH0sCkBAIC01NjIsMTIgKzU2MiwxMiBAQCBzdGF0aWMgY29u c3Qgc3RydWN0IGlteDI1OF9saW5rX2ZyZXFfY29uZmlnIGxpbmtfZnJlcV9jb25maWdzW10gPSB7 CiBzdGF0aWMgY29uc3Qgc3RydWN0IGlteDI1OF9tb2RlIHN1cHBvcnRlZF9tb2Rlc1tdID0gewog CXsKIAkJLndpZHRoID0gNDIwOCwKLQkJLmhlaWdodCA9IDMxMTgsCisJCS5oZWlnaHQgPSAzMTIw LAogCQkudnRzX2RlZiA9IElNWDI1OF9WVFNfMzBGUFMsCiAJCS52dHNfbWluID0gSU1YMjU4X1ZU U18zMEZQUywKIAkJLnJlZ19saXN0ID0gewotCQkJLm51bV9vZl9yZWdzID0gQVJSQVlfU0laRSht b2RlXzQyMDh4MzExOF9yZWdzKSwKLQkJCS5yZWdzID0gbW9kZV80MjA4eDMxMThfcmVncywKKwkJ CS5udW1fb2ZfcmVncyA9IEFSUkFZX1NJWkUobW9kZV80MjA4eDMxMjBfcmVncyksCisJCQkucmVn cyA9IG1vZGVfNDIwOHgzMTIwX3JlZ3MsCiAJCX0sCiAJCS5saW5rX2ZyZXFfaW5kZXggPSBJTVgy NThfTElOS19GUkVRXzEyNjdNQlBTLAogCX0sCkBAIC03MDcsNyArNzA3LDcgQEAgc3RhdGljIGlu dCBpbXgyNThfb3BlbihzdHJ1Y3QgdjRsMl9zdWJkZXYgKnNkLCBzdHJ1Y3QgdjRsMl9zdWJkZXZf ZmggKmZoKQogCS8qIEluaXRpYWxpemUgdHJ5X2ZtdCAqLwogCXRyeV9mbXQtPndpZHRoID0gc3Vw cG9ydGVkX21vZGVzWzBdLndpZHRoOwogCXRyeV9mbXQtPmhlaWdodCA9IHN1cHBvcnRlZF9tb2Rl c1swXS5oZWlnaHQ7Ci0JdHJ5X2ZtdC0+Y29kZSA9IE1FRElBX0JVU19GTVRfU0dSQkcxMF8xWDEw OworCXRyeV9mbXQtPmNvZGUgPSBNRURJQV9CVVNfRk1UX1NCR0dSMTBfMVgxMDsKIAl0cnlfZm10 LT5maWVsZCA9IFY0TDJfRklFTERfTk9ORTsKIAogCXJldHVybiAwOwpAQCAtODE5LDcgKzgxOSw3 IEBAIHN0YXRpYyBpbnQgaW14MjU4X2VudW1fbWJ1c19jb2RlKHN0cnVjdCB2NGwyX3N1YmRldiAq c2QsCiAJaWYgKGNvZGUtPmluZGV4ID4gMCkKIAkJcmV0dXJuIC1FSU5WQUw7CiAKLQljb2RlLT5j b2RlID0gTUVESUFfQlVTX0ZNVF9TR1JCRzEwXzFYMTA7CisJY29kZS0+Y29kZSA9IE1FRElBX0JV U19GTVRfU0JHR1IxMF8xWDEwOwogCiAJcmV0dXJuIDA7CiB9CkBAIC04MzEsNyArODMxLDcgQEAg c3RhdGljIGludCBpbXgyNThfZW51bV9mcmFtZV9zaXplKHN0cnVjdCB2NGwyX3N1YmRldiAqc2Qs CiAJaWYgKGZzZS0+aW5kZXggPj0gQVJSQVlfU0laRShzdXBwb3J0ZWRfbW9kZXMpKQogCQlyZXR1 cm4gLUVJTlZBTDsKIAotCWlmIChmc2UtPmNvZGUgIT0gTUVESUFfQlVTX0ZNVF9TR1JCRzEwXzFY MTApCisJaWYgKGZzZS0+Y29kZSAhPSBNRURJQV9CVVNfRk1UX1NCR0dSMTBfMVgxMCkKIAkJcmV0 dXJuIC1FSU5WQUw7CiAKIAlmc2UtPm1pbl93aWR0aCA9IHN1cHBvcnRlZF9tb2Rlc1tmc2UtPmlu ZGV4XS53aWR0aDsKQEAgLTg0Nyw3ICs4NDcsNyBAQCBzdGF0aWMgdm9pZCBpbXgyNThfdXBkYXRl X3BhZF9mb3JtYXQoY29uc3Qgc3RydWN0IGlteDI1OF9tb2RlICptb2RlLAogewogCWZtdC0+Zm9y bWF0LndpZHRoID0gbW9kZS0+d2lkdGg7CiAJZm10LT5mb3JtYXQuaGVpZ2h0ID0gbW9kZS0+aGVp Z2h0OwotCWZtdC0+Zm9ybWF0LmNvZGUgPSBNRURJQV9CVVNfRk1UX1NHUkJHMTBfMVgxMDsKKwlm bXQtPmZvcm1hdC5jb2RlID0gTUVESUFfQlVTX0ZNVF9TQkdHUjEwXzFYMTA7CiAJZm10LT5mb3Jt YXQuZmllbGQgPSBWNEwyX0ZJRUxEX05PTkU7CiB9CiAKQEAgLTg5NCw3ICs4OTQsNyBAQCBzdGF0 aWMgaW50IGlteDI1OF9zZXRfcGFkX2Zvcm1hdChzdHJ1Y3QgdjRsMl9zdWJkZXYgKnNkLAogCW11 dGV4X2xvY2soJmlteDI1OC0+bXV0ZXgpOwogCiAJLyogT25seSBvbmUgcmF3IGJheWVyKEdCUkcp IG9yZGVyIGlzIHN1cHBvcnRlZCAqLwotCWZtdC0+Zm9ybWF0LmNvZGUgPSBNRURJQV9CVVNfRk1U X1NHUkJHMTBfMVgxMDsKKwlmbXQtPmZvcm1hdC5jb2RlID0gTUVESUFfQlVTX0ZNVF9TQkdHUjEw XzFYMTA7CiAKIAltb2RlID0gdjRsMl9maW5kX25lYXJlc3Rfc2l6ZShzdXBwb3J0ZWRfbW9kZXMs CiAJCUFSUkFZX1NJWkUoc3VwcG9ydGVkX21vZGVzKSwgd2lkdGgsIGhlaWdodCwKLS0gCjIuNDIu MAoKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmxpbnV4 LWFybS1rZXJuZWwgbWFpbGluZyBsaXN0CmxpbnV4LWFybS1rZXJuZWxAbGlzdHMuaW5mcmFkZWFk Lm9yZwpodHRwOi8vbGlzdHMuaW5mcmFkZWFkLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2xpbnV4LWFy bS1rZXJuZWwK