Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...

[karo-tx-linux.git] / drivers / gpu / drm / radeon / rv770.c

diff --git a/drivers/gpu/drm/radeon/rv770.c b/drivers/gpu/drm/radeon/rv770.c
index fbb0357f1ec32e21da862b2e17fee781599da337..3bcb66e52786c3ef0018d8e2c43bf29d3825b154 100644 (file)
--- a/drivers/gpu/drm/radeon/rv770.c
+++ b/drivers/gpu/drm/radeon/rv770.c
@@ -892,6 +892,14 @@ static int rv770_startup(struct radeon_device *rdev)
        }
        rv770_gpu_init(rdev);
 
+       if (!rdev->r600_blit.shader_obj) {
+               r = r600_blit_init(rdev);
+               if (r) {
+                       DRM_ERROR("radeon: failed blitter (%d).\n", r);
+                       return r;
+               }
+       }
+
        r = radeon_bo_reserve(rdev->r600_blit.shader_obj, false);
        if (unlikely(r != 0))
                return r;
@@ -1051,12 +1059,6 @@ int rv770_init(struct radeon_device *rdev)
        if (r)
                return r;
 
-       r = r600_blit_init(rdev);
-       if (r) {
-               DRM_ERROR("radeon: failed blitter (%d).\n", r);
-               return r;
-       }
-
        rdev->accel_working = true;
        r = rv770_startup(rdev);
        if (r) {