]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
drm/amdgpu: disable VCN2.5 ib test for Arcturus sriov
authorJane Jian <Jane.Jian@amd.com>
Wed, 18 Dec 2019 10:53:46 +0000 (18:53 +0800)
committerAlex Deucher <alexander.deucher@amd.com>
Mon, 23 Dec 2019 19:56:15 +0000 (14:56 -0500)
currently using TMR loading VCN fw MMSCH would fail
to init after FLR, just disable ib test for temporarily
daily testing, continuing debug with mm team.

Signed-off-by: Jane Jian <Jane.Jian@amd.com>
Acked-by: Leo Liu <leo.liu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c

index 623b9f9ef1ea2553f3a91554a038a96f687aae2d..ed106d99d078b79156107fb649cfe921db0ecba2 100644 (file)
@@ -491,9 +491,14 @@ static int amdgpu_vcn_dec_get_destroy_msg(struct amdgpu_ring *ring, uint32_t han
 
 int amdgpu_vcn_dec_ring_test_ib(struct amdgpu_ring *ring, long timeout)
 {
+       struct amdgpu_device *adev = ring->adev;
        struct dma_fence *fence;
        long r;
 
+       /* temporarily disable ib test for sriov */
+       if (amdgpu_sriov_vf(adev))
+               return 0;
+
        r = amdgpu_vcn_dec_get_create_msg(ring, 1, NULL);
        if (r)
                goto error;
@@ -649,10 +654,15 @@ static int amdgpu_vcn_enc_get_destroy_msg(struct amdgpu_ring *ring, uint32_t han
 
 int amdgpu_vcn_enc_ring_test_ib(struct amdgpu_ring *ring, long timeout)
 {
+       struct amdgpu_device *adev = ring->adev;
        struct dma_fence *fence = NULL;
        struct amdgpu_bo *bo = NULL;
        long r;
 
+       /* temporarily disable ib test for sriov */
+       if (amdgpu_sriov_vf(adev))
+               return 0;
+
        r = amdgpu_bo_create_reserved(ring->adev, 128 * 1024, PAGE_SIZE,
                                      AMDGPU_GEM_DOMAIN_VRAM,
                                      &bo, NULL, NULL);