2010/2/11 Rafał Miłecki <zaj...@gmail.com>:
> We should stop audio-state-reading timer before we turn off engine
>
> Signed-off-by: Rafał Miłecki <zaj...@gmail.com>
> ---
> drivers/gpu/drm/radeon/r600_audio.c | 16 ++++++++++++----
> 1 files changed, 12 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/radeon/r600_audio.c
> b/drivers/gpu/drm/radeon/r600_audio.c
> index b1c1d34..d7f6909 100644
> --- a/drivers/gpu/drm/radeon/r600_audio.c
> +++ b/drivers/gpu/drm/radeon/r600_audio.c
> @@ -147,6 +147,15 @@ static void r600_audio_update_hdmi(unsigned long param)
> }
>
> /*
> + * turn on/off audio engine
> + */
> +static void r600_audio_engine_enable(struct radeon_device *rdev, bool enable)
> +{
> + DRM_INFO("%s audio support", enable ? "Enabling" : "Disabling");
> + WREG32_P(R600_AUDIO_ENABLE, enable ? 0x81000000 : 0x0, ~0x81000000);
Maybe a #define instead of using magic numbers?
> +}
> +
> +/*
> * initialize the audio vars and register the update timer
> */
> int r600_audio_init(struct radeon_device *rdev)
> @@ -154,8 +163,7 @@ int r600_audio_init(struct radeon_device *rdev)
> if (!r600_audio_chipset_supported(rdev))
> return 0;
>
> - DRM_INFO("%s audio support", radeon_audio ? "Enabling" : "Disabling");
> - WREG32_P(R600_AUDIO_ENABLE, radeon_audio ? 0x81000000 : 0x0,
> ~0x81000000);
> + r600_audio_engine_enable(rdev, radeon_audio);
>
> rdev->audio_channels = -1;
> rdev->audio_rate = -1;
> @@ -261,7 +269,7 @@ 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);
> +
> + r600_audio_engine_enable(rdev, false);
> }
> --
> 1.6.4.2
>
>
> ------------------------------------------------------------------------------
> SOLARIS 10 is the OS for Data Centers - provides features such as DTrace,
> Predictive Self Healing and Award Winning ZFS. Get Solaris 10 NOW
> http://p.sf.net/sfu/solaris-dev2dev
> --
> _______________________________________________
> Dri-devel mailing list
> Dri-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/dri-devel
>
------------------------------------------------------------------------------
SOLARIS 10 is the OS for Data Centers - provides features such as DTrace,
Predictive Self Healing and Award Winning ZFS. Get Solaris 10 NOW
http://p.sf.net/sfu/solaris-dev2dev
--
_______________________________________________
Dri-devel mailing list
Dri-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/dri-devel
