* [PATCH] drm/radeon/kms: suspend and resume audio stuff
@ 2010-01-28 17:16 Rafał Miłecki
2010-01-28 17:19 ` Rafał Miłecki
2010-01-28 20:17 ` Marius Gröger
0 siblings, 2 replies; 5+ messages in thread
From: Rafał Miłecki @ 2010-01-28 17:16 UTC (permalink / raw)
To: dri-devel, Dave Airlie
Fixes FDO bug #26214
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
---
drivers/gpu/drm/radeon/r600.c | 8 ++++++++
drivers/gpu/drm/radeon/r600_audio.c | 3 +--
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c
index d279089..76d0cdb 100644
--- a/drivers/gpu/drm/radeon/r600.c
+++ b/drivers/gpu/drm/radeon/r600.c
@@ -1944,6 +1944,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;
}
@@ -1951,6 +1958,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;
diff --git a/drivers/gpu/drm/radeon/r600_audio.c b/drivers/gpu/drm/radeon/r600_audio.c
index 99e2c38..e90da2e 100644
--- a/drivers/gpu/drm/radeon/r600_audio.c
+++ b/drivers/gpu/drm/radeon/r600_audio.c
@@ -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);
}
--
1.6.4.2
------------------------------------------------------------------------------
The Planet: dedicated and managed hosting, cloud storage, colocation
Stay online with enterprise data centers and the best network in the business
Choose flexible plans and management services without long-term contracts
Personal 24x7 support from experience hosting pros just a phone call away.
http://p.sf.net/sfu/theplanet-com
--
_______________________________________________
Dri-devel mailing list
Dri-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] drm/radeon/kms: suspend and resume audio stuff
2010-01-28 17:16 [PATCH] drm/radeon/kms: suspend and resume audio stuff Rafał Miłecki
@ 2010-01-28 17:19 ` Rafał Miłecki
2010-01-28 20:17 ` Marius Gröger
1 sibling, 0 replies; 5+ messages in thread
From: Rafał Miłecki @ 2010-01-28 17:19 UTC (permalink / raw)
To: dri-devel, Dave Airlie
W dniu 28 stycznia 2010 18:16 użytkownik Rafał Miłecki
<zajec5@gmail.com> napisał:
> Fixes FDO bug #26214
Dave: this is trivial change, fix annoying bug and it stops (fixes)
many ERROR resume messages.
Can you get this to 2.6.33?
--
Rafał
------------------------------------------------------------------------------
The Planet: dedicated and managed hosting, cloud storage, colocation
Stay online with enterprise data centers and the best network in the business
Choose flexible plans and management services without long-term contracts
Personal 24x7 support from experience hosting pros just a phone call away.
http://p.sf.net/sfu/theplanet-com
--
_______________________________________________
Dri-devel mailing list
Dri-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/dri-devel
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] drm/radeon/kms: suspend and resume audio stuff
2010-01-28 17:16 [PATCH] drm/radeon/kms: suspend and resume audio stuff Rafał Miłecki
2010-01-28 17:19 ` Rafał Miłecki
@ 2010-01-28 20:17 ` Marius Gröger
1 sibling, 0 replies; 5+ messages in thread
From: Marius Gröger @ 2010-01-28 20:17 UTC (permalink / raw)
To: Rafał Miłecki; +Cc: Dave Airlie, dri-devel
Rafał Miłecki schrieb:
> Fixes FDO bug #26214
Looks good - thanks! :-)
Marius
------------------------------------------------------------------------------
The Planet: dedicated and managed hosting, cloud storage, colocation
Stay online with enterprise data centers and the best network in the business
Choose flexible plans and management services without long-term contracts
Personal 24x7 support from experience hosting pros just a phone call away.
http://p.sf.net/sfu/theplanet-com
--
_______________________________________________
Dri-devel mailing list
Dri-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/dri-devel
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] drm/radeon/kms: suspend and resume audio stuff
2010-02-26 8:44 [PATCH 0/3] drm/radeon/kms: little audio stuff cleaning Rafał Miłecki
@ 2010-02-26 8:44 ` Rafał Miłecki
2010-02-26 8:47 ` Rafał Miłecki
0 siblings, 1 reply; 5+ messages in thread
From: Rafał Miłecki @ 2010-02-26 8:44 UTC (permalink / raw)
To: dri-devel, Dave Airlie
Fixes FDO bug #26214
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
---
drivers/gpu/drm/radeon/r600.c | 8 ++++++++
drivers/gpu/drm/radeon/r600_audio.c | 3 +--
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c
index d279089..76d0cdb 100644
--- a/drivers/gpu/drm/radeon/r600.c
+++ b/drivers/gpu/drm/radeon/r600.c
@@ -1944,6 +1944,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;
}
@@ -1951,6 +1958,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;
diff --git a/drivers/gpu/drm/radeon/r600_audio.c b/drivers/gpu/drm/radeon/r600_audio.c
index 99e2c38..e90da2e 100644
--- a/drivers/gpu/drm/radeon/r600_audio.c
+++ b/drivers/gpu/drm/radeon/r600_audio.c
@@ -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);
}
--
1.6.4.2
------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
--
_______________________________________________
Dri-devel mailing list
Dri-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] drm/radeon/kms: suspend and resume audio stuff
2010-02-26 8:44 ` [PATCH] drm/radeon/kms: suspend and resume audio stuff Rafał Miłecki
@ 2010-02-26 8:47 ` Rafał Miłecki
0 siblings, 0 replies; 5+ messages in thread
From: Rafał Miłecki @ 2010-02-26 8:47 UTC (permalink / raw)
To: dri-devel, Dave Airlie
W dniu 26 lutego 2010 09:44 użytkownik Rafał Miłecki <zajec5@gmail.com> napisał:
> Fixes FDO bug #26214
Whoops, I dumped patches to already existing directory. Ignore this
one please. Sorry.
--
Rafał
------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
--
_______________________________________________
Dri-devel mailing list
Dri-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/dri-devel
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2010-02-26 8:47 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-01-28 17:16 [PATCH] drm/radeon/kms: suspend and resume audio stuff Rafał Miłecki
2010-01-28 17:19 ` Rafał Miłecki
2010-01-28 20:17 ` Marius Gröger
-- strict thread matches above, loose matches on Subject: below --
2010-02-26 8:44 [PATCH 0/3] drm/radeon/kms: little audio stuff cleaning Rafał Miłecki
2010-02-26 8:44 ` [PATCH] drm/radeon/kms: suspend and resume audio stuff Rafał Miłecki
2010-02-26 8:47 ` Rafał Miłecki
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.