scsi_dh: don't try to load a device handler during async probing

[karo-tx-linux.git] / drivers / gpu / drm / amd / amdgpu / amdgpu_vce.c

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
index 76982438d1c6ba32a5d9fce5ebb8ba2f76c2ed01..3cab96c42aa8843487190248b98d999fb6b3598c 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
@@ -838,6 +838,10 @@ int amdgpu_vce_ring_test_ib(struct amdgpu_ring *ring)
        struct fence *fence = NULL;
        int r;
 
+       /* skip vce ring1 ib test for now, since it's not reliable */
+       if (ring == &ring->adev->vce.ring[1])
+               return 0;
+
        r = amdgpu_vce_get_create_msg(ring, 1, NULL);
        if (r) {
                DRM_ERROR("amdgpu: failed to get create msg (%d).\n", r);