> -----Original Message----- > From: Kangjie Lu [mailto:kjlu@xxxxxxx] > Sent: Wednesday, December 26, 2018 2:24 PM > To: kjlu@xxxxxxx > Cc: pakki001@xxxxxxx; Deucher, Alexander > <Alexander.Deucher@xxxxxxx>; Koenig, Christian > <Christian.Koenig@xxxxxxx>; Zhou, David(ChunMing) > <David1.Zhou@xxxxxxx>; David Airlie <airlied@xxxxxxxx>; Daniel Vetter > <daniel@xxxxxxxx>; Zhu, Rex <Rex.Zhu@xxxxxxx>; Huang, Ray > <Ray.Huang@xxxxxxx>; Zhang, Hawking <Hawking.Zhang@xxxxxxx>; Xu, > Feifei <Feifei.Xu@xxxxxxx>; Gao, Likun <Likun.Gao@xxxxxxx>; Francis, > David <David.Francis@xxxxxxx>; amd-gfx@xxxxxxxxxxxxxxxxxxxxx; dri- > devel@xxxxxxxxxxxxxxxxxxxxx; linux-kernel@xxxxxxxxxxxxxxx > 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.huang@xxxxxxx> > > Signed-off-by: Kangjie Lu <kjlu@xxxxxxx> > --- > 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) _______________________________________________ amd-gfx mailing list amd-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/amd-gfx
