lkml.org 
[lkml]   [2020]   [Jul]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.7 141/166] drm/amdgpu: dont do soft recovery if gpu_recovery=0
    Date
    From: Marek Olšák <marek.olsak@amd.com>

    commit f4892c327a8e5df7ce16cab40897daf90baf6bec upstream.

    It's impossible to debug shader hangs with soft recovery.

    Signed-off-by: Marek Olšák <marek.olsak@amd.com>
    Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
    Reviewed-by: Christian König <christian.koenig@amd.com>
    Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
    Cc: stable@vger.kernel.org
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c
    +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c
    @@ -36,7 +36,8 @@ static void amdgpu_job_timedout(struct d

    memset(&ti, 0, sizeof(struct amdgpu_task_info));

    - if (amdgpu_ring_soft_recovery(ring, job->vmid, s_job->s_fence->parent)) {
    + if (amdgpu_gpu_recovery &&
    + amdgpu_ring_soft_recovery(ring, job->vmid, s_job->s_fence->parent)) {
    DRM_ERROR("ring %s timeout, but soft recovered\n",
    s_job->sched->name);
    return;

    \
     
     \ /
      Last update: 2020-07-14 20:59    [W:4.053 / U:0.536 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site