drm/amd/scheduler: don't oops on failure to load
authorDave Airlie <airlied@redhat.com>
Tue, 3 Nov 2015 16:10:03 +0000 (11:10 -0500)
committerAlex Deucher <alexander.deucher@amd.com>
Tue, 3 Nov 2015 16:15:29 +0000 (11:15 -0500)
In two places amdgpu tries to tear down something it hasn't
initalised when failing. This is what happens when you
enable experimental support on topaz which then fails in
ring init.

This patch allows it to fail cleanly.

agd: Split out from from the original patch since the
scheduler is a driver independent.

Reviewed-by: Chunming Zhou <david1.zhou@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
drivers/gpu/drm/amd/scheduler/gpu_scheduler.c

index 8dd7316b1d4f1674a9c62a373245c01a51290cf4..b3e84d0f4aced965dfe20ec4ea4c4a7d208bc88d 100644 (file)
@@ -468,5 +468,6 @@ int amd_sched_init(struct amd_gpu_scheduler *sched,
  */
 void amd_sched_fini(struct amd_gpu_scheduler *sched)
 {
-       kthread_stop(sched->thread);
+       if (sched->thread)
+               kthread_stop(sched->thread);
 }