diff options
| author | Alex Deucher <alexdeucher@gmail.com> | 2009-12-15 23:15:07 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-12-16 06:39:24 +0100 |
| commit | 7923c615b811945a9d9f456c92a7a32c34167458 (patch) | |
| tree | 8b598db5a5f73cc3d999bef0c1f4ce276d4e9d9c /drivers/gpu/drm/radeon/r600.c | |
| parent | drm/radeon/kms: Return to userspace on ERESTARTSYS (diff) | |
| download | linux-7923c615b811945a9d9f456c92a7a32c34167458.tar.xz linux-7923c615b811945a9d9f456c92a7a32c34167458.zip | |
drm/radeon/kms: make sure mc is initialized before mapping blit bo
We need to make sure the the MC is intialized before we map the
blit shader object on r6xx+.
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/r600.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/r600.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c index f5cf874dc62a..e145faac9904 100644 --- a/drivers/gpu/drm/radeon/r600.c +++ b/drivers/gpu/drm/radeon/r600.c @@ -1863,6 +1863,14 @@ int r600_startup(struct radeon_device *rdev) } r600_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; @@ -2038,12 +2046,6 @@ int r600_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 = r600_startup(rdev); if (r) { |