openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/radeon/kms: rv770 blit init called too late. 

re-align with r600 code, to init blit earlier.

Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Dave Airlie 2009-09-18 18:33:07 +10:00
parent fc30b8efbe
commit 9052aa2458
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/gpu/drm/radeon/rv770.c
View File

@ -860,6 +860,14 @@ static int rv770_startup(struct radeon_device *rdev)
if (r)
return r;
rv770_gpu_init(rdev);
r = radeon_object_pin(rdev->r600_blit.shader_obj, RADEON_GEM_DOMAIN_VRAM,
&rdev->r600_blit.shader_gpu_addr);
if (r) {
DRM_ERROR("failed to pin blit object %d\n", r);
return r;
}
r = radeon_ring_init(rdev, rdev->cp.ring_size);
if (r)
return r;
@ -993,6 +1001,12 @@ int rv770_init(struct radeon_device *rdev)
return r;
rdev->accel_working = true;
r = r600_blit_init(rdev);
if (r) {
DRM_ERROR("radeon: failled blitter (%d).\n", r);
rdev->accel_working = false;
}
r = rv770_startup(rdev);
if (r) {
if (rdev->flags & RADEON_IS_AGP) {
@ -1004,11 +1018,6 @@ int rv770_init(struct radeon_device *rdev)
rdev->accel_working = false;
}
if (rdev->accel_working) {
r = r600_blit_init(rdev);
if (r) {
DRM_ERROR("radeon: failled blitter (%d).\n", r);
rdev->accel_working = false;
}
r = radeon_ib_pool_init(rdev);
if (r) {
DRM_ERROR("radeon: failled initializing IB pool (%d).\n", r);