diff options
| author | Dave Airlie <airlied@redhat.com> | 2009-12-18 09:56:49 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-12-18 09:56:49 +1000 |
| commit | dcd6dfcfe959bade75fbf49499775985d2cac5d5 (patch) | |
| tree | 45e37b24d7e34a1bdefe04e65633168873476ca7 /drivers/gpu/drm/radeon/r600.c | |
| parent | cbc8cc049aefd571ebc3c255dc3e265f736751c0 (diff) | |
| parent | d785d78bbdb53580b12c40e820af5a3281ce2fc8 (diff) | |
| download | op-kernel-dev-dcd6dfcfe959bade75fbf49499775985d2cac5d5.zip op-kernel-dev-dcd6dfcfe959bade75fbf49499775985d2cac5d5.tar.gz | |
Merge branch 'drm-linus' into drm-core-next
Diffstat (limited to 'drivers/gpu/drm/radeon/r600.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/r600.c | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c index f5cf874..5c6058c 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) { @@ -2065,6 +2067,10 @@ int r600_init(struct radeon_device *rdev) rdev->accel_working = false; } } + + r = r600_audio_init(rdev); + if (r) + return r; /* TODO error handling */ return 0; } @@ -2073,6 +2079,7 @@ void r600_fini(struct radeon_device *rdev) /* Suspend operations */ r600_suspend(rdev); + r600_audio_fini(rdev); r600_blit_fini(rdev); r600_irq_fini(rdev); radeon_irq_kms_fini(rdev); |
