From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-874563-1516768955-2-2661996537283097019 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 unknown, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='US', 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=1516768954; b=fNHtUjaoSss908Pgt8tSeJgQ8xrimeXLhdtXadiRVwizm6Y EmDAF+NbLPHr+FZQxPXPkK5P0BEijOIDqoHtnnD6xcJVyQck2rtTdNW3Z7UrmRJp QBWYz3CT3r+SyMsYChaTUBDAeobXbg5IAZMXqFCmyFfC60ioIyQDbvJdWwKh13D/ 0Ke3wz7V4ZVaHTYJGn4YZuFG1717U24dpHyQfMH+zRO/gb12a9DGq84h6C/9lEoO xUVdz2NSa+Ns814SHGrjpaHsp89jLsYrTrIX2nrYymcRvfTODi/ovGUgSrjJ22a+ ZX470S3B22AhzX5UAGKWRhwFzHjxD1MeMyCAdqQ== 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=1516768954; bh=G3M7Zh x3vdd6JEe/Oz4KFgpIUPtNAsxFzSopRkIbZvE=; b=jmUZ2Uq9MzU56HIHeujxEE BfwY4rfdUmAWMqZLzfV9j6EYuQ+3v5rt68I1Iq8a0Y2ZMoxxNFf7u0ZpRS6lqrKo 6Ld/U/UmHDjP3X7Hc8StCD3Znt6htZtKpEQBHFljBXoPUDD3CMFBl11txK1KqWmA KC35nZwAAq6BBSzue2cYVMUZteR6Z8TlwNWal2OeYE5A2PJTczQZpNyad46f0ApH duWJWTC+S/Miw+PnQ/k3HX4U/WHO0jOEFbCyeEWd875HUY7Z1IyGOboi3EGeZ7NA OrigDaozNL6UkPlj9529gfeUAKJw61m2C70nSAPQHmAoc1NLdpnv0MahHBprYe5g == ARC-Authentication-Results: i=1; mx6.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=V+7HPeWI 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-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: mx6.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=V+7HPeWI 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-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 S932693AbeAXEmR (ORCPT ); Tue, 23 Jan 2018 23:42:17 -0500 Received: from mail-cys01nam02on0137.outbound.protection.outlook.com ([104.47.37.137]:21245 "EHLO NAM02-CY1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932689AbeAXEQz (ORCPT ); Tue, 23 Jan 2018 23:16:55 -0500 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: shaoyunl , shaoyun liu , "Felix Kuehling" , Oded Gabbay , "Sasha Levin" Subject: [PATCH AUTOSEL for 4.9 14/55] drm/amdkfd: Fix SDMA ring buffer size calculation Thread-Topic: [PATCH AUTOSEL for 4.9 14/55] drm/amdkfd: Fix SDMA ring buffer size calculation Thread-Index: AQHTlMn7KrDDA1OKRE6LhJMIO8ybqw== Date: Wed, 24 Jan 2018 04:15:35 +0000 Message-ID: <20180124041521.32223-14-alexander.levin@microsoft.com> References: <20180124041521.32223-1-alexander.levin@microsoft.com> In-Reply-To: <20180124041521.32223-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;DM5PR2101MB1080;7:29Yxx8wZvTvNYmTyAjvlMOFwygczJ1i7cFTA3uD+Pv/Fwd1/ntywoWIZxmkQe7MjaYCbd7VFDHbyj1VMMKN5M5DGv81SZwHy+R5OILWrqFnE7n2B+nnpXZ+xJSCavd+YNxxILZcpVAuXO5R7REsg+2+yJMnyi12UXBKLMJeZ8rIHk205O+csE8hXc5LIxCxFsEY9lz4r3C2f5KUG0vvok8zmlZhdqavsDB0QBAMD2oPBDBMvjtyNVXlp44KrIDSu x-ms-office365-filtering-correlation-id: 86d57073-1e25-4f88-3bb5-08d562e1496c x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(5600026)(4604075)(3008032)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(2017052603307)(7193020);SRVR:DM5PR2101MB1080; x-ms-traffictypediagnostic: DM5PR2101MB1080: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171)(85827821059158)(767451399110); x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(61425038)(6040501)(2401047)(8121501046)(5005006)(3002001)(10201501046)(3231046)(2400081)(944501161)(93006095)(93001095)(6055026)(61426038)(61427038)(6041288)(20161123562045)(20161123558120)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011);SRVR:DM5PR2101MB1080;BCL:0;PCL:0;RULEID:;SRVR:DM5PR2101MB1080; x-forefront-prvs: 056297E276 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(376002)(396003)(346002)(39860400002)(39380400002)(366004)(189003)(199004)(8666007)(72206003)(110136005)(316002)(5250100002)(6346003)(2900100001)(54906003)(1076002)(6116002)(3846002)(22452003)(36756003)(53936002)(99286004)(6512007)(68736007)(2501003)(3660700001)(14454004)(3280700002)(86362001)(102836004)(7736002)(5660300001)(305945005)(107886003)(6486002)(6506007)(2906002)(81156014)(26005)(25786009)(4326008)(81166006)(39060400002)(105586002)(8936002)(59450400001)(106356001)(478600001)(10290500003)(6436002)(8676002)(2950100002)(86612001)(97736004)(76176011)(6666003)(10090500001)(66066001)(22906009)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:DM5PR2101MB1080;H:DM5PR2101MB1032.namprd21.prod.outlook.com;FPR:;SPF:None;PTR:InfoNoRecords;MX:1;A:1;LANG:en; authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-message-info: /cqDIc239U3bt6wZ8WdqvZ8m9ENxVVpetLPtR3BB7ny3eUiExl46z3jh25j3nT7rOLmrEfoQ4RmRwu9V0D8C+w== 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: 86d57073-1e25-4f88-3bb5-08d562e1496c X-MS-Exchange-CrossTenant-originalarrivaltime: 24 Jan 2018 04:15:35.7354 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB1080 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: shaoyunl [ Upstream commit d12fb13f23199faa7e536acec1db49068e5a067d ] ffs function return the position of the first bit set on 1 based. (bit zero returns 1). Signed-off-by: shaoyun liu Signed-off-by: Felix Kuehling Reviewed-by: Oded Gabbay Signed-off-by: Oded Gabbay Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c b/drivers/gpu= /drm/amd/amdkfd/kfd_mqd_manager_cik.c index d83de985e88c..8577a563600f 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c @@ -215,8 +215,8 @@ static int update_mqd_sdma(struct mqd_manager *mm, void= *mqd, BUG_ON(!mm || !mqd || !q); =20 m =3D get_sdma_mqd(mqd); - m->sdma_rlc_rb_cntl =3D ffs(q->queue_size / sizeof(unsigned int)) << - SDMA0_RLC0_RB_CNTL__RB_SIZE__SHIFT | + m->sdma_rlc_rb_cntl =3D (ffs(q->queue_size / sizeof(unsigned int)) - 1) + << SDMA0_RLC0_RB_CNTL__RB_SIZE__SHIFT | q->vmid << SDMA0_RLC0_RB_CNTL__RB_VMID__SHIFT | 1 << SDMA0_RLC0_RB_CNTL__RPTR_WRITEBACK_ENABLE__SHIFT | 6 << SDMA0_RLC0_RB_CNTL__RPTR_WRITEBACK_TIMER__SHIFT; --=20 2.11.0