lkml.org 
[lkml]   [2021]   [Dec]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 025/132] drm/amdgpu: init iommu after amdkfd device init
    Date
    From: Yifan Zhang <yifan1.zhang@amd.com>

    commit 714d9e4574d54596973ee3b0624ee4a16264d700 upstream.

    This patch is to fix clinfo failure in Raven/Picasso:

    Number of platforms: 1
    Platform Profile: FULL_PROFILE
    Platform Version: OpenCL 2.2 AMD-APP (3364.0)
    Platform Name: AMD Accelerated Parallel Processing
    Platform Vendor: Advanced Micro Devices, Inc.
    Platform Extensions: cl_khr_icd cl_amd_event_callback

    Platform Name: AMD Accelerated Parallel Processing Number of devices: 0

    Signed-off-by: Yifan Zhang <yifan1.zhang@amd.com>
    Reviewed-by: James Zhu <James.Zhu@amd.com>
    Tested-by: James Zhu <James.Zhu@amd.com>
    Acked-by: Felix Kuehling <Felix.Kuehling@amd.com>
    Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 8 ++++----
    1 file changed, 4 insertions(+), 4 deletions(-)

    --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
    +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
    @@ -2220,10 +2220,6 @@ static int amdgpu_device_ip_init(struct
    if (r)
    goto init_failed;

    - r = amdgpu_amdkfd_resume_iommu(adev);
    - if (r)
    - goto init_failed;
    -
    r = amdgpu_device_ip_hw_init_phase1(adev);
    if (r)
    goto init_failed;
    @@ -2259,6 +2255,10 @@ static int amdgpu_device_ip_init(struct
    amdgpu_xgmi_add_device(adev);
    amdgpu_amdkfd_device_init(adev);

    + r = amdgpu_amdkfd_resume_iommu(adev);
    + if (r)
    + goto init_failed;
    +
    amdgpu_fru_get_product_info(adev);

    init_failed:

    \
     
     \ /
      Last update: 2021-12-13 10:52    [W:4.239 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site