Skip to contentSkip to conversation

drm/radeon/kms: little audio stuff cleaning

PATCH New Rafał Miłecki 1 participant 4 messages Feb 26, 2010

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

cover drm/radeon/kms: little audio stuff cleaning

This patchset is drm-next based, tried to clean all our mistakes :)

Rafał Miłecki (3):
Revert "drm/radeon/kms: disable HDMI audio for now on rv710/rv730" drm/radeon/kms: do not disable audio engine twice drm/radeon/kms: do not preset audio stuff and start timer when not
using audio

 drivers/gpu/drm/radeon/r600_audio.c |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

------------------------------------------------------------------------------
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
[email protected]
https://lists.sourceforge.net/lists/listinfo/dri-devel

#1 lore raw

PATCH 1/3 Revert "drm/radeon/kms: disable HDMI audio for now on rv710/rv730"

This commit "disabled" audio on RV710 and RV740 only, leaving RV770 and RV730. The order is: CHIP_RV770 < CHIP_RV730 < CHIP_RV710 < CHIP_RV740.

It is not needed anway, as we do not even try to enable audio on RV770 and newer. We call initializing function in r600.c only, not in rv770.c.

If there is something causing green tinges, it's HDMI mode setting for encoder and I will try to debug that.

---
 drivers/gpu/drm/radeon/r600_audio.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/gpu/drm/radeon/r600_audio.c +1 -1
index 387abaa..a8366ce 100644
@@ -35,7 +35,7 @@
  */
 static int r600_audio_chipset_supported(struct radeon_device *rdev)
 {
-	return (rdev->family >= CHIP_R600 && rdev->family < CHIP_RV710)
+	return rdev->family >= CHIP_R600
 		|| rdev->family == CHIP_RS600
 		|| rdev->family == CHIP_RS690
 		|| rdev->family == CHIP_RS740;
Signature · 14 lines
1.6.4.2


------------------------------------------------------------------------------
Download Intel&#174; 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
[email protected]
https://lists.sourceforge.net/lists/listinfo/dri-devel
#2 lore raw

PATCH 1/1 drm/radeon/kms: suspend and resume audio stuff

In reply to Rafał Miłecki

Fixes FDO bug #26214

---
 drivers/gpu/drm/radeon/r600.c       |    8 ++++++++
 drivers/gpu/drm/radeon/r600_audio.c |    3 +--
 2 files changed, 9 insertions(+), 2 deletions(-)
drivers/gpu/drm/radeon/r600.c +8 -0
index d279089..76d0cdb 100644
@@ -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;
drivers/gpu/drm/radeon/r600_audio.c +1 -2
index 99e2c38..e90da2e 100644
@@ -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);
 }
Signature · 14 lines
1.6.4.2


------------------------------------------------------------------------------
Download Intel&#174; 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
[email protected]
https://lists.sourceforge.net/lists/listinfo/dri-devel
#3 lore raw

Re: [PATCH] drm/radeon/kms: suspend and resume audio stuff

Quoted 1 line · W dniu 26 lutego 2010 09:44 użytkownik Rafał Miłecki <[email protected]> napisał:

Fixes FDO bug #26214

Whoops, I dumped patches to already existing directory. Ignore this one please. Sorry.

Signature · 13 lines
Rafał

------------------------------------------------------------------------------
Download Intel&#174; 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
[email protected]
https://lists.sourceforge.net/lists/listinfo/dri-devel