[Intel-gfx] [PATCH RESEND 6/7] drm/i915/bios: drop has_mipi in favor of intel_bios_is_dsi_present

[Jani Nikula]

On Wed, 16 Mar 2016, Daniel Vetter <daniel at ffwll.ch> wrote:
> On Wed, Mar 16, 2016 at 12:43:34PM +0200, Jani Nikula wrote:
>> Favor a single point of truth instead of duplicating the information.
>> 
>> Signed-off-by: Jani Nikula <jani.nikula at intel.com>
>> ---
>>  drivers/gpu/drm/i915/i915_drv.h   |  1 -
>>  drivers/gpu/drm/i915/intel_bios.c | 12 +++---------
>>  2 files changed, 3 insertions(+), 10 deletions(-)
>> 
>> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
>> index 9c7402c062b9..cff4b6ec79d8 100644
>> --- a/drivers/gpu/drm/i915/i915_drv.h
>> +++ b/drivers/gpu/drm/i915/i915_drv.h
>> @@ -1415,7 +1415,6 @@ struct intel_vbt_data {
>>  	unsigned int lvds_use_ssc:1;
>>  	unsigned int display_clock_mode:1;
>>  	unsigned int fdi_rx_polarity_inverted:1;
>> -	unsigned int has_mipi:1;
>>  	int lvds_ssc_freq;
>>  	unsigned int bios_lvds_val; /* initial [PCH_]LVDS reg val in VBIOS */
>>  
>> diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/intel_bios.c
>> index 4b6bd6f2e193..aa90dc662e7f 100644
>> --- a/drivers/gpu/drm/i915/intel_bios.c
>> +++ b/drivers/gpu/drm/i915/intel_bios.c
>> @@ -706,7 +706,7 @@ parse_mipi_config(struct drm_i915_private *dev_priv,
>>  	const struct mipi_pps_data *pps;
>>  
>>  	/* parse MIPI blocks only if LFP type is MIPI */
>> -	if (!dev_priv->vbt.has_mipi)
>> +	if (!intel_bios_is_dsi_present(dev_priv, NULL))
>>  		return;
>>  
>>  	/* Initialize this to undefined indicating no generic MIPI support */
>> @@ -1232,13 +1232,6 @@ parse_device_mapping(struct drm_i915_private *dev_priv,
>>  			continue;
>>  		}
>>  
>> -		if (p_child->common.dvo_port >= DVO_PORT_MIPIA
>> -		    && p_child->common.dvo_port <= DVO_PORT_MIPID
>> -		    &&p_child->common.device_type & DEVICE_TYPE_MIPI_OUTPUT) {
>
> New code also rejects DVO_PORT_MIPIC, you should mention that robustness
> fix in the commit message. With this added:
>
> Reviewed-by: Daniel Vetter <daniel.vetter at ffwll.ch>

Pushed patches 1-6 to drm-intel-next-queued, thanks for the review, I'll
hold on to patch 7 for a little while longer. Sparse doesn't compain on
patch 4, and amended commit message on this one while applying.

BR,
Jani.




>
>> -			DRM_DEBUG_KMS("Found MIPI as LFP\n");
>> -			dev_priv->vbt.has_mipi = 1;
>> -		}
>> -
>>  		child_dev_ptr = dev_priv->vbt.child_dev + count;
>>  		count++;
>>  
>> @@ -1580,7 +1573,8 @@ bool intel_bios_is_dsi_present(struct drm_i915_private *dev_priv,
>>  		switch (dvo_port) {
>>  		case DVO_PORT_MIPIA:
>>  		case DVO_PORT_MIPIC:
>> -			*port = dvo_port - DVO_PORT_MIPIA;
>> +			if (port)
>> +				*port = dvo_port - DVO_PORT_MIPIA;
>>  			return true;
>>  		case DVO_PORT_MIPIB:
>>  		case DVO_PORT_MIPID:
>> -- 
>> 2.1.4
>> 
>> _______________________________________________
>> Intel-gfx mailing list
>> Intel-gfx at lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Jani Nikula, Intel Open Source Technology Center