From: Jani Nikula <jani.nikula@intel.com>
To: Daniel Vetter <daniel@ffwll.ch>
Cc: intel-gfx@lists.freedesktop.org,
Martin Andersen <martin.x.andersen@gmail.com>
Subject: Re: [PATCH] drm/i915/hdmi: fix hdmi audio state readout
Date: Tue, 23 Sep 2014 17:02:30 +0300 [thread overview]
Message-ID: <87d2am5tah.fsf@intel.com> (raw)
In-Reply-To: <20140917155531.GK31703@phenom.ffwll.local>
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
prev parent reply other threads:[~2014-09-23 14:02 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
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 message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87d2am5tah.fsf@intel.com \
--to=jani.nikula@intel.com \
--cc=daniel@ffwll.ch \
--cc=intel-gfx@lists.freedesktop.org \
--cc=martin.x.andersen@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.