[Intel-gfx] [PATCH 1/2] drm/i915/dp: there is no audio on port A on non-DDI platforms

[Jani Nikula]

On Tue, 05 May 2015, Sivakumar Thulasimani <sivakumar.thulasimani at intel.com> wrote:
> On 5/4/2015 7:50 PM, Jani Nikula wrote:
>> The eDP port A register on PCH split platforms has a slightly different
>> register layout from the other ports, with bit 6 being either alternate
>> scrambler reset or reserved, depending on the generation. Our
>> misinterpretation of the bit as audio has lead to warnings.
>>
>> Fix this by not enabling audio on port A on non-DDI platforms. The check
>> could be made more specific, but this corresponds to the audio codec
>> enabling code which emits the warning for port A.
> shouldn't we disable audio for eDP on all platforms , including DDI ones ?
>> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=89958
>> Reported-and-tested-by: Chris Bainbridge <chris.bainbridge at gmail.com>
>> Cc: stable at vger.kernel.org
>> Signed-off-by: Jani Nikula <jani.nikula at intel.com>
>> ---
>>   drivers/gpu/drm/i915/intel_dp.c | 5 +++--
>>   1 file changed, 3 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
>> index 937ba31d8dde..fa71fb4d6542 100644
>> --- a/drivers/gpu/drm/i915/intel_dp.c
>> +++ b/drivers/gpu/drm/i915/intel_dp.c
>> @@ -1355,7 +1355,8 @@ intel_dp_compute_config(struct intel_encoder *encoder,
>>   
>>   	pipe_config->has_dp_encoder = true;
>>   	pipe_config->has_drrs = false;
>> -	pipe_config->has_audio = intel_dp->has_audio;
>> +	if (HAS_DDI(dev) || port != PORT_A)
>> +		pipe_config->has_audio = intel_dp->has_audio;
>>   
> this still enables audio for PORT_A on for HSW/BDW/etc .  the following 
> is better IMO
>
> +	if (!is_edp(encoder))
> +		pipe_config->has_audio = intel_dp->has_audio;

I wanted the check to match what's in intel_audio.c for these
platforms. And those only need the pipe.

Perhaps it's a theoretical question, but is it impossible for edp to
have audio?

Jani.




>
>
>
> -- 
> regards,
> Sivakumar
>

-- 
Jani Nikula, Intel Open Source Technology Center