On Sat, Aug 12, 2017 at 12:56 AM, Felix Kuehling <Felix.Kuehling at amd.com> wrote:
> From: Yong Zhao <Yong.Zhao at amd.com>
>
> Signed-off-by: Yong Zhao <Yong.Zhao at amd.com>
> Signed-off-by: Felix Kuehling <Felix.Kuehling at amd.com>
> ---
> drivers/gpu/drm/amd/amdkfd/kfd_device.c | 11 +++++++++--
> 1 file changed, 9 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device.c b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
> index f628ac3..e1c2ad2 100644
> --- a/drivers/gpu/drm/amd/amdkfd/kfd_device.c
> +++ b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
> @@ -103,6 +103,8 @@ static const struct kfd_device_info *lookup_device_info(unsigned short did)
> }
> }
>
> + WARN(1, "device is not added to supported_devices\n");
> +
I think WARN is a bit excessive here. Its not actually a warning - an
AMD gpu device is present but not supported in amdkfd.
Maybe a dev_info is more appropriate here.
Oded
> return NULL;
> }
>
> @@ -114,8 +116,10 @@ struct kfd_dev *kgd2kfd_probe(struct kgd_dev *kgd,
> const struct kfd_device_info *device_info =
> lookup_device_info(pdev->device);
>
> - if (!device_info)
> + if (!device_info) {
> + dev_err(kfd_device, "kgd2kfd_probe failed\n");
> return NULL;
> + }
>
> kfd = kzalloc(sizeof(*kfd), GFP_KERNEL);
> if (!kfd)
> @@ -364,8 +368,11 @@ int kgd2kfd_resume(struct kfd_dev *kfd)
>
> if (kfd->init_complete) {
> err = amd_iommu_init_device(kfd->pdev, pasid_limit);
> - if (err < 0)
> + if (err < 0) {
> + dev_err(kfd_device, "failed to initialize iommu\n");
> return -ENXIO;
> + }
> +
> amd_iommu_set_invalidate_ctx_cb(kfd->pdev,
> iommu_pasid_shutdown_callback);
> amd_iommu_set_invalid_ppr_cb(kfd->pdev, iommu_invalid_ppr_cb);
> --
> 2.7.4
>
With the above fixed, this patch is:
Reviewed-by: Oded Gabbay <oded.gabbay at gmail.com>
