From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Gustavo A. R. Silva" Subject: [PATCH v2] drm/amdgpu_vm: fix boolean expressions Date: Thu, 3 Jan 2019 14:01:46 -0600 Message-ID: <20190103200146.GA26442@embeddedor> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Content-Disposition: inline List-Id: Discussion list for AMD gfx List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "amd-gfx" To: Felix Kuehling , Harish Kasiviswanathan , Alex Deucher , Christian =?iso-8859-1?Q?K=F6nig?= , "David (ChunMing) Zhou" , David Airlie , Daniel Vetter Cc: "Gustavo A. R. Silva" , dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Rml4IGJvb2xlYW4gZXhwcmVzc2lvbnMgYnkgdXNpbmcgbG9naWNhbCBBTkQgb3BlcmF0b3IgJyYm JwppbnN0ZWFkIG9mIGJpdHdpc2Ugb3BlcmF0b3IgJyYnLgoKVGhpcyBpc3N1ZSB3YXMgZGV0ZWN0 ZWQgd2l0aCB0aGUgaGVscCBvZiBDb2NjaW5lbGxlLgoKRml4ZXM6IDlhNGI3ZDRjNzY5ZSAoImRy bS9hbWRncHU6IEFkZCB2bSBjb250ZXh0IG1vZHVsZSBwYXJhbSIpCkNjOiBzdGFibGVAdmdlci5r ZXJuZWwub3JnClJldmlld2VkLWJ5OiBGZWxpeCBLdWVobGluZyA8RmVsaXguS3VlaGxpbmdAYW1k LmNvbT4KU2lnbmVkLW9mZi1ieTogR3VzdGF2byBBLiBSLiBTaWx2YSA8Z3VzdGF2b0BlbWJlZGRl ZG9yLmNvbT4KLS0tCkNoYW5nZXMgaW4gdjI6CiAtIFVwZGF0ZSBGaXhlcyB0YWcuCgogZHJpdmVy cy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X3ZtLmMgfCA0ICsrLS0KIDEgZmlsZSBjaGFuZ2Vk LCAyIGluc2VydGlvbnMoKyksIDIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X3ZtLmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdw dS9hbWRncHVfdm0uYwppbmRleCBlNzNkMTUyNjU5YTIuLjRjYzBkMTA3OTkzNSAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X3ZtLmMKKysrIGIvZHJpdmVycy9n cHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X3ZtLmMKQEAgLTMwMDYsNyArMzAwNiw3IEBAIGludCBh bWRncHVfdm1faW5pdChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwgc3RydWN0IGFtZGdwdV92 bSAqdm0sCiAJfQogCURSTV9ERUJVR19EUklWRVIoIlZNIHVwZGF0ZSBtb2RlIGlzICVzXG4iLAog CQkJIHZtLT51c2VfY3B1X2Zvcl91cGRhdGUgPyAiQ1BVIiA6ICJTRE1BIik7Ci0JV0FSTl9PTkNF KCh2bS0+dXNlX2NwdV9mb3JfdXBkYXRlICYgIWFtZGdwdV9nbWNfdnJhbV9mdWxsX3Zpc2libGUo JmFkZXYtPmdtYykpLAorCVdBUk5fT05DRSgodm0tPnVzZV9jcHVfZm9yX3VwZGF0ZSAmJiAhYW1k Z3B1X2dtY192cmFtX2Z1bGxfdmlzaWJsZSgmYWRldi0+Z21jKSksCiAJCSAgIkNQVSB1cGRhdGUg b2YgVk0gcmVjb21tZW5kZWQgb25seSBmb3IgbGFyZ2UgQkFSIHN5c3RlbVxuIik7CiAJdm0tPmxh c3RfdXBkYXRlID0gTlVMTDsKIApAQCAtMzEzNiw3ICszMTM2LDcgQEAgaW50IGFtZGdwdV92bV9t YWtlX2NvbXB1dGUoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYsIHN0cnVjdCBhbWRncHVfdm0g KnZtLCB1bnMKIAl2bS0+cHRlX3N1cHBvcnRfYXRzID0gcHRlX3N1cHBvcnRfYXRzOwogCURSTV9E RUJVR19EUklWRVIoIlZNIHVwZGF0ZSBtb2RlIGlzICVzXG4iLAogCQkJIHZtLT51c2VfY3B1X2Zv cl91cGRhdGUgPyAiQ1BVIiA6ICJTRE1BIik7Ci0JV0FSTl9PTkNFKCh2bS0+dXNlX2NwdV9mb3Jf dXBkYXRlICYgIWFtZGdwdV9nbWNfdnJhbV9mdWxsX3Zpc2libGUoJmFkZXYtPmdtYykpLAorCVdB Uk5fT05DRSgodm0tPnVzZV9jcHVfZm9yX3VwZGF0ZSAmJiAhYW1kZ3B1X2dtY192cmFtX2Z1bGxf dmlzaWJsZSgmYWRldi0+Z21jKSksCiAJCSAgIkNQVSB1cGRhdGUgb2YgVk0gcmVjb21tZW5kZWQg b25seSBmb3IgbGFyZ2UgQkFSIHN5c3RlbVxuIik7CiAKIAlpZiAodm0tPnBhc2lkKSB7Ci0tIAoy LjIwLjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmFt ZC1nZnggbWFpbGluZyBsaXN0CmFtZC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8v bGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vYW1kLWdmeAo= 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=-8.5 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED, USER_AGENT_MUTT 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 54F10C43387 for ; Thu, 3 Jan 2019 20:25:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2820320675 for ; Thu, 3 Jan 2019 20:25:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727261AbfACUZe (ORCPT ); Thu, 3 Jan 2019 15:25:34 -0500 Received: from gateway36.websitewelcome.com ([192.185.194.2]:12131 "EHLO gateway36.websitewelcome.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726864AbfACUZe (ORCPT ); Thu, 3 Jan 2019 15:25:34 -0500 X-Greylist: delayed 1425 seconds by postgrey-1.27 at vger.kernel.org; Thu, 03 Jan 2019 15:25:33 EST Received: from cm11.websitewelcome.com (cm11.websitewelcome.com [100.42.49.5]) by gateway36.websitewelcome.com (Postfix) with ESMTP id 9EA8C400CA6E5 for ; Thu, 3 Jan 2019 13:13:32 -0600 (CST) Received: from gator4166.hostgator.com ([108.167.133.22]) by cmsmtp with SMTP id f9BbgXPNFdnCef9BbgeMOh; Thu, 03 Jan 2019 14:01:47 -0600 X-Authority-Reason: nr=8 Received: from [189.250.78.104] (port=40274 helo=embeddedor) by gator4166.hostgator.com with esmtpa (Exim 4.91) (envelope-from ) id 1gf9Ba-001dCk-Vk; Thu, 03 Jan 2019 14:01:47 -0600 Date: Thu, 3 Jan 2019 14:01:46 -0600 From: "Gustavo A. R. Silva" To: Felix Kuehling , Harish Kasiviswanathan , Alex Deucher , Christian =?iso-8859-1?Q?K=F6nig?= , "David (ChunMing) Zhou" , David Airlie , Daniel Vetter Cc: amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, "Gustavo A. R. Silva" Subject: [PATCH v2] drm/amdgpu_vm: fix boolean expressions Message-ID: <20190103200146.GA26442@embeddedor> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.9.4 (2018-02-28) X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - gator4166.hostgator.com X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - embeddedor.com X-BWhitelist: no X-Source-IP: 189.250.78.104 X-Source-L: No X-Exim-ID: 1gf9Ba-001dCk-Vk X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: (embeddedor) [189.250.78.104]:40274 X-Source-Auth: gustavo@embeddedor.com X-Email-Count: 10 X-Source-Cap: Z3V6aWRpbmU7Z3V6aWRpbmU7Z2F0b3I0MTY2Lmhvc3RnYXRvci5jb20= X-Local-Domain: yes Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Fix boolean expressions by using logical AND operator '&&' instead of bitwise operator '&'. This issue was detected with the help of Coccinelle. Fixes: 9a4b7d4c769e ("drm/amdgpu: Add vm context module param") Cc: stable@vger.kernel.org Reviewed-by: Felix Kuehling Signed-off-by: Gustavo A. R. Silva --- Changes in v2: - Update Fixes tag. drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c index e73d152659a2..4cc0d1079935 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c @@ -3006,7 +3006,7 @@ int amdgpu_vm_init(struct amdgpu_device *adev, struct amdgpu_vm *vm, } DRM_DEBUG_DRIVER("VM update mode is %s\n", vm->use_cpu_for_update ? "CPU" : "SDMA"); - WARN_ONCE((vm->use_cpu_for_update & !amdgpu_gmc_vram_full_visible(&adev->gmc)), + WARN_ONCE((vm->use_cpu_for_update && !amdgpu_gmc_vram_full_visible(&adev->gmc)), "CPU update of VM recommended only for large BAR system\n"); vm->last_update = NULL; @@ -3136,7 +3136,7 @@ int amdgpu_vm_make_compute(struct amdgpu_device *adev, struct amdgpu_vm *vm, uns vm->pte_support_ats = pte_support_ats; DRM_DEBUG_DRIVER("VM update mode is %s\n", vm->use_cpu_for_update ? "CPU" : "SDMA"); - WARN_ONCE((vm->use_cpu_for_update & !amdgpu_gmc_vram_full_visible(&adev->gmc)), + WARN_ONCE((vm->use_cpu_for_update && !amdgpu_gmc_vram_full_visible(&adev->gmc)), "CPU update of VM recommended only for large BAR system\n"); if (vm->pasid) { -- 2.20.1