From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jani Nikula <jani.nikula@intel.com>
Subject: Re: [PATCH] drm/i915/hdmi: fix hdmi audio state readout
Date: Tue, 23 Sep 2014 17:02:30 +0300
Message-ID: <87d2am5tah.fsf@intel.com>
References: <1410957298-19599-1-git-send-email-jani.nikula@intel.com>
 <20140917155531.GK31703@phenom.ffwll.local>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <intel-gfx-bounces@lists.freedesktop.org>
Received: from mga14.intel.com (mga14.intel.com [192.55.52.115])
 by gabe.freedesktop.org (Postfix) with ESMTP id A63576E595
 for <intel-gfx@lists.freedesktop.org>; Tue, 23 Sep 2014 07:02:35 -0700 (PDT)
In-Reply-To: <20140917155531.GK31703@phenom.ffwll.local>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Errors-To: intel-gfx-bounces@lists.freedesktop.org
Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
To: Daniel Vetter <daniel@ffwll.ch>
Cc: intel-gfx@lists.freedesktop.org, Martin Andersen <martin.x.andersen@gmail.com>
List-Id: intel-gfx@lists.freedesktop.org

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