From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-3339826-1521479375-2-3142045685148311862 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.25, RCVD_IN_DNSWL_HI -5, T_RP_MATCHES_RCVD -0.01, LANGUAGES en, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='CN', FromHeader='com', MailFrom='org', XOriginatingCountry='US' X-Spam-charsets: plain='iso-8859-1' X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: stable-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=arctest; t=1521479374; b=koSuzLklhT1urybfolplIDYq5jFsYgSFn5hPrq8HSjJpg4P c0OJK8YltFyBrMoHXnA7ENDmA/9d1AwG/DON1GI/FcURF0ZLBijtnf69PPj5vZ45 rKBhODKk9ShD9YRsiMfoeKpuZtrXTiDbvs7Ui5Wy/q6pfFJxpJ8AhbEhf/kKRMh7 NDGLJ7CQe7d8xbybXYDBCL62ib+cUClLUfWoto0fUL4YP2SmDZpjrz1QfoRSBDmF 8pYUr1zuPCIl08+Abj2qTQ25WYSIrBmBwclXI4Pk4MutpLIcEd0sfn6HKr42+tkC 61ENVhntSu0YBqVNnrra+H74MbRV7jgbLl++81Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :references:in-reply-to:content-type:content-transfer-encoding :mime-version:sender:list-id; s=arctest; t=1521479374; bh=oshU/Z BNAr62zPlQEwfyDSLZNnylp+dmK1mfeVe4FP8=; b=K5d2dtIJgGR0pmVIp9uwbS 9lguxC/R7GesTwnLsmG8d0SGf2AXmGz7BsMjeeZrqb8eqxbnFJC5piOVl8hyWEYj FCIJwTbMn/UP3d/JQv9RfmN2t84ujlHoGn39cCGcIlcPOTlnMVYTR5DqAubplCsX bmyjt8HXni29bXvaWkxpSlyHEn4MolCt7W+2k5oHAQiCJ8lvFXI9wVL8Qu5PC535 rig3RPhv47yVpiDBGF/mnsArmRW9r41o0FW3IRhqL06SMI6BgJ305zAjKNNGeO4G ycqqbr7a9ommySdsTQ7HUE5t1v7QDCzkxAcEW3d18mRcq29Es7+xhnQeAE2CiYHg == ARC-Authentication-Results: i=1; mx5.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=fSuhcQ6z x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-category=clean score=-100 state=0 spamcause=gggruggvucftvghtrhhoucdtuddrgedtgedrudefgdeljeculddtuddrgedtfedrtddtmdcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfhrghsthforghilhenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmnecujfgurhephffvufhtfffkfhgjihgtgfggshhpjeesthhqredttddtudenucfhrhhomhepufgrshhhrgcunfgvvhhinhcuoeetlhgvgigrnhguvghrrdfnvghvihhnsehmihgtrhhoshhofhhtrdgtohhmqeenucfkphepvddtledrudefvddrudektddrieejpdehvddrudeikedrheegrddvhedvpdhfvgektdemmeefugelsgemjeelvgejmeelgegvsgemheguiedvnecurfgrrhgrmhepihhnvghtpedvtdelrddufedvrddukedtrdeijedphhgvlhhopehvghgvrhdrkhgvrhhnvghlrdhorhhgpdhmrghilhhfrhhomhepoehsthgrsghlvgdqohifnhgvrhesvhhgvghrrdhkvghrnhgvlhdrohhrghequceuqfffjgepkeeukffvoffkoffgucfukfgkgfepjeeifedtnecuvehluhhsthgvrhfuihiivgepheei; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Authentication-Results: mx5.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=fSuhcQ6z x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-category=clean score=-100 state=0 spamcause=gggruggvucftvghtrhhoucdtuddrgedtgedrudefgdeljeculddtuddrgedtfedrtddtmdcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfhrghsthforghilhenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmnecujfgurhephffvufhtfffkfhgjihgtgfggshhpjeesthhqredttddtudenucfhrhhomhepufgrshhhrgcunfgvvhhinhcuoeetlhgvgigrnhguvghrrdfnvghvihhnsehmihgtrhhoshhofhhtrdgtohhmqeenucfkphepvddtledrudefvddrudektddrieejpdehvddrudeikedrheegrddvhedvpdhfvgektdemmeefugelsgemjeelvgejmeelgegvsgemheguiedvnecurfgrrhgrmhepihhnvghtpedvtdelrddufedvrddukedtrdeijedphhgvlhhopehvghgvrhdrkhgvrhhnvghlrdhorhhgpdhmrghilhhfrhhomhepoehsthgrsghlvgdqohifnhgvrhesvhhgvghrrdhkvghrnhgvlhdrohhrghequceuqfffjgepkeeukffvoffkoffgucfukfgkgfepjeeifedtnecuvehluhhsthgvrhfuihiivgepheei; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966648AbeCSQKn (ORCPT ); Mon, 19 Mar 2018 12:10:43 -0400 Received: from mail-by2nam03on0106.outbound.protection.outlook.com ([104.47.42.106]:22396 "EHLO NAM03-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S966304AbeCSQKO (ORCPT ); Mon, 19 Mar 2018 12:10:14 -0400 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Tomi Valkeinen , Sasha Levin Subject: [PATCH AUTOSEL for 4.4 117/167] drm/omap: fix tiled buffer stride calculations Thread-Topic: [PATCH AUTOSEL for 4.4 117/167] drm/omap: fix tiled buffer stride calculations Thread-Index: AQHTv5xtYxJk6vhfiUmmJtN/42PLRA== Date: Mon, 19 Mar 2018 16:07:48 +0000 Message-ID: <20180319160513.16384-117-alexander.levin@microsoft.com> References: <20180319160513.16384-1-alexander.levin@microsoft.com> In-Reply-To: <20180319160513.16384-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;DM5PR2101MB0919;7:xIQIZBru/+D+Acfqmi/wZXJu6Nr4aUIuM1Ot6oEy07WM1KuuFuYgVMsEosxzXPetabcw2kUNI4b4QO6uO+qAnwx60tms81eaVht9mHMl0T7NUT9pJZbB58s6UO54nU5ix4L6A9QyVhEkBh3kOo8y3c0wjCWSO5hvQnf0mCAM19LB3n2GEsSryp8G6jrYAsZm4/IMa20eWeq4gYNS7xWzLhowHSryp7gea9rUV6OM1zUJagRiKM+cezaOBWkIpzRK;20:s1rcsVvDY+FnfJy1comBu+nCPMopuCe3TiNH95uhJ1m3L7E2EXKLoVDiB4y9sUBbBJp4KJ/p3WE0/UoAcTOXjAMn2EuUdOcErBCXXnJkm2LsqBuyynqAHwDswLGWc/4TCCAv9OVSRzMk/ZdvyDN1w+Xhzrv9qKypf01XsGrl920= x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 8dd46385-99e8-4bdf-00c3-08d58db3ded3 x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(3008032)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7193020);SRVR:DM5PR2101MB0919; x-ms-traffictypediagnostic: DM5PR2101MB0919: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(31051911155226)(89211679590171); x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(8211001083)(61425038)(6040522)(2401047)(5005006)(8121501046)(3231221)(944501300)(52105095)(3002001)(93006095)(93001095)(10201501046)(6055026)(61426038)(61427038)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123562045)(20161123564045)(20161123558120)(6072148)(201708071742011);SRVR:DM5PR2101MB0919;BCL:0;PCL:0;RULEID:;SRVR:DM5PR2101MB0919; x-forefront-prvs: 06167FAD59 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(346002)(39380400002)(396003)(39860400002)(376002)(366004)(199004)(189003)(66066001)(2906002)(86362001)(10290500003)(105586002)(8676002)(305945005)(110136005)(478600001)(4326008)(7736002)(81166006)(3280700002)(6506007)(97736004)(107886003)(5660300001)(36756003)(8936002)(53936002)(86612001)(14454004)(59450400001)(1076002)(2501003)(6116002)(10090500001)(76176011)(186003)(3846002)(5250100002)(6512007)(99286004)(102836004)(106356001)(72206003)(81156014)(2950100002)(6666003)(54906003)(3660700001)(22452003)(68736007)(6486002)(25786009)(26005)(316002)(2900100001)(6436002)(22906009)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:DM5PR2101MB0919;H:DM5PR2101MB1032.namprd21.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX:1; x-microsoft-antispam-message-info: b9+p35v00jHgPCS/S1VjfM1KnXfU58AGCTatSKBYZ9CCiTXNlHnBKPpTDkrP055Bd1fZsEWTJIvS7ZDLjvgbMAaQws9p8h3WFi1wT/Q/eCm5RbotnuqJgeIdxk5wAUi0loBkJCae/LyXaJwsntenTWbzkP8uz6fSlhOEapdUzZPodlQUEwLmMv1aXiem5C40EkQ3AWl0nWZf52nKeex3oeQIXm2jAzBv/+YwzICjMoe5FbFx0lMuFFrV3AZa5f6y8P+0znhiR59kZvKqdJ0qZMpLLfAZKUuTLsPmQGLk/4zPXe1NymSEu+VZCsaMFxfTVR1vbCNgastxXjLwEY9Tjw== spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8dd46385-99e8-4bdf-00c3-08d58db3ded3 X-MS-Exchange-CrossTenant-originalarrivaltime: 19 Mar 2018 16:07:48.9843 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB0919 Sender: stable-owner@vger.kernel.org X-Mailing-List: stable@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: From: Tomi Valkeinen [ Upstream commit cc8dd7661ccc2d8dc88921da8e6cc7c2fcdb0341 ] omap_gem uses page alignment for buffer stride. The related calculations are a bit off, though, as byte stride of 4096 gets aligned to 8192, instead of 4096. This patch changes the code to use DIV_ROUND_UP(), which fixes those calculations and makes them more readable. Signed-off-by: Tomi Valkeinen Reviewed-by: Laurent Pinchart Signed-off-by: Sasha Levin --- drivers/gpu/drm/omapdrm/omap_gem.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/omapdrm/omap_gem.c b/drivers/gpu/drm/omapdrm/o= map_gem.c index 7ed08fdc4c42..393e5335e33b 100644 --- a/drivers/gpu/drm/omapdrm/omap_gem.c +++ b/drivers/gpu/drm/omapdrm/omap_gem.c @@ -158,7 +158,7 @@ static void evict_entry(struct drm_gem_object *obj, size_t size =3D PAGE_SIZE * n; loff_t off =3D mmap_offset(obj) + (entry->obj_pgoff << PAGE_SHIFT); - const int m =3D 1 + ((omap_obj->width << fmt) / PAGE_SIZE); + const int m =3D DIV_ROUND_UP(omap_obj->width << fmt, PAGE_SIZE); =20 if (m > 1) { int i; @@ -415,7 +415,7 @@ static int fault_2d(struct drm_gem_object *obj, * into account in some of the math, so figure out virtual stride * in pages */ - const int m =3D 1 + ((omap_obj->width << fmt) / PAGE_SIZE); + const int m =3D DIV_ROUND_UP(omap_obj->width << fmt, PAGE_SIZE); =20 /* We don't use vmf->pgoff since that has the fake offset: */ pgoff =3D ((unsigned long)vmf->virtual_address - --=20 2.14.1