From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-901460-1516770005-2-13623888625829718626 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 daensv, 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=1516770005; b=ZlpWNP2wfV0gjGjkGlQAAf3Rul+T6TlkiC22F4z+HPBcJkp 7WZOHFiTzEseZGNfr+c4nZIaLTIahTDmJ8WflC7VYY3iq8pTwypfcZ75zjsBGaMX OKPkOo63wOAnxcQV0C4Y+WpoX4c2n7eRU9CIa4mUVKA1BicJKKKiQ5r7leeSmeDd cy21TKQAcICg47NvsRlh+udPc1eE6Dj9rhnLbCLww1/dJ9gDIH1yuZBSl6L5H7Zt awEfkc9L2ygb8A4YFZKqFF3PV8K7q0DktGEye+2Zg2CRatNKhNLH1LHO8jgL/MSc qchQ+XyUkLaIBVZ0AajORzOf8IJYZHoozRw9TsQ== 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=1516770005; bh=+iLGU3 2quUIfUP3Nv+3WC7xeDoEKGiwW2NsnP1/bx2g=; b=wNMDP2eIXZUJPjEfUfW5M6 /QEuQFFqkijPQWU42r4n+IKGm36sIiNNDyfSFf4VukgZI4aqm3Mid9o5MsfK0e9U xU6Ctnmh2RifUp9fZFda6yWeq5awiVkoj4Pq4fkknGxwWyHZtFl1AxJA5B4XnLDm nvIp0vuKgGSxUUQPLIG1qbx0YeCqEmpI/0zAMM3O54Ni8oCSJB2/vXESjX5XaqU0 IYKurwrl96rY5rMsGsK6mBXToQqoT8ahrh3YL7UGTsK6mycz/zruyntAfMpcTq0g B2MRKcVTxsKFMbCzPf89JGOKCAP7zm7+a0+N++EJYLLInNimUYtoeXkaD2n5p+1w == 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=Xen35GWC 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=Xen35GWC 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 S932159AbeAXE7n (ORCPT ); Tue, 23 Jan 2018 23:59:43 -0500 Received: from mail-sn1nam01on0111.outbound.protection.outlook.com ([104.47.32.111]:45037 "EHLO NAM01-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932123AbeAXEPO (ORCPT ); Tue, 23 Jan 2018 23:15:14 -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.14 034/100] drm/amdkfd: Fix SDMA ring buffer size calculation Thread-Topic: [PATCH AUTOSEL for 4.14 034/100] drm/amdkfd: Fix SDMA ring buffer size calculation Thread-Index: AQHTlMna6c7eVwegMk2sycA7OOV3sg== Date: Wed, 24 Jan 2018 04:14:40 +0000 Message-ID: <20180124041414.32065-34-alexander.levin@microsoft.com> References: <20180124041414.32065-1-alexander.levin@microsoft.com> In-Reply-To: <20180124041414.32065-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;DM5PR2101MB0998;6:qawlAmcuzaPXTDLZkA/VL3f4E778N9pY7Q+cdkaRe5VCbjaBGESsjHv+8QLMRmc4CcDUXBZ6UPe15DiTUBVfCLgIkozqdXDf3sl8+qniPWdyl/kCmz2du5MRKhcLYrwQ4Z+jaxMjKki+5yw5vuJRg0DxVvPJnNgjKT6Hrh1Ur6N1dypgxBQF2NihBNpaMJSw0h8QkK5DjoIyPDnL9FvAAYlD5joer97maNb5UjnC0PSF6uSZxsuTLiY+sDmcvIkjQO+Rsp6mOELiosLBC2SSv0OHmh8ygbLztATdyCywI8KgT+ucqd5r/CqcWAaVYPqIKDiVkv4dXX8raRGY6SfmOTQBXjcxrB3G1eER2e8SS81K42ZDkZmGweuKcicf1cjQ;5:/ZhvqQpU1j246U//PbL+3iK3Y67sEu2itwtFZZOQUiJSF5R6PzPXI5QQq8cZ9eZxMPezsCvgod8KUgMzRqbGCuleWZoerQY8oBUOXLUhTnGEva7FE0Ac3DaZF6nndVnSGTQr1+oIgsR9kMFqMiLuxSVypH2U78xUtOFRSx5oUSM=;24:x/AVjuFTlgCrKhf7ePmglljTbkjFvZOlqL5mS4vdobrJdtrLeEYggpQvQVvtUsNiECxr/pc2xN+qmc8BL1mE6GSltaw+mp+hIyvtwIyJGKY=;7:GBLXdU545R/XE9GKaxa9Yf1G6xRGWcsqfq7FJEqwPCmoxx/H4VJWTrOCBzGokEibOgUCbro3MUoEPiePJ0UrinlWRGcWw33mn/Lzv7rfbAE+1m+OpaBCGXsCqxRzyP5WDPXYFlplYVNwlRKHj3MDCiAC0fPxztNuB2dYM2fjSpdvlJ228ZtL7zsfCmPhAC+suqC3lR1PLCZnjvtFZTqNS6q4D04WhIK6xmVjOCQySjYZNa5j/0KFVaLp6K+LVc3V x-ms-office365-filtering-correlation-id: 82cf4e1d-31c6-40fb-4871-08d562e10f1d 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:DM5PR2101MB0998; x-ms-traffictypediagnostic: DM5PR2101MB0998: 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)(93006095)(93001095)(3231046)(2400081)(944501161)(10201501046)(3002001)(6055026)(61426038)(61427038)(6041288)(20161123558120)(20161123562045)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011);SRVR:DM5PR2101MB0998;BCL:0;PCL:0;RULEID:;SRVR:DM5PR2101MB0998; x-forefront-prvs: 056297E276 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(366004)(39380400002)(346002)(39860400002)(396003)(376002)(199004)(189003)(14454004)(3660700001)(6346003)(10290500003)(105586002)(66066001)(6506007)(8676002)(22452003)(86612001)(54906003)(10090500001)(81166006)(81156014)(76176011)(110136005)(86362001)(68736007)(106356001)(59450400001)(8936002)(3280700002)(36756003)(25786009)(107886003)(39060400002)(2501003)(6666003)(99286004)(2906002)(26005)(2950100002)(72206003)(102836004)(305945005)(6116002)(3846002)(5660300001)(4326008)(478600001)(316002)(53936002)(97736004)(8666007)(2900100001)(5250100002)(6512007)(6436002)(6486002)(1076002)(7736002)(22906009)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:DM5PR2101MB0998;H:DM5PR2101MB1032.namprd21.prod.outlook.com;FPR:;SPF:None;PTR:InfoNoRecords;A:1;MX:1;LANG:en; authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-message-info: ktb4hU/nvg6MfqSYCHFsVYweNdSCKtT7puAzBx6xwIg8jmJaOwOgbdqtGkIe3vpLBhci4OiMYLQCBA9UZ342qg== 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: 82cf4e1d-31c6-40fb-4871-08d562e10f1d X-MS-Exchange-CrossTenant-originalarrivaltime: 24 Jan 2018 04:14:40.6853 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB0998 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 44ffd23348fc..164fa4b1f9a9 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c @@ -205,8 +205,8 @@ static int update_mqd_sdma(struct mqd_manager *mm, void= *mqd, struct cik_sdma_rlc_registers *m; =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