diff options
Diffstat (limited to 'drivers/gpu/drm/radeon/r600.c')
-rw-r--r-- | drivers/gpu/drm/radeon/r600.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c index b833b4b97162..8c94040cb7f2 100644 --- a/drivers/gpu/drm/radeon/r600.c +++ b/drivers/gpu/drm/radeon/r600.c | |||
@@ -1861,6 +1861,12 @@ int r600_startup(struct radeon_device *rdev) | |||
1861 | return r; | 1861 | return r; |
1862 | } | 1862 | } |
1863 | r600_gpu_init(rdev); | 1863 | r600_gpu_init(rdev); |
1864 | r = r600_blit_init(rdev); | ||
1865 | if (r) { | ||
1866 | r600_blit_fini(rdev); | ||
1867 | rdev->asic->copy = NULL; | ||
1868 | dev_warn(rdev->dev, "failed blitter (%d) falling back to memcpy\n", r); | ||
1869 | } | ||
1864 | /* pin copy shader into vram */ | 1870 | /* pin copy shader into vram */ |
1865 | if (rdev->r600_blit.shader_obj) { | 1871 | if (rdev->r600_blit.shader_obj) { |
1866 | r = radeon_bo_reserve(rdev->r600_blit.shader_obj, false); | 1872 | r = radeon_bo_reserve(rdev->r600_blit.shader_obj, false); |
@@ -2045,12 +2051,6 @@ int r600_init(struct radeon_device *rdev) | |||
2045 | r = r600_pcie_gart_init(rdev); | 2051 | r = r600_pcie_gart_init(rdev); |
2046 | if (r) | 2052 | if (r) |
2047 | return r; | 2053 | return r; |
2048 | r = r600_blit_init(rdev); | ||
2049 | if (r) { | ||
2050 | r600_blit_fini(rdev); | ||
2051 | rdev->asic->copy = NULL; | ||
2052 | dev_warn(rdev->dev, "failed blitter (%d) falling back to memcpy\n", r); | ||
2053 | } | ||
2054 | 2054 | ||
2055 | rdev->accel_working = true; | 2055 | rdev->accel_working = true; |
2056 | r = r600_startup(rdev); | 2056 | r = r600_startup(rdev); |