[Intel-gfx] [PATCH 2/7] drm/i915: Check has_infoframes when enabling infoframes

[Sharma, Shashank]

Regards
Shashank

On 6/13/2016 5:54 PM, Ville Syrjälä wrote:
> On Mon, Jun 13, 2016 at 01:40:50PM +0530, Sharma, Shashank wrote:
>> Regards
>> Shashank
>>
>> On 6/3/2016 1:25 AM, ville.syrjala at linux.intel.com wrote:
>>> From: Ville Syrjälä <ville.syrjala at linux.intel.com>
>>>
>>> has_infoframe is what tells us whether infoframes should be enabled, so
>>> let's pass that instead of has_hdmi_sink to .set_infoframes().
>>>
>>> Signed-off-by: Ville Syrjälä <ville.syrjala at linux.intel.com>
>>> ---
>>>    drivers/gpu/drm/i915/intel_ddi.c  | 2 +-
>>>    drivers/gpu/drm/i915/intel_hdmi.c | 6 +++---
>>>    2 files changed, 4 insertions(+), 4 deletions(-)
>>>
>>> diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
>>> index 022b41d422dc..2fb28d310c22 100644
>>> --- a/drivers/gpu/drm/i915/intel_ddi.c
>>> +++ b/drivers/gpu/drm/i915/intel_ddi.c
>>> @@ -1631,7 +1631,7 @@ static void intel_ddi_pre_enable(struct intel_encoder *intel_encoder)
>>>    		struct intel_hdmi *intel_hdmi = enc_to_intel_hdmi(encoder);
>>>
>>>    		intel_hdmi->set_infoframes(encoder,
>>> -					   crtc->config->has_hdmi_sink,
>>> +					   crtc->config->has_infoframe,
>> I am a bit confused here, please correct me if I am not going in right
>> direction, but what if its a DVI device which still needs video/AVI
>> infoframes but can drop Audio IF ? Wont it make more sense to keep using
>> has_hdmi_sink ?
>
> DVI doesn't do infoframes, so not sure what you're asking here. Also we
> don't deal with audio infoframes here.
>
Sorry, I guess I was under the (wrong) assumption that DVI still needs 
information(like aspect ratio) in form of infoframes, only the audio 
info frames are skipped.
>>>    					   &crtc->config->base.adjusted_mode);
>>>    	}
>>>    }
>>> diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
>>> index eb455ea6ea92..067b10a7cb04 100644
>>> --- a/drivers/gpu/drm/i915/intel_hdmi.c
>>> +++ b/drivers/gpu/drm/i915/intel_hdmi.c
>>> @@ -1665,7 +1665,7 @@ static void intel_hdmi_pre_enable(struct intel_encoder *encoder)
>>>    	intel_hdmi_prepare(encoder);
>>>
>>>    	intel_hdmi->set_infoframes(&encoder->base,
>>> -				   intel_crtc->config->has_hdmi_sink,
>>> +				   intel_crtc->config->has_infoframe,
>> Same as above
>>
>> Regards
>> Shashank
>>>    				   adjusted_mode);
>>>    }
>>>
>>> @@ -1686,7 +1686,7 @@ static void vlv_hdmi_pre_enable(struct intel_encoder *encoder)
>>>    				 0x2b247878);
>>>
>>>    	intel_hdmi->set_infoframes(&encoder->base,
>>> -				   intel_crtc->config->has_hdmi_sink,
>>> +				   intel_crtc->config->has_infoframe,
>>>    				   adjusted_mode);
>>>
>>>    	g4x_enable_hdmi(encoder);
>>> @@ -1749,7 +1749,7 @@ static void chv_hdmi_pre_enable(struct intel_encoder *encoder)
>>>    	chv_set_phy_signal_level(encoder, 128, 102, false);
>>>
>>>    	intel_hdmi->set_infoframes(&encoder->base,
>>> -				   intel_crtc->config->has_hdmi_sink,
>>> +				   intel_crtc->config->has_infoframe,
>>>    				   adjusted_mode);
>>>
>>>    	g4x_enable_hdmi(encoder);
>>>
>