When selecting the engine, return an error if the GPU
doesn't have UVD.

Signed-off-by: Alex Deucher <alexander.deucher at amd.com>
Cc: stable at vger.kernel.org
---
 drivers/gpu/drm/radeon/radeon_cs.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/radeon/radeon_cs.c 
b/drivers/gpu/drm/radeon/radeon_cs.c
index dfb5a1d..fa7839b 100644
--- a/drivers/gpu/drm/radeon/radeon_cs.c
+++ b/drivers/gpu/drm/radeon/radeon_cs.c
@@ -145,7 +145,10 @@ static int radeon_cs_get_ring(struct radeon_cs_parser *p, 
u32 ring, s32 priority
                }
                break;
        case RADEON_CS_RING_UVD:
-               p->ring = R600_RING_TYPE_UVD_INDEX;
+               if (p->rdev->has_uvd)
+                       p->ring = R600_RING_TYPE_UVD_INDEX;
+               else
+                       return -EINVAL;
                break;
        }
        return 0;
-- 
1.8.3.1

Reply via email to