* [PATCH] drm/i915/hdmi: fix hdmi audio state readout
@ 2014-09-17 12:34 Jani Nikula
2014-09-17 15:55 ` Daniel Vetter
0 siblings, 1 reply; 3+ messages in thread
From: Jani Nikula @ 2014-09-17 12:34 UTC (permalink / raw)
To: intel-gfx; +Cc: jani.nikula, Martin Andersen
Check the correct bit for audio. Seems like a copy-paste error from the
start:
commit 9ed109a7b445e3f073d8ea72f888ec80c0532465
Author: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Thu Apr 24 23:54:52 2014 +0200
drm/i915: Track has_audio in the pipe config
Reported-by: Martin Andersen <martin.x.andersen@gmail.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=82756
Cc: stable@vger.kernel.org # 3.16+
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
drivers/gpu/drm/i915/intel_hdmi.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
index 1f6130363889..29ec1535992d 100644
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -732,7 +732,7 @@ static void intel_hdmi_get_config(struct intel_encoder *encoder,
if (tmp & HDMI_MODE_SELECT_HDMI)
pipe_config->has_hdmi_sink = true;
- if (tmp & HDMI_MODE_SELECT_HDMI)
+ if (tmp & SDVO_AUDIO_ENABLE)
pipe_config->has_audio = true;
if (!HAS_PCH_SPLIT(dev) &&
--
2.0.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] drm/i915/hdmi: fix hdmi audio state readout
2014-09-17 12:34 [PATCH] drm/i915/hdmi: fix hdmi audio state readout Jani Nikula
@ 2014-09-17 15:55 ` Daniel Vetter
2014-09-23 14:02 ` Jani Nikula
0 siblings, 1 reply; 3+ messages in thread
From: Daniel Vetter @ 2014-09-17 15:55 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx, Martin Andersen
On Wed, Sep 17, 2014 at 03:34:58PM +0300, Jani Nikula wrote:
> Check the correct bit for audio. Seems like a copy-paste error from the
> start:
>
> commit 9ed109a7b445e3f073d8ea72f888ec80c0532465
> Author: Daniel Vetter <daniel.vetter@ffwll.ch>
> Date: Thu Apr 24 23:54:52 2014 +0200
>
> drm/i915: Track has_audio in the pipe config
>
> Reported-by: Martin Andersen <martin.x.andersen@gmail.com>
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=82756
> Cc: stable@vger.kernel.org # 3.16+
> Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Oops, indeed.
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
> ---
> drivers/gpu/drm/i915/intel_hdmi.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
> index 1f6130363889..29ec1535992d 100644
> --- a/drivers/gpu/drm/i915/intel_hdmi.c
> +++ b/drivers/gpu/drm/i915/intel_hdmi.c
> @@ -732,7 +732,7 @@ static void intel_hdmi_get_config(struct intel_encoder *encoder,
> if (tmp & HDMI_MODE_SELECT_HDMI)
> pipe_config->has_hdmi_sink = true;
>
> - if (tmp & HDMI_MODE_SELECT_HDMI)
> + if (tmp & SDVO_AUDIO_ENABLE)
> pipe_config->has_audio = true;
>
> if (!HAS_PCH_SPLIT(dev) &&
> --
> 2.0.1
>
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] drm/i915/hdmi: fix hdmi audio state readout
2014-09-17 15:55 ` Daniel Vetter
@ 2014-09-23 14:02 ` Jani Nikula
0 siblings, 0 replies; 3+ messages in thread
From: Jani Nikula @ 2014-09-23 14:02 UTC (permalink / raw)
To: Daniel Vetter; +Cc: intel-gfx, Martin Andersen
On Wed, 17 Sep 2014, Daniel Vetter <daniel@ffwll.ch> wrote:
> On Wed, Sep 17, 2014 at 03:34:58PM +0300, Jani Nikula wrote:
>> Check the correct bit for audio. Seems like a copy-paste error from the
>> start:
>>
>> commit 9ed109a7b445e3f073d8ea72f888ec80c0532465
>> Author: Daniel Vetter <daniel.vetter@ffwll.ch>
>> Date: Thu Apr 24 23:54:52 2014 +0200
>>
>> drm/i915: Track has_audio in the pipe config
>>
>> Reported-by: Martin Andersen <martin.x.andersen@gmail.com>
>> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=82756
>> Cc: stable@vger.kernel.org # 3.16+
>> Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
>> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>
> Oops, indeed.
>
> Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Pushed to drm-intel-fixes, thanks for the review.
BR,
Jani.
>
>> ---
>> drivers/gpu/drm/i915/intel_hdmi.c | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
>> index 1f6130363889..29ec1535992d 100644
>> --- a/drivers/gpu/drm/i915/intel_hdmi.c
>> +++ b/drivers/gpu/drm/i915/intel_hdmi.c
>> @@ -732,7 +732,7 @@ static void intel_hdmi_get_config(struct intel_encoder *encoder,
>> if (tmp & HDMI_MODE_SELECT_HDMI)
>> pipe_config->has_hdmi_sink = true;
>>
>> - if (tmp & HDMI_MODE_SELECT_HDMI)
>> + if (tmp & SDVO_AUDIO_ENABLE)
>> pipe_config->has_audio = true;
>>
>> if (!HAS_PCH_SPLIT(dev) &&
>> --
>> 2.0.1
>>
>
> --
> Daniel Vetter
> Software Engineer, Intel Corporation
> +41 (0) 79 365 57 48 - http://blog.ffwll.ch
--
Jani Nikula, Intel Open Source Technology Center
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-09-23 14:02 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-09-17 12:34 [PATCH] drm/i915/hdmi: fix hdmi audio state readout Jani Nikula
2014-09-17 15:55 ` Daniel Vetter
2014-09-23 14:02 ` Jani Nikula
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox