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.8 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, 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 D36CDC3B1A1 for ; Fri, 14 Feb 2020 15:49:44 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id AAA1524687 for ; Fri, 14 Feb 2020 15:49:44 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="iJWSuM+3" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AAA1524687 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 499C26F974; Fri, 14 Feb 2020 15:49:44 +0000 (UTC) Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by gabe.freedesktop.org (Postfix) with ESMTPS id 89C9D6F974 for ; Fri, 14 Feb 2020 15:49:42 +0000 (UTC) Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id BC64A2086A; Fri, 14 Feb 2020 15:49:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581695382; bh=GM6SWoSqzW6VjK+HK2Fz5Drs/r7qVg46S6Jp0irKb0g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iJWSuM+3BulvVOc23Y3Xl9xyMNE3aIapePFQnrTFLwTN4h9Y9iJryQCWAGLnYTFDr jYF5sQbIJlp1MbUnVZ//7E/ryOksWIMCXafyNZtv500h5gTPgiFwn8ieRac4O4tSmA Z4U+m91TdkTu29TP99WbTUDgErxPGc/Yqf6UlchE= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH AUTOSEL 5.5 037/542] drm/mipi_dbi: Fix off-by-one bugs in mipi_dbi_blank() Date: Fri, 14 Feb 2020 10:40:29 -0500 Message-Id: <20200214154854.6746-37-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200214154854.6746-1-sashal@kernel.org> References: <20200214154854.6746-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sasha Levin , dri-devel@lists.freedesktop.org, Geert Uytterhoeven Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" RnJvbTogR2VlcnQgVXl0dGVyaG9ldmVuIDxnZWVydCtyZW5lc2FzQGdsaWRlci5iZT4KClsgVXBz dHJlYW0gY29tbWl0IDJjZTE4MjQ5YWY1YTI4MDMxYjNmOTA5Y2ZhZmNjYzg4ZWE5NjZjOWQgXQoK V2hlbiBjb25maWd1cmluZyB0aGUgZnJhbWUgbWVtb3J5IHdpbmRvdywgdGhlIGxhc3QgY29sdW1u IGFuZCByb3cKbnVtYmVycyBhcmUgd3JpdHRlbiB0byB0aGUgY29sdW1uIHJlc3AuIHBhZ2UgYWRk cmVzcyByZWdpc3RlcnMuICBUaGVzZQpudW1iZXJzIGFyZSB0aHVzIG9uZSBsZXNzIHRoYW4gdGhl IGFjdHVhbCB3aW5kb3cgd2lkdGggcmVzcC4gaGVpZ2h0LgoKV2hpbGUgdGhpcyBpcyBoYW5kbGVk IGNvcnJlY3RseSBpbiBtaXBpX2RiaV9mYl9kaXJ0eSgpIHNpbmNlIGNvbW1pdAowM2NlYjFjOGRm ZDFlMjkzICgiZHJtL3Rpbnlkcm06IEZpeCBzZXR0aW5nIG9mIHRoZSBjb2x1bW4vcGFnZSBlbmQK YWRkcmVzc2VzLiIpLCBpdCBpcyBub3QgaW4gbWlwaV9kYmlfYmxhbmsoKS4gIFRoZSBsYXR0ZXIg c3RpbGwgZm9yZ2V0cwp0byBzdWJ0cmFjdCBvbmUgd2hlbiBjYWxjdWxhdGluZyB0aGUgbW9zdCBz aWduaWZpY2FudCBieXRlcyBvZiB0aGUKY29sdW1uIGFuZCByb3cgbnVtYmVycywgdGh1cyBwcm9n cmFtbWluZyB3cm9uZyB2YWx1ZXMgd2hlbiB0aGUgZGlzcGxheQp3aWR0aCBvciBoZWlnaHQgaXMg YSBtdWx0aXBsZSBvZiAyNTYuCgpGaXhlczogMDJkZDk1ZmUzMTY5MzYyNiAoImRybS90aW55ZHJt OiBBZGQgTUlQSSBEQkkgc3VwcG9ydCIpClNpZ25lZC1vZmYtYnk6IEdlZXJ0IFV5dHRlcmhvZXZl biA8Z2VlcnQrcmVuZXNhc0BnbGlkZXIuYmU+ClNpZ25lZC1vZmYtYnk6IE5vcmFsZiBUcsO4bm5l cyA8bm9yYWxmQHRyb25uZXMub3JnPgpMaW5rOiBodHRwczovL3BhdGNod29yay5mcmVlZGVza3Rv cC5vcmcvcGF0Y2gvbXNnaWQvMjAxOTEyMzAxMzA2MDQuMzEwMDYtMS1nZWVydCtyZW5lc2FzQGds aWRlci5iZQpTaWduZWQtb2ZmLWJ5OiBTYXNoYSBMZXZpbiA8c2FzaGFsQGtlcm5lbC5vcmc+Ci0t LQogZHJpdmVycy9ncHUvZHJtL2RybV9taXBpX2RiaS5jIHwgNCArKy0tCiAxIGZpbGUgY2hhbmdl ZCwgMiBpbnNlcnRpb25zKCspLCAyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9kcm1fbWlwaV9kYmkuYyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fbWlwaV9kYmkuYwpp bmRleCBlMzQwNThjNzIxYmVjLi4xNmJmZjFiZTRiOGFjIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vZHJtX21pcGlfZGJpLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2RybV9taXBpX2RiaS5j CkBAIC0zNjcsOSArMzY3LDkgQEAgc3RhdGljIHZvaWQgbWlwaV9kYmlfYmxhbmsoc3RydWN0IG1p cGlfZGJpX2RldiAqZGJpZGV2KQogCW1lbXNldChkYmlkZXYtPnR4X2J1ZiwgMCwgbGVuKTsKIAog CW1pcGlfZGJpX2NvbW1hbmQoZGJpLCBNSVBJX0RDU19TRVRfQ09MVU1OX0FERFJFU1MsIDAsIDAs Ci0JCQkgKHdpZHRoID4+IDgpICYgMHhGRiwgKHdpZHRoIC0gMSkgJiAweEZGKTsKKwkJCSAoKHdp ZHRoIC0gMSkgPj4gOCkgJiAweEZGLCAod2lkdGggLSAxKSAmIDB4RkYpOwogCW1pcGlfZGJpX2Nv bW1hbmQoZGJpLCBNSVBJX0RDU19TRVRfUEFHRV9BRERSRVNTLCAwLCAwLAotCQkJIChoZWlnaHQg Pj4gOCkgJiAweEZGLCAoaGVpZ2h0IC0gMSkgJiAweEZGKTsKKwkJCSAoKGhlaWdodCAtIDEpID4+ IDgpICYgMHhGRiwgKGhlaWdodCAtIDEpICYgMHhGRik7CiAJbWlwaV9kYmlfY29tbWFuZF9idWYo ZGJpLCBNSVBJX0RDU19XUklURV9NRU1PUllfU1RBUlQsCiAJCQkgICAgICh1OCAqKWRiaWRldi0+ dHhfYnVmLCBsZW4pOwogCi0tIAoyLjIwLjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3Rz LmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xp c3RpbmZvL2RyaS1kZXZlbAo= 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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,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 0B303C2BA83 for ; Fri, 14 Feb 2020 18:21:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C5BF4222C2 for ; Fri, 14 Feb 2020 18:21:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581704501; bh=GM6SWoSqzW6VjK+HK2Fz5Drs/r7qVg46S6Jp0irKb0g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=L+7oIMRx1WvXqOpWp/YvC8JDhVztxMo9y4g39WE4XuFlE4X0Jk26RMBP7JQO//wib L2mCTA88eE1VFjD6uQnBtVqJS7KBeNssB1WAX7BDXEtayK2u8rl4kujGxA2Ii4X1VN +Z16TTTstXzEW23g9+mRgU2dAHjxCeCnvKIB9QAc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391133AbgBNSVl (ORCPT ); Fri, 14 Feb 2020 13:21:41 -0500 Received: from mail.kernel.org ([198.145.29.99]:52868 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730135AbgBNPtm (ORCPT ); Fri, 14 Feb 2020 10:49:42 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id BC64A2086A; Fri, 14 Feb 2020 15:49:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581695382; bh=GM6SWoSqzW6VjK+HK2Fz5Drs/r7qVg46S6Jp0irKb0g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iJWSuM+3BulvVOc23Y3Xl9xyMNE3aIapePFQnrTFLwTN4h9Y9iJryQCWAGLnYTFDr jYF5sQbIJlp1MbUnVZ//7E/ryOksWIMCXafyNZtv500h5gTPgiFwn8ieRac4O4tSmA Z4U+m91TdkTu29TP99WbTUDgErxPGc/Yqf6UlchE= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Geert Uytterhoeven , =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= , Sasha Levin , dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 5.5 037/542] drm/mipi_dbi: Fix off-by-one bugs in mipi_dbi_blank() Date: Fri, 14 Feb 2020 10:40:29 -0500 Message-Id: <20200214154854.6746-37-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200214154854.6746-1-sashal@kernel.org> References: <20200214154854.6746-1-sashal@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Geert Uytterhoeven [ Upstream commit 2ce18249af5a28031b3f909cfafccc88ea966c9d ] When configuring the frame memory window, the last column and row numbers are written to the column resp. page address registers. These numbers are thus one less than the actual window width resp. height. While this is handled correctly in mipi_dbi_fb_dirty() since commit 03ceb1c8dfd1e293 ("drm/tinydrm: Fix setting of the column/page end addresses."), it is not in mipi_dbi_blank(). The latter still forgets to subtract one when calculating the most significant bytes of the column and row numbers, thus programming wrong values when the display width or height is a multiple of 256. Fixes: 02dd95fe31693626 ("drm/tinydrm: Add MIPI DBI support") Signed-off-by: Geert Uytterhoeven Signed-off-by: Noralf Trønnes Link: https://patchwork.freedesktop.org/patch/msgid/20191230130604.31006-1-geert+renesas@glider.be Signed-off-by: Sasha Levin --- drivers/gpu/drm/drm_mipi_dbi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/drm_mipi_dbi.c b/drivers/gpu/drm/drm_mipi_dbi.c index e34058c721bec..16bff1be4b8ac 100644 --- a/drivers/gpu/drm/drm_mipi_dbi.c +++ b/drivers/gpu/drm/drm_mipi_dbi.c @@ -367,9 +367,9 @@ static void mipi_dbi_blank(struct mipi_dbi_dev *dbidev) memset(dbidev->tx_buf, 0, len); mipi_dbi_command(dbi, MIPI_DCS_SET_COLUMN_ADDRESS, 0, 0, - (width >> 8) & 0xFF, (width - 1) & 0xFF); + ((width - 1) >> 8) & 0xFF, (width - 1) & 0xFF); mipi_dbi_command(dbi, MIPI_DCS_SET_PAGE_ADDRESS, 0, 0, - (height >> 8) & 0xFF, (height - 1) & 0xFF); + ((height - 1) >> 8) & 0xFF, (height - 1) & 0xFF); mipi_dbi_command_buf(dbi, MIPI_DCS_WRITE_MEMORY_START, (u8 *)dbidev->tx_buf, len); -- 2.20.1