From patchwork Tue Dec 1 11:30:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sylwester Nawrocki X-Patchwork-Id: 1408785 X-Patchwork-Delegate: agust@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=samsung.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=samsung.com header.i=@samsung.com header.a=rsa-sha256 header.s=mail20170921 header.b=kkvSRwpZ; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Clg1547fLz9sSf for ; Tue, 1 Dec 2020 22:31:53 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id B702E8267B; Tue, 1 Dec 2020 12:31:46 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=samsung.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=samsung.com header.i=@samsung.com header.b="kkvSRwpZ"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1C7B182682; Tue, 1 Dec 2020 12:31:45 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-8.5 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_HI, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mailout2.w1.samsung.com (mailout2.w1.samsung.com [210.118.77.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id EA541825FF for ; Tue, 1 Dec 2020 12:31:35 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=samsung.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=s.nawrocki@samsung.com Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20201201113123euoutp025b83fd467af1742b1acd5417c81a6e43~MlFpx_dJ92455424554euoutp02e for ; Tue, 1 Dec 2020 11:31:23 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20201201113123euoutp025b83fd467af1742b1acd5417c81a6e43~MlFpx_dJ92455424554euoutp02e DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1606822283; bh=7/B/9HVEdhKgWEmTUoEC0qwEQ5M9SyrvQ1Lrei6LU4E=; h=From:To:Cc:Subject:Date:References:From; b=kkvSRwpZXahzXuLy9vYivh0Tw2Hfc7wTWi3bfmvA/FFaJJQtFiHfVqRzVKA54SKo/ M2ImWroudYZN7Q8u91TB01Vvhx4uisRqwJxFEWHiSlpNxT6wsKFNZkEo1/INKzBwUG OKfetC0Hk4wW4BHbFuWkKk4sOC7uQfRpgU1Kz6k8= Received: from eusmges1new.samsung.com (unknown [203.254.199.242]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20201201113117eucas1p1dfa2c9a4bf68633be12d352a7da870b0~MlFkyx0vl2030620306eucas1p1Q; Tue, 1 Dec 2020 11:31:17 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges1new.samsung.com (EUCPMTA) with SMTP id 98.59.27958.58926CF5; Tue, 1 Dec 2020 11:31:17 +0000 (GMT) Received: from eusmtrp1.samsung.com (unknown [182.198.249.138]) by eucas1p1.samsung.com (KnoxPortal) with ESMTPA id 20201201113117eucas1p18b5d1379afd4146731a26b9cb922dbc1~MlFkVyjlw2633626336eucas1p16; Tue, 1 Dec 2020 11:31:17 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eusmtrp1.samsung.com (KnoxPortal) with ESMTP id 20201201113117eusmtrp105ad69dae9445fa716a9fc7f7655e063~MlFkVHj2h1449114491eusmtrp1c; Tue, 1 Dec 2020 11:31:17 +0000 (GMT) X-AuditID: cbfec7f2-f15ff70000006d36-f9-5fc629850ce4 Received: from eusmtip2.samsung.com ( [203.254.199.222]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id E6.BE.16282.58926CF5; Tue, 1 Dec 2020 11:31:17 +0000 (GMT) Received: from AMDC3061.digital.local (unknown [106.120.51.75]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20201201113116eusmtip26cfb519384c9463b9e5e0d80364a5f28~MlFj7hx5Z2445124451eusmtip2e; Tue, 1 Dec 2020 11:31:16 +0000 (GMT) From: Sylwester Nawrocki To: agust@denx.de Cc: u-boot@lists.denx.de, jh80.chung@samsung.com, sw0312.kim@samsung.com, b.zolnierkie@samsung.com, m.szyprowski@samsung.com, Sylwester Nawrocki Subject: [PATCH] video: Fix line padding calculation for 16 and 24 BPP bitmaps Date: Tue, 1 Dec 2020 12:30:50 +0100 Message-Id: <20201201113050.1546-1-s.nawrocki@samsung.com> X-Mailer: git-send-email 2.17.1 X-Brightmail-Tracker: H4sIAAAAAAAAA0WRa0hTYRjHe3fOdk6Lyek48sGkYhgx85KkNitN6eIiKL9FQcxhJ7ts087U bl+6eMvKbEpbWWJZGpvL0mUrlbxPNAtSZNZMKgunrVxNSgea8xR9+z3/y/s88JIY/RYPJI9o MhlWo1RJBEK8oWv6VViutEuxbrAqTFY7fA/JHhtq+TL7TB5fZu4YJmTtX/P5MkOJUyBzNV8k Egh5+c1uXN7nsCJ5kcWIkrH9ws0HGdWRbIaNiE8RHtY7yrCMj8KTU19K0Vn0nCxEi0mgomCg KhcvREKSph4gmHX18bnBg6DONPjX+Yng+vkJwb+K+0O+gDOqEeTobv2vtDSP830pARUJVzqL kI/F1FLwdk7xfCGMMiNobry9EPKnkqF15B3Pxzi1Grz1hvlnSVJEbYSR8t3ctpVgetSC+bpA TRPw3Z3H54xt0Pu2ieDYH8Ztlr8cBL0ll3GucAHB5cZ3BDcUIxixVSAutQkcr2YWtmGUFGqf R3ByIujbS3CfDJQf2F1LfTI2j7oGPcbJIijIo7l0MHiNeh7HgXBpdA7nWA5PBqsXzqGpA2B2 mnjFaMXN/7sqEDKiACZLq05jtJEa5kS4VqnWZmnSwlPT1XVo/vt7Z20/rOj2uDu8DfFI1IaA xCRiET7boaBFB5WnTjNsuoLNUjHaNrScxCUBImNZjYKm0pSZzDGGyWDYfy6PXBx4llc+pRYk 3OjJLU00UVv82Lirqx10VKrX2Nbfuj7eaTVXzh2atDviW0Zfhrib5J8KP3fmVWZvKd5Ah40p LCN7zw0czaxql5+xvDDbNyWO7TxeE6LYlqxYm72np4gmG6oJUw7MsneunWN1e35r/HUVSXHv QyX1y1RJnuZW6ozk0bqYlVLD9oaYa4OnlLQz1vpNFyt92DIRZIi5qz7wbUI6Kn4qJsY8Lzss AbaplJzX7sRY566TSxZ9XBM6ed/qZ/d+iKwkhpKDj+n9L2yNhr2O6LKCi/3p3eU1aEdj3T7j w6Fnfd/fuFr3d2Vjn8WPE1wBX16rPGL+18lSj0206pcE1x5WRoZgrFb5BxoJuyVtAwAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrLLMWRmVeSWpSXmKPExsVy+t/xe7qtmsfiDe63ilisv7uE0WLjjPWs Fjd+tbFarD1yl93i8Jt2VosZk1+yWbzd28nuwO4xb9YJFo+zd3YwevRtWcUYwBylZ1OUX1qS qpCRX1xiqxRtaGGkZ2hpoWdkYqlnaGwea2VkqqRvZ5OSmpNZllqkb5eglzH9zmzmgkdcFV+f TWFsYNzF0cXIySEhYCLx8WE7WxcjF4eQwFJGiS0zrzB2MXIAJaQk5rcoQdQIS/y51gVV84lR omnlKhaQBJuAoUTv0T5GEFtEQFDi99GvTCBFzAKbGSUmvnvNBDJIWMBPYs3fCpAaFgFVid+b Z7CBhHkFrCTuz/ODmC8vsXrDAeYJjDwLGBlWMYqklhbnpucWG+kVJ+YWl+al6yXn525iBIbb tmM/t+xgXPnqo94hRiYOxkOMEhzMSiK8LP+OxAvxpiRWVqUW5ccXleakFh9iNAVaN5FZSjQ5 HxjweSXxhmYGpoYmZpYGppZmxkrivCZH1sQLCaQnlqRmp6YWpBbB9DFxcEo1MLXe//qLXYZ9 yvbS0Po736x/+7S/PSZpe3CVfdmugyyxx3Z6scVMlDfnc5gvejdgUWV48smo3GWzD/U9Cz+g GZEygcvwaKnG5PzlIk9/v54mKTLTjOWxw/x7R6//m8u60/6Z1YXZEi6R115EbntfbTX7/1Xz NcI5zM99xbUzeg8GbdF6mKfUcurqm7tt+5z8RVct/NijljZpzfbLG2/MqZU9vr80ptI4YE2u nV26A8NyrrQKMa7pUR/LP+xYmcnw5NHxindKzLNvxixUcJy7u2XJm4r27O/ZyXpvD3M58l/g 3X94/WYDvxf6Z6TZSnTPv5227mHuRoEbfn45138tO7GEd+Xjf9dq5K2Su7buaF+gxFKckWio xVxUnAgAvZjqmMACAAA= X-CMS-MailID: 20201201113117eucas1p18b5d1379afd4146731a26b9cb922dbc1 X-Msg-Generator: CA X-RootMTR: 20201201113117eucas1p18b5d1379afd4146731a26b9cb922dbc1 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20201201113117eucas1p18b5d1379afd4146731a26b9cb922dbc1 References: X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean Each row in the pixel array in the bitmap file is padded if necessary so the row size is always a multiple of 4 bytes. In current code the complement of row size to a multiple of 4 bytes is further unnecessarily multiplied by the pixel size. This results in incorrect displaying of bitmaps having row size that is not a multiple of 4 bytes. Fix this by removing the unnecessary multiplication. Tested with 24BPP bitmap and XRGB32 display. Signed-off-by: Sylwester Nawrocki Tested-by: Jaehoon Chung --- drivers/video/video_bmp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/video/video_bmp.c b/drivers/video/video_bmp.c index 5a4d12c68d..5537378781 100644 --- a/drivers/video/video_bmp.c +++ b/drivers/video/video_bmp.c @@ -328,7 +328,7 @@ int video_bmp_display(struct udevice *dev, ulong bmp_image, int x, int y, for (j = 0; j < width; j++) fb_put_word(&fb, &bmap); - bmap += (padded_width - width) * 2; + bmap += (padded_width - width); fb -= width * 2 + priv->line_length; } break; @@ -352,7 +352,7 @@ int video_bmp_display(struct udevice *dev, ulong bmp_image, int x, int y, } } fb -= priv->line_length + width * (bpix / 8); - bmap += (padded_width - width) * 3; + bmap += (padded_width - width); } break; #endif /* CONFIG_BMP_24BPP */