]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
drm/amdgpu: add reset source in various cases
authorEric Huang <jinhuieric.huang@amd.com>
Tue, 4 Jun 2024 15:46:56 +0000 (11:46 -0400)
committerAlex Deucher <alexander.deucher@amd.com>
Fri, 14 Jun 2024 20:15:58 +0000 (16:15 -0400)
To fullfill the reset event description.

Suggested-by: Lijo Lazar <Lijo.Lazar@amd.com>
Signed-off-by: Eric Huang <jinhuieric.huang@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
drivers/gpu/drm/amd/amdgpu/amdgpu_job.c
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c

index 10832b4704484b9d308beb47375240942dd93a0f..dff7033f2026db87b93b57473d9c74fbe7396965 100644 (file)
@@ -980,6 +980,7 @@ static void amdgpu_debugfs_reset_work(struct work_struct *work)
 
        reset_context.method = AMD_RESET_METHOD_NONE;
        reset_context.reset_req_dev = adev;
+       reset_context.src = AMDGPU_RESET_SRC_USER;
        set_bit(AMDGPU_NEED_FULL_RESET, &reset_context.flags);
 
        amdgpu_device_gpu_recover(adev, NULL, &reset_context);
index e4742b65032d1dce16db69ea086c86dd4895e610..cf0c4470ab9c6cb543ef598fa279562e654e736e 100644 (file)
@@ -77,6 +77,7 @@ static enum drm_gpu_sched_stat amdgpu_job_timedout(struct drm_sched_job *s_job)
 
                reset_context.method = AMD_RESET_METHOD_NONE;
                reset_context.reset_req_dev = adev;
+               reset_context.src = AMDGPU_RESET_SRC_JOB;
                clear_bit(AMDGPU_NEED_FULL_RESET, &reset_context.flags);
 
                r = amdgpu_device_gpu_recover(ring->adev, job, &reset_context);
index b3d11703df042c0cd535500de73d6a3c150b53c3..fd6a06bd2683232c3e7ff517a8f0cc753bf7234a 100644 (file)
@@ -2487,6 +2487,7 @@ static void amdgpu_ras_do_recovery(struct work_struct *work)
 
                reset_context.method = AMD_RESET_METHOD_NONE;
                reset_context.reset_req_dev = adev;
+               reset_context.src = AMDGPU_RESET_SRC_RAS;
 
                /* Perform full reset in fatal error mode */
                if (!amdgpu_ras_is_poison_mode_supported(ras->adev))