* [PATCH] drm/radeon/kms: isolate audio engine management, change fini order
@ 2010-02-11 21:58 Rafał Miłecki
2010-02-11 22:19 ` Matt Turner
0 siblings, 1 reply; 3+ messages in thread
From: Rafał Miłecki @ 2010-02-11 21:58 UTC (permalink / raw)
To: dri-devel, Dave Airlie
We should stop audio-state-reading timer before we turn off engine
Signed-off-by: Rafał Miłecki <zajec5@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);
+}
+
+/*
* 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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] drm/radeon/kms: isolate audio engine management, change fini order
2010-02-11 21:58 [PATCH] drm/radeon/kms: isolate audio engine management, change fini order Rafał Miłecki
@ 2010-02-11 22:19 ` Matt Turner
2010-02-11 22:38 ` Rafał Miłecki
0 siblings, 1 reply; 3+ messages in thread
From: Matt Turner @ 2010-02-11 22:19 UTC (permalink / raw)
To: Rafał Miłecki; +Cc: dri-devel
2010/2/11 Rafał Miłecki <zajec5@gmail.com>:
> We should stop audio-state-reading timer before we turn off engine
>
> Signed-off-by: Rafał Miłecki <zajec5@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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] drm/radeon/kms: isolate audio engine management, change fini order
2010-02-11 22:19 ` Matt Turner
@ 2010-02-11 22:38 ` Rafał Miłecki
0 siblings, 0 replies; 3+ messages in thread
From: Rafał Miłecki @ 2010-02-11 22:38 UTC (permalink / raw)
To: Matt Turner; +Cc: dri-devel
W dniu 11 lutego 2010 23:19 użytkownik Matt Turner <mattst88@gmail.com> napisał:
> 2010/2/11 Rafał Miłecki <zajec5@gmail.com>:
>> We should stop audio-state-reading timer before we turn off engine
>>
>> Signed-off-by: Rafał Miłecki <zajec5@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?
I was thinking about that, actually we have much more magics in
r600_audio.c. Many masks and shifts are not defined. However I would
have to just guess some names which is acceptable, but I believe we
will get real names finally released soon. Alex wrote fixes for audio,
patches are waiting for IP review.
In this situation I prefer to just leave it as is for now. It's
probably not worth of cleaning that if this will be over-cleaned
anyway.
--
Rafał
------------------------------------------------------------------------------
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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-02-11 22:38 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-02-11 21:58 [PATCH] drm/radeon/kms: isolate audio engine management, change fini order Rafał Miłecki
2010-02-11 22:19 ` Matt Turner
2010-02-11 22:38 ` 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.