From patchwork Wed Dec 26 06:23:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kangjie Lu X-Patchwork-Id: 10743583 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 68EF56C2 for ; Thu, 27 Dec 2018 07:52:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 58F682878C for ; Thu, 27 Dec 2018 07:52:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4A424287CB; Thu, 27 Dec 2018 07:52:17 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id E84BD2878C for ; Thu, 27 Dec 2018 07:52:12 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4E3376E1B4; Thu, 27 Dec 2018 07:52:04 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mta-p6.oit.umn.edu (mta-p6.oit.umn.edu [134.84.196.206]) by gabe.freedesktop.org (Postfix) with ESMTPS id A62106E40A for ; Wed, 26 Dec 2018 06:24:26 +0000 (UTC) Received: from localhost (unknown [127.0.0.1]) by mta-p6.oit.umn.edu (Postfix) with ESMTP id 5D6BE950 for ; Wed, 26 Dec 2018 06:24:25 +0000 (UTC) X-Virus-Scanned: amavisd-new at umn.edu Received: from mta-p6.oit.umn.edu ([127.0.0.1]) by localhost (mta-p6.oit.umn.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id D7Zv-ze-j4ro for ; Wed, 26 Dec 2018 00:24:25 -0600 (CST) Received: from mail-io1-f72.google.com (mail-io1-f72.google.com [209.85.166.72]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mta-p6.oit.umn.edu (Postfix) with ESMTPS id 3495B92D for ; Wed, 26 Dec 2018 00:24:25 -0600 (CST) Received: by mail-io1-f72.google.com with SMTP id r7so2586409iom.22 for ; Tue, 25 Dec 2018 22:24:25 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=Ah9UrnxXN7i7/f+OebV6LtEy0PsZT62nZH6IXpAbhDw=; b=iyYEfRq/d+EY/qvNXv1PFgaMUBy2zVIfzNXVeNcXrRHEJrqLsixsbj/Ox+5mAF8zVo RdqgU6ZPYio+ZLHsaX/g0JRMzQo2QUXlDv7SfZ6J0QMgMbJtRqNEQ++UNnXNttwPl/TV wrwMEsIXUhD2FdiiJIcIcoz9Xc50jFn+dN28oF3L7bDuDXD0EsZGnA1ck7BdU7hrdo1Q Py7l+wG4uzR/DHXyl8q5T1FVI7LM9DYm+dNPAmf1plDmXcNxLAgvtP7IvrqtY0AIGAp5 xGkD2VgNDOf+7oQcM+IRrhRojtNKlpiHBAfrav/8A9aFUO0YcQLNbcoQR5HWTyIp1w8W 7eNw== X-Gm-Message-State: AA+aEWY0b4/K94D7onmFFh04i227kyiTH0qq5m/MvLdtHMAdV/SyrqTB Mr6Ex+e/0slr9JEueLjyw7LLFBldLmt0CpwQc5uPNT7McVygWBNbQXRqmVjpyLPWEyQYffQLEXg 3kG5PHYmRmw3wKqw488nGU+kocWKhOGiS X-Received: by 2002:a02:818c:: with SMTP id n12mr11682532jag.108.1545805464709; Tue, 25 Dec 2018 22:24:24 -0800 (PST) X-Google-Smtp-Source: AFSGD/UspA6kb9HRVAHf+Kyd0c8B58Y+rDMk2n0vt6joRBT1j2uVDPM0WrV0BkjJviFL7IXtn6sAow== X-Received: by 2002:a02:818c:: with SMTP id n12mr11682515jag.108.1545805464466; Tue, 25 Dec 2018 22:24:24 -0800 (PST) Received: from localhost.localdomain (host-173-230-104-22.mnmigsc.mn.minneapolis.us.clients.pavlovmedia.net. [173.230.104.22]) by smtp.gmail.com with ESMTPSA id 81sm15485012itz.15.2018.12.25.22.24.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 25 Dec 2018 22:24:23 -0800 (PST) From: Kangjie Lu To: kjlu@umn.edu Subject: [PATCH] gpu: drm: fix an improper check of amdgpu_bo_create_kernel Date: Wed, 26 Dec 2018 00:23:45 -0600 Message-Id: <20181226062348.75519-1-kjlu@umn.edu> X-Mailer: git-send-email 2.17.2 (Apple Git-113) X-Mailman-Approved-At: Thu, 27 Dec 2018 07:52:03 +0000 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Airlie , Feifei Xu , David Francis , linux-kernel@vger.kernel.org, amd-gfx@lists.freedesktop.org, Huang Rui , dri-devel@lists.freedesktop.org, pakki001@umn.edu, Alex Deucher , Likun Gao , Rex Zhu , =?utf-8?q?Christian_K=C3=B6nig?= , Hawking Zhang MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP adev->firmware.fw_buf being not NULL may not indicate kernel buffer is created successful. A better way is to check the status (return value) of it. The fix does so. Signed-off-by: Kangjie Lu --- drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c index 7b33867036e7..ba3c1cfb2c35 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c @@ -422,13 +422,19 @@ static int amdgpu_ucode_patch_jt(struct amdgpu_firmware_info *ucode, int amdgpu_ucode_create_bo(struct amdgpu_device *adev) { + int ret; + if (adev->firmware.load_type != AMDGPU_FW_LOAD_DIRECT) { - amdgpu_bo_create_kernel(adev, adev->firmware.fw_size, PAGE_SIZE, - amdgpu_sriov_vf(adev) ? AMDGPU_GEM_DOMAIN_VRAM : AMDGPU_GEM_DOMAIN_GTT, - &adev->firmware.fw_buf, - &adev->firmware.fw_buf_mc, - &adev->firmware.fw_buf_ptr); - if (!adev->firmware.fw_buf) { + ret = + amdgpu_bo_create_kernel(adev, + adev->firmware.fw_size, + PAGE_SIZE, + amdgpu_sriov_vf(adev) ? AMDGPU_GEM_DOMAIN_VRAM : + AMDGPU_GEM_DOMAIN_GTT, + &adev->firmware.fw_buf, + &adev->firmware.fw_buf_mc, + &adev->firmware.fw_buf_ptr); + if (ret) { dev_err(adev->dev, "failed to create kernel buffer for firmware.fw_buf\n"); return -ENOMEM; } else if (amdgpu_sriov_vf(adev)) {