Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6

* 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
  drm/radeon/kms: fix r100->r500 CS checker for compressed textures. (v2)
  drm/radeon/kms: allow for texture tiling
  drm/radeon/kms: init pm on all chipsets
  drm/radeon/kms: HDMI support for R600 KMS
  drm/radeon/kms: make sure mc is initialized before mapping blit bo
  drm/radeon/kms: Return to userspace on ERESTARTSYS
  drm/radeon/gem: don't leak a gem object if reserve fails on get tiling (v2)
  drm/radeon/kms: don't report allocate failure on ERESTARTSYS
  drm/radeon/kms: Check if bo we got from ttm are radeon object or not
  drm/radeon/kms: If no placement is supplied fallback to system
  drm/ttm: Fix memory type manager debug information printing
  drm/ttm: Fix printk format & compute bo->mem.size at bo initialization
  drm/ttm: Fix potential ttm_mem_evict_first races.
  drm/ttm: Delayed delete fixes.
  drm/ttm: fix two bugs in new placement routines.
  drm/ttm: fix incorrect logic in ttm_bo_io path
  drm/nouveau: remove use of -ERESTART
  nouveau: Fix endianness with new context program loader
  drm/nouveau: fix build with CONFIG_AGP=n
  drm/nouveau: fix ch7006 build

1 files changed, 13 insertions, 6 deletions

diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c
index 36656bd110bf..a0ac3c134b1b 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);