All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH V2][drm-fixes?] drm/radeon: enable HDMI on DCE5 (AKA NI excluding Aruba)
@ 2012-06-11 10:34 Rafał Miłecki
  2012-06-11 12:11 ` Christian König
  2012-06-11 15:01 ` Andre Heider
  0 siblings, 2 replies; 4+ messages in thread
From: Rafał Miłecki @ 2012-06-11 10:34 UTC (permalink / raw)
  To: dri-devel, Dave Airlie

After recent changes HDMI code is ready to be enabled on DCE5. This
patch just changes conditions to execute already present code on DCE5.

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
---
V2: enable audio engine on Cayman (it uses different startup function).
---
 drivers/gpu/drm/radeon/atombios_encoders.c |    4 +++-
 drivers/gpu/drm/radeon/evergreen_hdmi.c    |    3 ---
 drivers/gpu/drm/radeon/ni.c                |    5 +++++
 drivers/gpu/drm/radeon/r600_audio.c        |    2 +-
 drivers/gpu/drm/radeon/r600_hdmi.c         |    7 ++-----
 5 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/drivers/gpu/drm/radeon/atombios_encoders.c b/drivers/gpu/drm/radeon/atombios_encoders.c
index e7b1ec5..486ccdf 100644
--- a/drivers/gpu/drm/radeon/atombios_encoders.c
+++ b/drivers/gpu/drm/radeon/atombios_encoders.c
@@ -1926,7 +1926,9 @@ radeon_atom_encoder_mode_set(struct drm_encoder *encoder,
 
 	if (atombios_get_encoder_mode(encoder) == ATOM_ENCODER_MODE_HDMI) {
 		r600_hdmi_enable(encoder);
-		if (ASIC_IS_DCE4(rdev))
+		if (ASIC_IS_DCE6(rdev))
+			; /* TODO (use pointers instead of if-s?) */
+		else if (ASIC_IS_DCE4(rdev))
 			evergreen_hdmi_setmode(encoder, adjusted_mode);
 		else
 			r600_hdmi_setmode(encoder, adjusted_mode);
diff --git a/drivers/gpu/drm/radeon/evergreen_hdmi.c b/drivers/gpu/drm/radeon/evergreen_hdmi.c
index a51f880..65c5416 100644
--- a/drivers/gpu/drm/radeon/evergreen_hdmi.c
+++ b/drivers/gpu/drm/radeon/evergreen_hdmi.c
@@ -156,9 +156,6 @@ void evergreen_hdmi_setmode(struct drm_encoder *encoder, struct drm_display_mode
 	struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv;
 	uint32_t offset;
 
-	if (ASIC_IS_DCE5(rdev))
-		return;
-
 	/* Silent, r600_hdmi_enable will raise WARN for us */
 	if (!dig->afmt->enabled)
 		return;
diff --git a/drivers/gpu/drm/radeon/ni.c b/drivers/gpu/drm/radeon/ni.c
index 3df4efa..b65fcae 100644
--- a/drivers/gpu/drm/radeon/ni.c
+++ b/drivers/gpu/drm/radeon/ni.c
@@ -1290,6 +1290,10 @@ static int cayman_startup(struct radeon_device *rdev)
 	if (r)
 		return r;
 
+	r = r600_audio_init(rdev);
+	if (r)
+		return r;
+
 	return 0;
 }
 
@@ -1316,6 +1320,7 @@ int cayman_resume(struct radeon_device *rdev)
 
 int cayman_suspend(struct radeon_device *rdev)
 {
+	r600_audio_fini(rdev);
 	/* FIXME: we should wait for ring to be empty */
 	radeon_ib_pool_suspend(rdev);
 	radeon_vm_manager_suspend(rdev);
diff --git a/drivers/gpu/drm/radeon/r600_audio.c b/drivers/gpu/drm/radeon/r600_audio.c
index 7479a5c..79b5591 100644
--- a/drivers/gpu/drm/radeon/r600_audio.c
+++ b/drivers/gpu/drm/radeon/r600_audio.c
@@ -57,7 +57,7 @@ static bool radeon_dig_encoder(struct drm_encoder *encoder)
  */
 static int r600_audio_chipset_supported(struct radeon_device *rdev)
 {
-	return (rdev->family >= CHIP_R600 && !ASIC_IS_DCE5(rdev))
+	return (rdev->family >= CHIP_R600 && !ASIC_IS_DCE6(rdev))
 		|| rdev->family == CHIP_RS600
 		|| rdev->family == CHIP_RS690
 		|| rdev->family == CHIP_RS740;
diff --git a/drivers/gpu/drm/radeon/r600_hdmi.c b/drivers/gpu/drm/radeon/r600_hdmi.c
index 969c275..82a0a4c 100644
--- a/drivers/gpu/drm/radeon/r600_hdmi.c
+++ b/drivers/gpu/drm/radeon/r600_hdmi.c
@@ -322,9 +322,6 @@ void r600_hdmi_setmode(struct drm_encoder *encoder, struct drm_display_mode *mod
 	struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv;
 	uint32_t offset;
 
-	if (ASIC_IS_DCE5(rdev))
-		return;
-
 	/* Silent, r600_hdmi_enable will raise WARN for us */
 	if (!dig->afmt->enabled)
 		return;
@@ -483,7 +480,7 @@ void r600_hdmi_enable(struct drm_encoder *encoder)
 	uint32_t offset;
 	u32 hdmi;
 
-	if (ASIC_IS_DCE5(rdev))
+	if (ASIC_IS_DCE6(rdev))
 		return;
 
 	/* Silent, r600_hdmi_enable will raise WARN for us */
@@ -543,7 +540,7 @@ void r600_hdmi_disable(struct drm_encoder *encoder)
 	struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv;
 	uint32_t offset;
 
-	if (ASIC_IS_DCE5(rdev))
+	if (ASIC_IS_DCE6(rdev))
 		return;
 
 	/* Called for ATOM_ENCODER_MODE_HDMI only */
-- 
1.7.7

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply related	[flat|nested] 4+ messages in thread
* Re: [PATCH V2][drm-fixes?] drm/radeon: enable HDMI on DCE5 (AKA NI excluding Aruba)
  2012-06-11 10:34 [PATCH V2][drm-fixes?] drm/radeon: enable HDMI on DCE5 (AKA NI excluding Aruba) Rafał Miłecki
@ 2012-06-11 12:11 ` Christian König
  2012-06-11 19:21   ` Boszormenyi Zoltan
  2012-06-11 15:01 ` Andre Heider
  1 sibling, 1 reply; 4+ messages in thread
From: Christian König @ 2012-06-11 12:11 UTC (permalink / raw)
  To: Rafał Miłecki; +Cc: dri-devel

On 11.06.2012 12:34, Rafał Miłecki wrote:
> After recent changes HDMI code is ready to be enabled on DCE5. This
> patch just changes conditions to execute already present code on DCE5.
>
> Signed-off-by: Rafał Miłecki<zajec5@gmail.com>
> Reviewed-by: Alex Deucher<alexander.deucher@amd.com>
Tested-by: Christian König <christian.koenig@amd.com>

> ---
> V2: enable audio engine on Cayman (it uses different startup function).
> ---
>   drivers/gpu/drm/radeon/atombios_encoders.c |    4 +++-
>   drivers/gpu/drm/radeon/evergreen_hdmi.c    |    3 ---
>   drivers/gpu/drm/radeon/ni.c                |    5 +++++
>   drivers/gpu/drm/radeon/r600_audio.c        |    2 +-
>   drivers/gpu/drm/radeon/r600_hdmi.c         |    7 ++-----
>   5 files changed, 11 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/gpu/drm/radeon/atombios_encoders.c b/drivers/gpu/drm/radeon/atombios_encoders.c
> index e7b1ec5..486ccdf 100644
> --- a/drivers/gpu/drm/radeon/atombios_encoders.c
> +++ b/drivers/gpu/drm/radeon/atombios_encoders.c
> @@ -1926,7 +1926,9 @@ radeon_atom_encoder_mode_set(struct drm_encoder *encoder,
>
>   	if (atombios_get_encoder_mode(encoder) == ATOM_ENCODER_MODE_HDMI) {
>   		r600_hdmi_enable(encoder);
> -		if (ASIC_IS_DCE4(rdev))
> +		if (ASIC_IS_DCE6(rdev))
> +			; /* TODO (use pointers instead of if-s?) */
> +		else if (ASIC_IS_DCE4(rdev))
>   			evergreen_hdmi_setmode(encoder, adjusted_mode);
>   		else
>   			r600_hdmi_setmode(encoder, adjusted_mode);
> diff --git a/drivers/gpu/drm/radeon/evergreen_hdmi.c b/drivers/gpu/drm/radeon/evergreen_hdmi.c
> index a51f880..65c5416 100644
> --- a/drivers/gpu/drm/radeon/evergreen_hdmi.c
> +++ b/drivers/gpu/drm/radeon/evergreen_hdmi.c
> @@ -156,9 +156,6 @@ void evergreen_hdmi_setmode(struct drm_encoder *encoder, struct drm_display_mode
>   	struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv;
>   	uint32_t offset;
>
> -	if (ASIC_IS_DCE5(rdev))
> -		return;
> -
>   	/* Silent, r600_hdmi_enable will raise WARN for us */
>   	if (!dig->afmt->enabled)
>   		return;
> diff --git a/drivers/gpu/drm/radeon/ni.c b/drivers/gpu/drm/radeon/ni.c
> index 3df4efa..b65fcae 100644
> --- a/drivers/gpu/drm/radeon/ni.c
> +++ b/drivers/gpu/drm/radeon/ni.c
> @@ -1290,6 +1290,10 @@ static int cayman_startup(struct radeon_device *rdev)
>   	if (r)
>   		return r;
>
> +	r = r600_audio_init(rdev);
> +	if (r)
> +		return r;
> +
>   	return 0;
>   }
>
> @@ -1316,6 +1320,7 @@ int cayman_resume(struct radeon_device *rdev)
>
>   int cayman_suspend(struct radeon_device *rdev)
>   {
> +	r600_audio_fini(rdev);
>   	/* FIXME: we should wait for ring to be empty */
>   	radeon_ib_pool_suspend(rdev);
>   	radeon_vm_manager_suspend(rdev);
> diff --git a/drivers/gpu/drm/radeon/r600_audio.c b/drivers/gpu/drm/radeon/r600_audio.c
> index 7479a5c..79b5591 100644
> --- a/drivers/gpu/drm/radeon/r600_audio.c
> +++ b/drivers/gpu/drm/radeon/r600_audio.c
> @@ -57,7 +57,7 @@ static bool radeon_dig_encoder(struct drm_encoder *encoder)
>    */
>   static int r600_audio_chipset_supported(struct radeon_device *rdev)
>   {
> -	return (rdev->family>= CHIP_R600&&  !ASIC_IS_DCE5(rdev))
> +	return (rdev->family>= CHIP_R600&&  !ASIC_IS_DCE6(rdev))
>   		|| rdev->family == CHIP_RS600
>   		|| rdev->family == CHIP_RS690
>   		|| rdev->family == CHIP_RS740;
> diff --git a/drivers/gpu/drm/radeon/r600_hdmi.c b/drivers/gpu/drm/radeon/r600_hdmi.c
> index 969c275..82a0a4c 100644
> --- a/drivers/gpu/drm/radeon/r600_hdmi.c
> +++ b/drivers/gpu/drm/radeon/r600_hdmi.c
> @@ -322,9 +322,6 @@ void r600_hdmi_setmode(struct drm_encoder *encoder, struct drm_display_mode *mod
>   	struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv;
>   	uint32_t offset;
>
> -	if (ASIC_IS_DCE5(rdev))
> -		return;
> -
>   	/* Silent, r600_hdmi_enable will raise WARN for us */
>   	if (!dig->afmt->enabled)
>   		return;
> @@ -483,7 +480,7 @@ void r600_hdmi_enable(struct drm_encoder *encoder)
>   	uint32_t offset;
>   	u32 hdmi;
>
> -	if (ASIC_IS_DCE5(rdev))
> +	if (ASIC_IS_DCE6(rdev))
>   		return;
>
>   	/* Silent, r600_hdmi_enable will raise WARN for us */
> @@ -543,7 +540,7 @@ void r600_hdmi_disable(struct drm_encoder *encoder)
>   	struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv;
>   	uint32_t offset;
>
> -	if (ASIC_IS_DCE5(rdev))
> +	if (ASIC_IS_DCE6(rdev))
>   		return;
>
>   	/* Called for ATOM_ENCODER_MODE_HDMI only */

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply	[flat|nested] 4+ messages in thread
* Re: [PATCH V2][drm-fixes?] drm/radeon: enable HDMI on DCE5 (AKA NI excluding Aruba)
  2012-06-11 10:34 [PATCH V2][drm-fixes?] drm/radeon: enable HDMI on DCE5 (AKA NI excluding Aruba) Rafał Miłecki
  2012-06-11 12:11 ` Christian König
@ 2012-06-11 15:01 ` Andre Heider
  1 sibling, 0 replies; 4+ messages in thread
From: Andre Heider @ 2012-06-11 15:01 UTC (permalink / raw)
  To: Rafał Miłecki; +Cc: dri-devel

On Mon, Jun 11, 2012 at 12:34 PM, Rafał Miłecki <zajec5@gmail.com> wrote:
> After recent changes HDMI code is ready to be enabled on DCE5. This
> patch just changes conditions to execute already present code on DCE5.
>
> Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
> Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
> ---
> V2: enable audio engine on Cayman (it uses different startup function).
> ---
>  drivers/gpu/drm/radeon/atombios_encoders.c |    4 +++-
>  drivers/gpu/drm/radeon/evergreen_hdmi.c    |    3 ---
>  drivers/gpu/drm/radeon/ni.c                |    5 +++++
>  drivers/gpu/drm/radeon/r600_audio.c        |    2 +-
>  drivers/gpu/drm/radeon/r600_hdmi.c         |    7 ++-----
>  5 files changed, 11 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/gpu/drm/radeon/atombios_encoders.c b/drivers/gpu/drm/radeon/atombios_encoders.c
> index e7b1ec5..486ccdf 100644
> --- a/drivers/gpu/drm/radeon/atombios_encoders.c
> +++ b/drivers/gpu/drm/radeon/atombios_encoders.c
> @@ -1926,7 +1926,9 @@ radeon_atom_encoder_mode_set(struct drm_encoder *encoder,
>
>        if (atombios_get_encoder_mode(encoder) == ATOM_ENCODER_MODE_HDMI) {
>                r600_hdmi_enable(encoder);
> -               if (ASIC_IS_DCE4(rdev))
> +               if (ASIC_IS_DCE6(rdev))
> +                       ; /* TODO (use pointers instead of if-s?) */
> +               else if (ASIC_IS_DCE4(rdev))
>                        evergreen_hdmi_setmode(encoder, adjusted_mode);
>                else
>                        r600_hdmi_setmode(encoder, adjusted_mode);
> diff --git a/drivers/gpu/drm/radeon/evergreen_hdmi.c b/drivers/gpu/drm/radeon/evergreen_hdmi.c
> index a51f880..65c5416 100644
> --- a/drivers/gpu/drm/radeon/evergreen_hdmi.c
> +++ b/drivers/gpu/drm/radeon/evergreen_hdmi.c
> @@ -156,9 +156,6 @@ void evergreen_hdmi_setmode(struct drm_encoder *encoder, struct drm_display_mode
>        struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv;
>        uint32_t offset;
>
> -       if (ASIC_IS_DCE5(rdev))
> -               return;
> -
>        /* Silent, r600_hdmi_enable will raise WARN for us */
>        if (!dig->afmt->enabled)
>                return;
> diff --git a/drivers/gpu/drm/radeon/ni.c b/drivers/gpu/drm/radeon/ni.c
> index 3df4efa..b65fcae 100644
> --- a/drivers/gpu/drm/radeon/ni.c
> +++ b/drivers/gpu/drm/radeon/ni.c
> @@ -1290,6 +1290,10 @@ static int cayman_startup(struct radeon_device *rdev)
>        if (r)
>                return r;
>
> +       r = r600_audio_init(rdev);
> +       if (r)
> +               return r;
> +
>        return 0;
>  }
>
> @@ -1316,6 +1320,7 @@ int cayman_resume(struct radeon_device *rdev)
>
>  int cayman_suspend(struct radeon_device *rdev)
>  {
> +       r600_audio_fini(rdev);
>        /* FIXME: we should wait for ring to be empty */
>        radeon_ib_pool_suspend(rdev);
>        radeon_vm_manager_suspend(rdev);
> diff --git a/drivers/gpu/drm/radeon/r600_audio.c b/drivers/gpu/drm/radeon/r600_audio.c
> index 7479a5c..79b5591 100644
> --- a/drivers/gpu/drm/radeon/r600_audio.c
> +++ b/drivers/gpu/drm/radeon/r600_audio.c
> @@ -57,7 +57,7 @@ static bool radeon_dig_encoder(struct drm_encoder *encoder)
>  */
>  static int r600_audio_chipset_supported(struct radeon_device *rdev)
>  {
> -       return (rdev->family >= CHIP_R600 && !ASIC_IS_DCE5(rdev))
> +       return (rdev->family >= CHIP_R600 && !ASIC_IS_DCE6(rdev))
>                || rdev->family == CHIP_RS600
>                || rdev->family == CHIP_RS690
>                || rdev->family == CHIP_RS740;
> diff --git a/drivers/gpu/drm/radeon/r600_hdmi.c b/drivers/gpu/drm/radeon/r600_hdmi.c
> index 969c275..82a0a4c 100644
> --- a/drivers/gpu/drm/radeon/r600_hdmi.c
> +++ b/drivers/gpu/drm/radeon/r600_hdmi.c
> @@ -322,9 +322,6 @@ void r600_hdmi_setmode(struct drm_encoder *encoder, struct drm_display_mode *mod
>        struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv;
>        uint32_t offset;
>
> -       if (ASIC_IS_DCE5(rdev))
> -               return;
> -
>        /* Silent, r600_hdmi_enable will raise WARN for us */
>        if (!dig->afmt->enabled)
>                return;
> @@ -483,7 +480,7 @@ void r600_hdmi_enable(struct drm_encoder *encoder)
>        uint32_t offset;
>        u32 hdmi;
>
> -       if (ASIC_IS_DCE5(rdev))
> +       if (ASIC_IS_DCE6(rdev))
>                return;
>
>        /* Silent, r600_hdmi_enable will raise WARN for us */
> @@ -543,7 +540,7 @@ void r600_hdmi_disable(struct drm_encoder *encoder)
>        struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv;
>        uint32_t offset;
>
> -       if (ASIC_IS_DCE5(rdev))
> +       if (ASIC_IS_DCE6(rdev))
>                return;
>
>        /* Called for ATOM_ENCODER_MODE_HDMI only */
> --
> 1.7.7

Woot, got sound on BARTS connected to a Onkyo TX-SR674E, thanks alot!

Tested-by: Andre Heider <a.heider@gmail.com>
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply	[flat|nested] 4+ messages in thread
* Re: [PATCH V2][drm-fixes?] drm/radeon: enable HDMI on DCE5 (AKA NI excluding Aruba)
  2012-06-11 12:11 ` Christian König
@ 2012-06-11 19:21   ` Boszormenyi Zoltan
  0 siblings, 0 replies; 4+ messages in thread
From: Boszormenyi Zoltan @ 2012-06-11 19:21 UTC (permalink / raw)
  To: Rafał Miłecki; +Cc: dri-devel

Yay, it works on HD6570 (TURKS)! Thanks!

2012-06-11 14:11 keltezéssel, Christian König írta:
> On 11.06.2012 12:34, Rafał Miłecki wrote:
>> After recent changes HDMI code is ready to be enabled on DCE5. This
>> patch just changes conditions to execute already present code on DCE5.
>>
>> Signed-off-by: Rafał Miłecki<zajec5@gmail.com>
>> Reviewed-by: Alex Deucher<alexander.deucher@amd.com>
> Tested-by: Christian König <christian.koenig@amd.com>

Tested-by: Zoltán Böszörményi <zboszor@pr.hu>

>
>> ---
>> V2: enable audio engine on Cayman (it uses different startup function).
>> ---
>>   drivers/gpu/drm/radeon/atombios_encoders.c |    4 +++-
>>   drivers/gpu/drm/radeon/evergreen_hdmi.c    |    3 ---
>>   drivers/gpu/drm/radeon/ni.c                |    5 +++++
>>   drivers/gpu/drm/radeon/r600_audio.c        |    2 +-
>>   drivers/gpu/drm/radeon/r600_hdmi.c         |    7 ++-----
>>   5 files changed, 11 insertions(+), 10 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/radeon/atombios_encoders.c 
>> b/drivers/gpu/drm/radeon/atombios_encoders.c
>> index e7b1ec5..486ccdf 100644
>> --- a/drivers/gpu/drm/radeon/atombios_encoders.c
>> +++ b/drivers/gpu/drm/radeon/atombios_encoders.c
>> @@ -1926,7 +1926,9 @@ radeon_atom_encoder_mode_set(struct drm_encoder *encoder,
>>
>>       if (atombios_get_encoder_mode(encoder) == ATOM_ENCODER_MODE_HDMI) {
>>           r600_hdmi_enable(encoder);
>> -        if (ASIC_IS_DCE4(rdev))
>> +        if (ASIC_IS_DCE6(rdev))
>> +            ; /* TODO (use pointers instead of if-s?) */
>> +        else if (ASIC_IS_DCE4(rdev))
>>               evergreen_hdmi_setmode(encoder, adjusted_mode);
>>           else
>>               r600_hdmi_setmode(encoder, adjusted_mode);
>> diff --git a/drivers/gpu/drm/radeon/evergreen_hdmi.c 
>> b/drivers/gpu/drm/radeon/evergreen_hdmi.c
>> index a51f880..65c5416 100644
>> --- a/drivers/gpu/drm/radeon/evergreen_hdmi.c
>> +++ b/drivers/gpu/drm/radeon/evergreen_hdmi.c
>> @@ -156,9 +156,6 @@ void evergreen_hdmi_setmode(struct drm_encoder *encoder, struct 
>> drm_display_mode
>>       struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv;
>>       uint32_t offset;
>>
>> -    if (ASIC_IS_DCE5(rdev))
>> -        return;
>> -
>>       /* Silent, r600_hdmi_enable will raise WARN for us */
>>       if (!dig->afmt->enabled)
>>           return;
>> diff --git a/drivers/gpu/drm/radeon/ni.c b/drivers/gpu/drm/radeon/ni.c
>> index 3df4efa..b65fcae 100644
>> --- a/drivers/gpu/drm/radeon/ni.c
>> +++ b/drivers/gpu/drm/radeon/ni.c
>> @@ -1290,6 +1290,10 @@ static int cayman_startup(struct radeon_device *rdev)
>>       if (r)
>>           return r;
>>
>> +    r = r600_audio_init(rdev);
>> +    if (r)
>> +        return r;
>> +
>>       return 0;
>>   }
>>
>> @@ -1316,6 +1320,7 @@ int cayman_resume(struct radeon_device *rdev)
>>
>>   int cayman_suspend(struct radeon_device *rdev)
>>   {
>> +    r600_audio_fini(rdev);
>>       /* FIXME: we should wait for ring to be empty */
>>       radeon_ib_pool_suspend(rdev);
>>       radeon_vm_manager_suspend(rdev);
>> diff --git a/drivers/gpu/drm/radeon/r600_audio.c b/drivers/gpu/drm/radeon/r600_audio.c
>> index 7479a5c..79b5591 100644
>> --- a/drivers/gpu/drm/radeon/r600_audio.c
>> +++ b/drivers/gpu/drm/radeon/r600_audio.c
>> @@ -57,7 +57,7 @@ static bool radeon_dig_encoder(struct drm_encoder *encoder)
>>    */
>>   static int r600_audio_chipset_supported(struct radeon_device *rdev)
>>   {
>> -    return (rdev->family>= CHIP_R600&&  !ASIC_IS_DCE5(rdev))
>> +    return (rdev->family>= CHIP_R600&&  !ASIC_IS_DCE6(rdev))
>>           || rdev->family == CHIP_RS600
>>           || rdev->family == CHIP_RS690
>>           || rdev->family == CHIP_RS740;
>> diff --git a/drivers/gpu/drm/radeon/r600_hdmi.c b/drivers/gpu/drm/radeon/r600_hdmi.c
>> index 969c275..82a0a4c 100644
>> --- a/drivers/gpu/drm/radeon/r600_hdmi.c
>> +++ b/drivers/gpu/drm/radeon/r600_hdmi.c
>> @@ -322,9 +322,6 @@ void r600_hdmi_setmode(struct drm_encoder *encoder, struct 
>> drm_display_mode *mod
>>       struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv;
>>       uint32_t offset;
>>
>> -    if (ASIC_IS_DCE5(rdev))
>> -        return;
>> -
>>       /* Silent, r600_hdmi_enable will raise WARN for us */
>>       if (!dig->afmt->enabled)
>>           return;
>> @@ -483,7 +480,7 @@ void r600_hdmi_enable(struct drm_encoder *encoder)
>>       uint32_t offset;
>>       u32 hdmi;
>>
>> -    if (ASIC_IS_DCE5(rdev))
>> +    if (ASIC_IS_DCE6(rdev))
>>           return;
>>
>>       /* Silent, r600_hdmi_enable will raise WARN for us */
>> @@ -543,7 +540,7 @@ void r600_hdmi_disable(struct drm_encoder *encoder)
>>       struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv;
>>       uint32_t offset;
>>
>> -    if (ASIC_IS_DCE5(rdev))
>> +    if (ASIC_IS_DCE6(rdev))
>>           return;
>>
>>       /* Called for ATOM_ENCODER_MODE_HDMI only */
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-06-11 19:21 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-06-11 10:34 [PATCH V2][drm-fixes?] drm/radeon: enable HDMI on DCE5 (AKA NI excluding Aruba) Rafał Miłecki
2012-06-11 12:11 ` Christian König
2012-06-11 19:21   ` Boszormenyi Zoltan
2012-06-11 15:01 ` Andre Heider

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.