drm/amdgpu: Reorder uvd ring init before uvd resume

[linux-2.6-microblaze.git] / drivers / gpu / drm / amd / amdgpu / uvd_v5_0.c

diff --git a/drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c b/drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c
index 1c5e127..ee8cd06 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c
@@ -113,16 +113,16 @@ static int uvd_v5_0_sw_init(void *handle)
        if (r)
                return r;
 
-       r = amdgpu_uvd_resume(adev);
-       if (r)
-               return r;
-
        ring = &adev->uvd.inst->ring;
        sprintf(ring->name, "uvd");
        r = amdgpu_ring_init(adev, ring, 512, &adev->uvd.inst->irq, 0);
        if (r)
                return r;
 
+       r = amdgpu_uvd_resume(adev);
+       if (r)
+               return r;
+
        r = amdgpu_uvd_entity_init(adev);
 
        return r;