mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* [PATCH] drm/amdgpu: fix initial connector audio value
@ 2022-09-20  9:24 hongao
  2022-09-20 16:09 ` Alex Deucher
  0 siblings, 1 reply; 2+ messages in thread
From: hongao @ 2022-09-20  9:24 UTC (permalink / raw)
  To: alexander.deucher, christian.koenig, Xinhui.Pan, airlied, daniel
  Cc: hongao, amd-gfx, dri-devel, linux-kernel

This got lost somewhere along the way, This fixes
audio not working until set_property was called.

Signed-off-by: hongao <hongao@uniontech.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c
index e4054e10a2c2..5d2e3328dd83 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c
@@ -1655,10 +1655,12 @@ amdgpu_connector_add(struct amdgpu_device *adev,
 						   adev->mode_info.dither_property,
 						   AMDGPU_FMT_DITHER_DISABLE);
 
-			if (amdgpu_audio != 0)
+			if (amdgpu_audio != 0) {
 				drm_object_attach_property(&amdgpu_connector->base.base,
 							   adev->mode_info.audio_property,
 							   AMDGPU_AUDIO_AUTO);
+				amdgpu_connector->audio = AMDGPU_AUDIO_AUTO;
+			}
 
 			subpixel_order = SubPixelHorizontalRGB;
 			connector->interlace_allowed = true;
@@ -1763,6 +1765,7 @@ amdgpu_connector_add(struct amdgpu_device *adev,
 				drm_object_attach_property(&amdgpu_connector->base.base,
 							   adev->mode_info.audio_property,
 							   AMDGPU_AUDIO_AUTO);
+				amdgpu_connector->audio = AMDGPU_AUDIO_AUTO;
 			}
 			drm_object_attach_property(&amdgpu_connector->base.base,
 						   adev->mode_info.dither_property,
@@ -1811,6 +1814,7 @@ amdgpu_connector_add(struct amdgpu_device *adev,
 				drm_object_attach_property(&amdgpu_connector->base.base,
 							   adev->mode_info.audio_property,
 							   AMDGPU_AUDIO_AUTO);
+				amdgpu_connector->audio = AMDGPU_AUDIO_AUTO;
 			}
 			drm_object_attach_property(&amdgpu_connector->base.base,
 						   adev->mode_info.dither_property,
@@ -1856,6 +1860,7 @@ amdgpu_connector_add(struct amdgpu_device *adev,
 				drm_object_attach_property(&amdgpu_connector->base.base,
 							   adev->mode_info.audio_property,
 							   AMDGPU_AUDIO_AUTO);
+				amdgpu_connector->audio = AMDGPU_AUDIO_AUTO;
 			}
 			drm_object_attach_property(&amdgpu_connector->base.base,
 						   adev->mode_info.dither_property,
-- 
2.20.1


^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH] drm/amdgpu: fix initial connector audio value
  2022-09-20  9:24 [PATCH] drm/amdgpu: fix initial connector audio value hongao
@ 2022-09-20 16:09 ` Alex Deucher
  0 siblings, 0 replies; 2+ messages in thread
From: Alex Deucher @ 2022-09-20 16:09 UTC (permalink / raw)
  To: hongao
  Cc: alexander.deucher, christian.koenig, Xinhui.Pan, airlied, daniel,
	dri-devel, amd-gfx, linux-kernel

Applied.  Thanks!

Alex

On Tue, Sep 20, 2022 at 6:34 AM hongao <hongao@uniontech.com> wrote:
>
> This got lost somewhere along the way, This fixes
> audio not working until set_property was called.
>
> Signed-off-by: hongao <hongao@uniontech.com>
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c
> index e4054e10a2c2..5d2e3328dd83 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c
> @@ -1655,10 +1655,12 @@ amdgpu_connector_add(struct amdgpu_device *adev,
>                                                    adev->mode_info.dither_property,
>                                                    AMDGPU_FMT_DITHER_DISABLE);
>
> -                       if (amdgpu_audio != 0)
> +                       if (amdgpu_audio != 0) {
>                                 drm_object_attach_property(&amdgpu_connector->base.base,
>                                                            adev->mode_info.audio_property,
>                                                            AMDGPU_AUDIO_AUTO);
> +                               amdgpu_connector->audio = AMDGPU_AUDIO_AUTO;
> +                       }
>
>                         subpixel_order = SubPixelHorizontalRGB;
>                         connector->interlace_allowed = true;
> @@ -1763,6 +1765,7 @@ amdgpu_connector_add(struct amdgpu_device *adev,
>                                 drm_object_attach_property(&amdgpu_connector->base.base,
>                                                            adev->mode_info.audio_property,
>                                                            AMDGPU_AUDIO_AUTO);
> +                               amdgpu_connector->audio = AMDGPU_AUDIO_AUTO;
>                         }
>                         drm_object_attach_property(&amdgpu_connector->base.base,
>                                                    adev->mode_info.dither_property,
> @@ -1811,6 +1814,7 @@ amdgpu_connector_add(struct amdgpu_device *adev,
>                                 drm_object_attach_property(&amdgpu_connector->base.base,
>                                                            adev->mode_info.audio_property,
>                                                            AMDGPU_AUDIO_AUTO);
> +                               amdgpu_connector->audio = AMDGPU_AUDIO_AUTO;
>                         }
>                         drm_object_attach_property(&amdgpu_connector->base.base,
>                                                    adev->mode_info.dither_property,
> @@ -1856,6 +1860,7 @@ amdgpu_connector_add(struct amdgpu_device *adev,
>                                 drm_object_attach_property(&amdgpu_connector->base.base,
>                                                            adev->mode_info.audio_property,
>                                                            AMDGPU_AUDIO_AUTO);
> +                               amdgpu_connector->audio = AMDGPU_AUDIO_AUTO;
>                         }
>                         drm_object_attach_property(&amdgpu_connector->base.base,
>                                                    adev->mode_info.dither_property,
> --
> 2.20.1
>

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2022-09-20 16:09 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-09-20  9:24 [PATCH] drm/amdgpu: fix initial connector audio value hongao
2022-09-20 16:09 ` Alex Deucher

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®