projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5715f67
)
drm/radeon/kms: enable audio engine on DCE32
author
Rafał Miłecki
<
[email protected]
>
Sat, 6 Mar 2010 13:03:36 +0000
(13:03 +0000)
committer
Dave Airlie
<
[email protected]
>
Mon, 15 Mar 2010 00:05:13 +0000
(10:05 +1000)
Signed-off-by: Rafał Miłecki <
[email protected]
>
Signed-off-by: Dave Airlie <
[email protected]
>
drivers/gpu/drm/radeon/rv770.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/radeon/rv770.c
b/drivers/gpu/drm/radeon/rv770.c
index 37887dee12afc48fa999fcf4f828433396604213..8f0c9253c5bba1f5b49f847dede7cda45c8e9318 100644
(file)
--- a/
drivers/gpu/drm/radeon/rv770.c
+++ b/
drivers/gpu/drm/radeon/rv770.c
@@
-1013,6
+1013,13
@@
int rv770_resume(struct radeon_device *rdev)
DRM_ERROR("radeon: failled testing IB (%d).\n", r);
return r;
}
+
+ r = r600_audio_init(rdev);
+ if (r) {
+ dev_err(rdev->dev, "radeon: audio init failed\n");
+ return r;
+ }
+
return r;
}
@@
-1021,6
+1028,7
@@
int rv770_suspend(struct radeon_device *rdev)
{
int r;
+ r600_audio_fini(rdev);
/* FIXME: we should wait for ring to be empty */
r700_cp_stop(rdev);
rdev->cp.ready = false;
@@
-1144,6
+1152,13
@@
int rv770_init(struct radeon_device *rdev)
}
}
}
+
+ r = r600_audio_init(rdev);
+ if (r) {
+ dev_err(rdev->dev, "radeon: audio init failed\n");
+ return r;
+ }
+
return 0;
}