drm/radeon/kms: add support for multiple fence queues v2

[deliverable/linux.git] / drivers / gpu / drm / radeon / radeon_ring.c

diff --git a/drivers/gpu/drm/radeon/radeon_ring.c b/drivers/gpu/drm/radeon/radeon_ring.c
index f3d7d224eebf7406255214bc0e368b729222374a..c232317b1dd21d568d24c149027b5c34509f4f73 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon_ring.c
+++ b/drivers/gpu/drm/radeon/radeon_ring.c
@@ -113,7 +113,7 @@ int radeon_ib_get(struct radeon_device *rdev, struct radeon_ib **ib)
        int r = 0, i, c;
 
        *ib = NULL;
-       r = radeon_fence_create(rdev, &fence);
+       r = radeon_fence_create(rdev, &fence, RADEON_RING_TYPE_GFX_INDEX);
        if (r) {
                dev_err(rdev->dev, "failed to create fence for new IB\n");
                return r;
@@ -314,7 +314,7 @@ int radeon_ring_alloc(struct radeon_device *rdev, unsigned ndw)
                if (ndw < rdev->cp.ring_free_dw) {
                        break;
                }
-               r = radeon_fence_wait_next(rdev);
+               r = radeon_fence_wait_next(rdev, RADEON_RING_TYPE_GFX_INDEX);
                if (r)
                        return r;
        }