drm/radeon/kms: suspend and resume audio stuff
authorRafał Miłecki <zajec5@gmail.com>
Thu, 28 Jan 2010 17:16:30 +0000 (18:16 +0100)
committerDave Airlie <airlied@redhat.com>
Fri, 5 Feb 2010 05:26:19 +0000 (15:26 +1000)
Fixes FDO bug #26214

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
drivers/gpu/drm/radeon/r600.c
drivers/gpu/drm/radeon/r600_audio.c

index 9661a469f3bd846033719147e07dce8a804a30ea..29faebc105dfa3bb3ef6de36c537a7adb19f6e44 100644 (file)
@@ -1950,6 +1950,13 @@ int r600_resume(struct radeon_device *rdev)
                DRM_ERROR("radeon: failled testing IB (%d).\n", r);
                return r;
        }
+
+       r = r600_audio_init(rdev);
+       if (r) {
+               DRM_ERROR("radeon: audio resume failed\n");
+               return r;
+       }
+
        return r;
 }
 
@@ -1957,6 +1964,7 @@ int r600_suspend(struct radeon_device *rdev)
 {
        int r;
 
+       r600_audio_fini(rdev);
        /* FIXME: we should wait for ring to be empty */
        r600_cp_stop(rdev);
        rdev->cp.ready = false;
index b1c1d343345464927942c4926338ddc300765935..0dcb6904c4ff930bbaaa4bc81e2da930ecdc6af8 100644 (file)
@@ -261,7 +261,6 @@ void r600_audio_fini(struct radeon_device *rdev)
        if (!r600_audio_chipset_supported(rdev))
                return;
 
-       WREG32_P(R600_AUDIO_ENABLE, 0x0, ~0x81000000);
-
        del_timer(&rdev->audio_timer);
+       WREG32_P(R600_AUDIO_ENABLE, 0x0, ~0x81000000);
 }