lkml.org 
[lkml]   [2024]   [Jan]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 6.1 24/27] drm/amdgpu: Fix with right return code '-EIO' in 'amdgpu_gmc_vram_checking()'
    Date
    From: Srinivasan Shanmugam <srinivasan.shanmugam@amd.com>

    [ Upstream commit fac4ebd79fed60e79cccafdad45a2bb8d3795044 ]

    The amdgpu_gmc_vram_checking() function in emulation checks whether
    all of the memory range of shared system memory could be accessed by
    GPU, from this aspect, -EIO is returned for error scenarios.

    Fixes the below:
    drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c:919 gmc_v6_0_hw_init() warn: missing error code? 'r'
    drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c:1103 gmc_v7_0_hw_init() warn: missing error code? 'r'
    drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c:1223 gmc_v8_0_hw_init() warn: missing error code? 'r'
    drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c:2344 gmc_v9_0_hw_init() warn: missing error code? 'r'

    Cc: Xiaojian Du <Xiaojian.Du@amd.com>
    Cc: Lijo Lazar <lijo.lazar@amd.com>
    Cc: Christian König <christian.koenig@amd.com>
    Cc: Alex Deucher <alexander.deucher@amd.com>
    Signed-off-by: Srinivasan Shanmugam <srinivasan.shanmugam@amd.com>
    Suggested-by: Christian König <christian.koenig@amd.com>
    Reviewed-by: Christian König <christian.koenig@amd.com>
    Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 21 ++++++++++++++-------
    1 file changed, 14 insertions(+), 7 deletions(-)

    diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c
    index 2bc791ed8830..ea0fb079f942 100644
    --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c
    +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c
    @@ -808,19 +808,26 @@ int amdgpu_gmc_vram_checking(struct amdgpu_device *adev)
    * seconds, so here, we just pick up three parts for emulation.
    */
    ret = memcmp(vram_ptr, cptr, 10);
    - if (ret)
    - return ret;
    + if (ret) {
    + ret = -EIO;
    + goto release_buffer;
    + }

    ret = memcmp(vram_ptr + (size / 2), cptr, 10);
    - if (ret)
    - return ret;
    + if (ret) {
    + ret = -EIO;
    + goto release_buffer;
    + }

    ret = memcmp(vram_ptr + size - 10, cptr, 10);
    - if (ret)
    - return ret;
    + if (ret) {
    + ret = -EIO;
    + goto release_buffer;
    + }

    +release_buffer:
    amdgpu_bo_free_kernel(&vram_bo, &vram_gpu,
    &vram_ptr);

    - return 0;
    + return ret;
    }
    --
    2.43.0

    \
     
     \ /
      Last update: 2024-05-27 14:37    [W:3.828 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site