lkml.org 
[lkml]   [2021]   [Nov]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 215/575] drm/amdkfd: fix resume error when iommu disabled in Picasso
    Date
    From: Yifan Zhang <yifan1.zhang@amd.com>

    [ Upstream commit 6f4b590aae217da16cfa44039a2abcfb209137ab ]

    When IOMMU disabled in sbios and kfd in iommuv2 path,
    IOMMU resume failure blocks system resume. Don't allow kfd to
    use iommu v2 when iommu is disabled.

    Reported-by: youling <youling257@gmail.com>
    Tested-by: youling <youling257@gmail.com>
    Signed-off-by: Yifan Zhang <yifan1.zhang@amd.com>
    Reviewed-by: James Zhu <James.Zhu@amd.com>
    Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/gpu/drm/amd/amdkfd/kfd_device.c | 1 +
    1 file changed, 1 insertion(+)

    diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device.c b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
    index 903170e59342c..5751bddc9cadd 100644
    --- a/drivers/gpu/drm/amd/amdkfd/kfd_device.c
    +++ b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
    @@ -744,6 +744,7 @@ bool kgd2kfd_device_init(struct kfd_dev *kfd,
    kfd_double_confirm_iommu_support(kfd);

    if (kfd_iommu_device_init(kfd)) {
    + kfd->use_iommu_v2 = false;
    dev_err(kfd_device, "Error initializing iommuv2\n");
    goto device_iommu_error;
    }
    --
    2.33.0


    \
     
     \ /
      Last update: 2021-11-16 03:09    [W:4.023 / U:0.324 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site