diff options
author | Alex Deucher <alexdeucher@gmail.com> | 2009-12-15 17:15:07 -0500 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2009-12-16 00:39:24 -0500 |
commit | 7923c615b811945a9d9f456c92a7a32c34167458 (patch) | |
tree | 8b598db5a5f73cc3d999bef0c1f4ce276d4e9d9c /drivers/gpu/drm/radeon/rv770.c | |
parent | f89551bfe953a144f7d4918ca4c12e11de1e455d (diff) |
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/rv770.c')
-rw-r--r-- | drivers/gpu/drm/radeon/rv770.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/drivers/gpu/drm/radeon/rv770.c b/drivers/gpu/drm/radeon/rv770.c index 2d124bb57762..f58dc6710802 100644 --- 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) | |||
892 | } | 892 | } |
893 | rv770_gpu_init(rdev); | 893 | rv770_gpu_init(rdev); |
894 | 894 | ||
895 | if (!rdev->r600_blit.shader_obj) { | ||
896 | r = r600_blit_init(rdev); | ||
897 | if (r) { | ||
898 | DRM_ERROR("radeon: failed blitter (%d).\n", r); | ||
899 | return r; | ||
900 | } | ||
901 | } | ||
902 | |||
895 | r = radeon_bo_reserve(rdev->r600_blit.shader_obj, false); | 903 | r = radeon_bo_reserve(rdev->r600_blit.shader_obj, false); |
896 | if (unlikely(r != 0)) | 904 | if (unlikely(r != 0)) |
897 | return r; | 905 | return r; |
@@ -1051,12 +1059,6 @@ int rv770_init(struct radeon_device *rdev) | |||
1051 | if (r) | 1059 | if (r) |
1052 | return r; | 1060 | return r; |
1053 | 1061 | ||
1054 | r = r600_blit_init(rdev); | ||
1055 | if (r) { | ||
1056 | DRM_ERROR("radeon: failed blitter (%d).\n", r); | ||
1057 | return r; | ||
1058 | } | ||
1059 | |||
1060 | rdev->accel_working = true; | 1062 | rdev->accel_working = true; |
1061 | r = rv770_startup(rdev); | 1063 | r = rv770_startup(rdev); |
1062 | if (r) { | 1064 | if (r) { |