diff options
| author | Ding Pixel <pding@amd.com> | 2017-01-18 17:26:38 +0800 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2017-01-23 16:47:01 -0500 |
| commit | c5f21c9f878b8dcd54d0b9739c025ca73cb4c091 (patch) | |
| tree | 1eb4020ee24a97f3c59e02d387856feca0278a8c /drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | |
| parent | 932790109f62aa52bdb4bb62aa66653c0b51bc75 (diff) | |
| download | talos-obmc-linux-c5f21c9f878b8dcd54d0b9739c025ca73cb4c091.tar.gz talos-obmc-linux-c5f21c9f878b8dcd54d0b9739c025ca73cb4c091.zip | |
drm/amdgpu: check ring being ready before using
Return success when the ring is properly initialized, otherwise return
failure.
Tonga SRIOV VF doesn't have UVD and VCE engines, the initialization of
these IPs is bypassed. The system crashes if application submit IB to
their rings which are not ready to use. It could be a common issue if
IP having ring buffer is disabled for some reason on specific ASIC, so
it should check the ring being ready to use.
Bug: amdgpu_test crashes system on Tonga VF.
Signed-off-by: Ding Pixel <Pixel.Ding@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c index 29d6d84d1c28..41e41f90265d 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c @@ -83,6 +83,13 @@ int amdgpu_cs_get_ring(struct amdgpu_device *adev, u32 ip_type, } break; } + + if (!(*out_ring && (*out_ring)->adev)) { + DRM_ERROR("Ring %d is not initialized on IP %d\n", + ring, ip_type); + return -EINVAL; + } + return 0; } |
