> -----Original Message-----
> From: Kangjie Lu [mailto:k...@umn.edu]
> Sent: Wednesday, December 26, 2018 2:24 PM
> To: k...@umn.edu
> Cc: pakki...@umn.edu; Deucher, Alexander
> <alexander.deuc...@amd.com>; Koenig, Christian
> <christian.koe...@amd.com>; Zhou, David(ChunMing)
> <david1.z...@amd.com>; David Airlie <airl...@linux.ie>; Daniel Vetter
> <dan...@ffwll.ch>; Zhu, Rex <rex....@amd.com>; Huang, Ray
> <ray.hu...@amd.com>; Zhang, Hawking <hawking.zh...@amd.com>; Xu,
> Feifei <feifei...@amd.com>; Gao, Likun <likun....@amd.com>; Francis,
> David <david.fran...@amd.com>; amd-...@lists.freedesktop.org; dri-
> de...@lists.freedesktop.org; linux-ker...@vger.kernel.org
> Subject: [PATCH] gpu: drm: fix an improper check of
> amdgpu_bo_create_kernel
>
> 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 object
will be created.
But using "ret" to align with other function should be better as the return
status. Thanks.
Reviewed-by: Huang Rui <ray.hu...@amd.com>
>
> Signed-off-by: Kangjie Lu <k...@umn.edu>
> ---
> 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)) {
> --
> 2.17.2 (Apple Git-113)
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
