[Intel-gfx] [PATCH 01/10] drm/i915/bios: amend child device config parameters

Jani Nikula jani.nikula at intel.com
Fri Aug 25 13:56:39 UTC 2017


On Fri, 25 Aug 2017, Ville Syrjälä <ville.syrjala at linux.intel.com> wrote:
> On Thu, Aug 24, 2017 at 09:53:59PM +0300, Jani Nikula wrote:
>> Add both some new and some old fields to child device config
>> parameters. Prepare for switching to just one child device config. Use
>> naming from struct old_child_dev_config for common fields.
>> 
>> No functional changes.
>> 
>> Cc: Animesh Manna <animesh.manna at intel.com>
>> Cc: Paulo Zanoni <paulo.r.zanoni at intel.com>
>> Cc: Ville Syrjälä <ville.syrjala at linux.intel.com>
>> Signed-off-by: Jani Nikula <jani.nikula at intel.com>
>> ---
>>  drivers/gpu/drm/i915/intel_vbt_defs.h | 31 +++++++++++++++++++++++++++----
>>  1 file changed, 27 insertions(+), 4 deletions(-)
>> 
>> diff --git a/drivers/gpu/drm/i915/intel_vbt_defs.h b/drivers/gpu/drm/i915/intel_vbt_defs.h
>> index a92e7762f596..9ad05b2c44e0 100644
>> --- a/drivers/gpu/drm/i915/intel_vbt_defs.h
>> +++ b/drivers/gpu/drm/i915/intel_vbt_defs.h
>> @@ -260,13 +260,28 @@ struct old_child_dev_config {
>>  /* This one contains field offsets that are known to be common for all BDB
>>   * versions. Notice that the meaning of the contents contents may still change,
>>   * but at least the offsets are consistent. */
>> -
>>  struct common_child_dev_config {
>>  	u16 handle;
>>  	u16 device_type;
>> -	u8 not_common1[12];
>> +	u8 i2c_speed;
>> +	u8 dp_onboard_redriver;					/* 158 */
>> +	u8 dp_ondock_redriver;					/* 158 */
>> +	u8 hdmi_level_shifter_value:4;				/* 169 */
>> +	u8 hdmi_max_data_rate:4;				/* 204 */
>> +	u16 dtd_buf_ptr;					/* 161 */
>> +	u8 edidless_efp:1;					/* 161 */
>> +	u8 compression_enable:1;				/* 198 */
>> +	u8 compression_method:1;				/* 198 */
>> +	u8 ganged_edp:1;					/* 202 */
>> +	u8 reserved0:4;
>> +	u8 compression_structure_index:4;			/* 198 */
>> +	u8 reserved1:4;
>> +	u8 slave_port;						/* 202 */
>> +	u8 reserved2;
>> +	u16 addin_offset;
>>  	u8 dvo_port;
>> -	u8 not_common2[2];
>> +	u8 i2c_pin;
>> +	u8 slave_addr;
>>  	u8 ddc_pin;
>>  	u16 edid_ptr;
>>  	u8 dvo_cfg; /* See DEVICE_CFG_* above */
>> @@ -281,7 +296,15 @@ struct common_child_dev_config {
>>  	u8 tmds_support:1;
>>  	u8 support_reserved:5;
>>  	u8 aux_channel;
>> -	u8 not_common3[11];
>> +	u8 dongle_detect;
>> +	u8 capabilities;
>> +	u8 dvo_wiring; /* See DEVICE_WIRE_* above */
>> +	u8 mipi_bridge_type;					/* 171 */
>> +	u16 extended_type;
>> +	u8 dvo_function;
>> +	u8 flags2;						/* 195 */
>> +	u8 dp_gpio_index;					/* 195 */
>> +	u16 dp_gpio_pin_num;					/* 195 */
>>  	u8 iboost_level;
>
> The iboost stuff could also use the version comments, and it could be
> made to use a bitfield since that seems to be what we do for VBT stuff.

Patches follow.

> Series lgtm, or at least I wasn't able to spot any mistakes. So for the
> series
> Reviewed-by: Ville Syrjälä <ville.syrjala at linux.intel.com>

Thank you very much, pushed the lot.

BR,
Jani.

>
>>  } __packed;
>>  
>> -- 
>> 2.11.0

-- 
Jani Nikula, Intel Open Source Technology Center


More information about the Intel-gfx mailing list