Revert "drm/v3d: Add job to pending list if the reset was skipped"

This reverts commit 59a7f3a.

Author: popcornmix

drivers/gpu/drm/v3d/v3d_sched.c

@@ -744,6 +744,11 @@ v3d_gpu_reset_for_timeout(struct v3d_dev *v3d, struct drm_sched_job *sched_job)
 	return DRM_GPU_SCHED_STAT_NOMINAL;
 }
 
+/* If the current address or return address have changed, then the GPU
+ * has probably made progress and we should delay the reset.  This
+ * could fail if the GPU got in an infinite loop in the CL, but that
+ * is pretty unlikely outside of an i-g-t testcase.
+ */
 static enum drm_gpu_sched_stat
 v3d_cl_job_timedout(struct drm_sched_job *sched_job, enum v3d_queue q,
 		    u32 *timedout_ctca, u32 *timedout_ctra)
@@ -753,16 +758,9 @@ v3d_cl_job_timedout(struct drm_sched_job *sched_job, enum v3d_queue q,
 	u32 ctca = V3D_CORE_READ(0, V3D_CLE_CTNCA(q));
 	u32 ctra = V3D_CORE_READ(0, V3D_CLE_CTNRA(q));
 
-	/* If the current address or return address have changed, then the GPU
-	 * has probably made progress and we should delay the reset. This
-	 * could fail if the GPU got in an infinite loop in the CL, but that
-	 * is pretty unlikely outside of an i-g-t testcase.
-	 */
 	if (*timedout_ctca != ctca || *timedout_ctra != ctra) {
 		*timedout_ctca = ctca;
 		*timedout_ctra = ctra;
-
-		list_add(&sched_job->list, &sched_job->sched->pending_list);
 		return DRM_GPU_SCHED_STAT_NOMINAL;
 	}
 
@@ -802,13 +800,11 @@ v3d_csd_job_timedout(struct drm_sched_job *sched_job)
 	struct v3d_dev *v3d = job->base.v3d;
 	u32 batches = V3D_CORE_READ(0, V3D_CSD_CURRENT_CFG4(v3d->ver));
 
-	/* If we've made progress, skip reset, add the job to the pending
-	 * list, and let the timer get rearmed.
+	/* If we've made progress, skip reset and let the timer get
+	 * rearmed.
 	 */
 	if (job->timedout_batches != batches) {
 		job->timedout_batches = batches;
-
-		list_add(&sched_job->list, &sched_job->sched->pending_list);
 		return DRM_GPU_SCHED_STAT_NOMINAL;
 	}