Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   "Huang, Ray" <Ray.Huang@amd.com>
To:     Kangjie Lu <kjlu@umn.edu>
CC:     "pakki001@umn.edu" <pakki001@umn.edu>,
        "Deucher, Alexander" <Alexander.Deucher@amd.com>,
        "Koenig, Christian" <Christian.Koenig@amd.com>,
        "Zhou, David(ChunMing)" <David1.Zhou@amd.com>,
        David Airlie <airlied@linux.ie>,
        Daniel Vetter <daniel@ffwll.ch>, "Zhu, Rex" <Rex.Zhu@amd.com>,
        "Zhang, Hawking" <Hawking.Zhang@amd.com>,
        "Xu, Feifei" <Feifei.Xu@amd.com>, "Gao, Likun" <Likun.Gao@amd.com>,
        "Francis, David" <David.Francis@amd.com>,
        "amd-gfx@lists.freedesktop.org" <amd-gfx@lists.freedesktop.org>,
        "dri-devel@lists.freedesktop.org" <dri-devel@lists.freedesktop.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: RE: [PATCH] gpu: drm: fix an improper check of
 amdgpu_bo_create_kernel
Thread-Topic: [PATCH] gpu: drm: fix an improper check of
 amdgpu_bo_create_kernel
Thread-Index: AQHUnOOoEcshgKVKEU2ZwQMEVbCPbaWQrnog
Date:   Wed, 26 Dec 2018 08:29:29 +0000
Message-ID: <BYAPR12MB3016F58D77B4574AED72C0D4ECB50@BYAPR12MB3016.namprd12.prod.outlook.com>
References: <20181226062348.75519-1-kjlu@umn.edu>
In-Reply-To: <20181226062348.75519-1-kjlu@umn.edu>
Accept-Language: en-US
Content-Language: en-US
received-spf: None (protection.outlook.com: amd.com does not designate
 permitted sender hosts)
spamdiagnosticoutput: 1:99
spamdiagnosticmetadata: NSPM
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-Network-Message-Id: 3cd9defc-81cb-42e1-eadf-08d66b0c4107
X-MS-Exchange-CrossTenant-originalarrivaltime: 26 Dec 2018 08:29:29.2850
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 3dd8961f-e488-4e60-8e11-a82d994e183d
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR12MB3382
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

> -----Original Message-----
> From: Kangjie Lu [mailto:kjlu@umn.edu]
> Sent: Wednesday, December 26, 2018 2:24 PM
> To: kjlu@umn.edu
> Cc: pakki001@umn.edu; Deucher, Alexander
> <Alexander.Deucher@amd.com>; Koenig, Christian
> <Christian.Koenig@amd.com>; Zhou, David(ChunMing)
> <David1.Zhou@amd.com>; David Airlie <airlied@linux.ie>; Daniel Vetter
> <daniel@ffwll.ch>; Zhu, Rex <Rex.Zhu@amd.com>; Huang, Ray
> <Ray.Huang@amd.com>; Zhang, Hawking <Hawking.Zhang@amd.com>; Xu,
> Feifei <Feifei.Xu@amd.com>; Gao, Likun <Likun.Gao@amd.com>; Francis,
> David <David.Francis@amd.com>; amd-gfx@lists.freedesktop.org; dri-
> devel@lists.freedesktop.org; linux-kernel@vger.kernel.org
> Subject: [PATCH] gpu: drm: fix an improper check of
> amdgpu_bo_create_kernel
>=20
> 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.

Actually, it is the same. If bo is created successfully, the amdgpu_bo obje=
ct will be created.
But using "ret" to align with other function should be better as the return=
 status.  Thanks.

Reviewed-by: Huang Rui <ray.huang@amd.com>

>=20
> Signed-off-by: Kangjie Lu <kjlu@umn.edu>
> ---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 18 ++++++++++++------
>  1 file changed, 12 insertions(+), 6 deletions(-)
>=20
> 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,
>=20
>  int amdgpu_ucode_create_bo(struct amdgpu_device *adev)
>  {
> +	int ret;
> +
>  	if (adev->firmware.load_type !=3D 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 =3D
> +			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)) {
> --
> 2.17.2 (Apple Git-113)