Commit a434689c authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915: move vbt to display.vbt 



Move display VBT related members under drm_i915_private display
sub-struct.

v2: Rebase

Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Reviewed-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/db4b648b201ea0b79654fec2028120999a735db0.1661779055.git.jani.nikula@intel.com
parent 90b87cf2

drivers/gpu/drm/i915/display/intel_bios.c

+106 −106
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ find_section(struct drm_i915_private *i915, 
{

	struct bdb_block_entry *entry;



	list_for_each_entry(entry, &i915->vbt.bdb_blocks, node) {

	list_for_each_entry(entry, &i915->display.vbt.bdb_blocks, node) {

		if (entry->section_id == section_id)

			return entry->data + 3;

	}
@@ -501,7 +501,7 @@ init_bdb_block(struct drm_i915_private *i915, 
		return;

	}



	list_add_tail(&entry->node, &i915->vbt.bdb_blocks);

	list_add_tail(&entry->node, &i915->display.vbt.bdb_blocks);

}



static void init_bdb_blocks(struct drm_i915_private *i915,
@@ -878,7 +878,7 @@ parse_lfp_data(struct drm_i915_private *i915, 
	if (!tail)

		return;



	if (i915->vbt.version >= 188) {

	if (i915->display.vbt.version >= 188) {

		panel->vbt.seamless_drrs_min_refresh_rate =

			tail->seamless_drrs_min_refresh_rate[panel_type];

		drm_dbg_kms(&i915->drm,
@@ -904,7 +904,7 @@ parse_generic_dtd(struct drm_i915_private *i915, 
	 * first on VBT >= 229, but still fall back to trying the old LFP

	 * block if that fails.

	 */

	if (i915->vbt.version < 229)

	if (i915->display.vbt.version < 229)

		return;



	generic_dtd = find_section(i915, BDB_GENERIC_DTD);
@@ -1008,12 +1008,12 @@ parse_lfp_backlight(struct drm_i915_private *i915, 
	}



	panel->vbt.backlight.type = INTEL_BACKLIGHT_DISPLAY_DDI;

	if (i915->vbt.version >= 191) {

	if (i915->display.vbt.version >= 191) {

		size_t exp_size;



		if (i915->vbt.version >= 236)

		if (i915->display.vbt.version >= 236)

			exp_size = sizeof(struct bdb_lfp_backlight_data);

		else if (i915->vbt.version >= 234)

		else if (i915->display.vbt.version >= 234)

			exp_size = EXP_BDB_LFP_BL_DATA_SIZE_REV_234;

		else

			exp_size = EXP_BDB_LFP_BL_DATA_SIZE_REV_191;
@@ -1030,14 +1030,14 @@ parse_lfp_backlight(struct drm_i915_private *i915, 
	panel->vbt.backlight.pwm_freq_hz = entry->pwm_freq_hz;

	panel->vbt.backlight.active_low_pwm = entry->active_low_pwm;



	if (i915->vbt.version >= 234) {

	if (i915->display.vbt.version >= 234) {

		u16 min_level;

		bool scale;



		level = backlight_data->brightness_level[panel_type].level;

		min_level = backlight_data->brightness_min_level[panel_type].level;



		if (i915->vbt.version >= 236)

		if (i915->display.vbt.version >= 236)

			scale = backlight_data->brightness_precision_bits[panel_type] == 16;

		else

			scale = level > 255;
@@ -1134,37 +1134,37 @@ parse_general_features(struct drm_i915_private *i915) 
	if (!general)

		return;



	i915->vbt.int_tv_support = general->int_tv_support;

	i915->display.vbt.int_tv_support = general->int_tv_support;

	/* int_crt_support can't be trusted on earlier platforms */

	if (i915->vbt.version >= 155 &&

	if (i915->display.vbt.version >= 155 &&

	    (HAS_DDI(i915) || IS_VALLEYVIEW(i915)))

		i915->vbt.int_crt_support = general->int_crt_support;

	i915->vbt.lvds_use_ssc = general->enable_ssc;

	i915->vbt.lvds_ssc_freq =

		i915->display.vbt.int_crt_support = general->int_crt_support;

	i915->display.vbt.lvds_use_ssc = general->enable_ssc;

	i915->display.vbt.lvds_ssc_freq =

		intel_bios_ssc_frequency(i915, general->ssc_freq);

	i915->vbt.display_clock_mode = general->display_clock_mode;

	i915->vbt.fdi_rx_polarity_inverted = general->fdi_rx_polarity_inverted;

	if (i915->vbt.version >= 181) {

		i915->vbt.orientation = general->rotate_180 ?

	i915->display.vbt.display_clock_mode = general->display_clock_mode;

	i915->display.vbt.fdi_rx_polarity_inverted = general->fdi_rx_polarity_inverted;

	if (i915->display.vbt.version >= 181) {

		i915->display.vbt.orientation = general->rotate_180 ?

			DRM_MODE_PANEL_ORIENTATION_BOTTOM_UP :

			DRM_MODE_PANEL_ORIENTATION_NORMAL;

	} else {

		i915->vbt.orientation = DRM_MODE_PANEL_ORIENTATION_UNKNOWN;

		i915->display.vbt.orientation = DRM_MODE_PANEL_ORIENTATION_UNKNOWN;

	}



	if (i915->vbt.version >= 249 && general->afc_startup_config) {

		i915->vbt.override_afc_startup = true;

		i915->vbt.override_afc_startup_val = general->afc_startup_config == 0x1 ? 0x0 : 0x7;

	if (i915->display.vbt.version >= 249 && general->afc_startup_config) {

		i915->display.vbt.override_afc_startup = true;

		i915->display.vbt.override_afc_startup_val = general->afc_startup_config == 0x1 ? 0x0 : 0x7;

	}



	drm_dbg_kms(&i915->drm,

		    "BDB_GENERAL_FEATURES int_tv_support %d int_crt_support %d lvds_use_ssc %d lvds_ssc_freq %d display_clock_mode %d fdi_rx_polarity_inverted %d\n",

		    i915->vbt.int_tv_support,

		    i915->vbt.int_crt_support,

		    i915->vbt.lvds_use_ssc,

		    i915->vbt.lvds_ssc_freq,

		    i915->vbt.display_clock_mode,

		    i915->vbt.fdi_rx_polarity_inverted);

		    i915->display.vbt.int_tv_support,

		    i915->display.vbt.int_crt_support,

		    i915->display.vbt.lvds_use_ssc,

		    i915->display.vbt.lvds_ssc_freq,

		    i915->display.vbt.display_clock_mode,

		    i915->display.vbt.fdi_rx_polarity_inverted);

}



static const struct child_device_config *
@@ -1190,7 +1190,7 @@ parse_sdvo_device_mapping(struct drm_i915_private *i915) 
		return;

	}



	list_for_each_entry(devdata, &i915->vbt.display_devices, node) {

	list_for_each_entry(devdata, &i915->display.vbt.display_devices, node) {

		child = &devdata->child;



		if (child->slave_addr != SLAVE_ADDR1 &&
@@ -1214,7 +1214,7 @@ parse_sdvo_device_mapping(struct drm_i915_private *i915) 
			    child->slave_addr,

			    (child->dvo_port == DEVICE_PORT_DVOB) ?

			    "SDVOB" : "SDVOC");

		mapping = &i915->vbt.sdvo_mappings[child->dvo_port - 1];

		mapping = &i915->display.vbt.sdvo_mappings[child->dvo_port - 1];

		if (!mapping->initialized) {

			mapping->dvo_port = child->dvo_port;

			mapping->slave_addr = child->slave_addr;
@@ -1265,7 +1265,7 @@ parse_driver_features(struct drm_i915_private *i915) 
		 * interpretation, but real world VBTs seem to.

		 */

		if (driver->lvds_config != BDB_DRIVER_FEATURE_INT_LVDS)

			i915->vbt.int_lvds_support = 0;

			i915->display.vbt.int_lvds_support = 0;

	} else {

		/*

		 * FIXME it's not clear which BDB version has the LVDS config
@@ -1278,10 +1278,10 @@ parse_driver_features(struct drm_i915_private *i915) 
		 * in the wild with the bits correctly populated. Version

		 * 108 (on i85x) does not have the bits correctly populated.

		 */

		if (i915->vbt.version >= 134 &&

		if (i915->display.vbt.version >= 134 &&

		    driver->lvds_config != BDB_DRIVER_FEATURE_INT_LVDS &&

		    driver->lvds_config != BDB_DRIVER_FEATURE_INT_SDVO_LVDS)

			i915->vbt.int_lvds_support = 0;

			i915->display.vbt.int_lvds_support = 0;

	}

}
@@ -1295,7 +1295,7 @@ parse_panel_driver_features(struct drm_i915_private *i915, 
	if (!driver)

		return;



	if (i915->vbt.version < 228) {

	if (i915->display.vbt.version < 228) {

		drm_dbg_kms(&i915->drm, "DRRS State Enabled:%d\n",

			    driver->drrs_enabled);

		/*
@@ -1328,7 +1328,7 @@ parse_power_conservation_features(struct drm_i915_private *i915, 


	panel->vbt.vrr = true; /* matches Windows behaviour */



	if (i915->vbt.version < 228)

	if (i915->display.vbt.version < 228)

		return;



	power = find_section(i915, BDB_LFP_POWER);
@@ -1354,10 +1354,10 @@ parse_power_conservation_features(struct drm_i915_private *i915, 
			panel->vbt.drrs_type = DRRS_TYPE_NONE;

	}



	if (i915->vbt.version >= 232)

	if (i915->display.vbt.version >= 232)

		panel->vbt.edp.hobl = panel_bool(power->hobl, panel_type);



	if (i915->vbt.version >= 233)

	if (i915->display.vbt.version >= 233)

		panel->vbt.vrr = panel_bool(power->vrr_feature_enabled,

					    panel_type);

}
@@ -1393,7 +1393,7 @@ parse_edp(struct drm_i915_private *i915, 


	panel->vbt.edp.pps = *edp_pps;



	if (i915->vbt.version >= 224) {

	if (i915->display.vbt.version >= 224) {

		panel->vbt.edp.rate =

			edp->edp_fast_link_training_rate[panel_type] * 20;

	} else {
@@ -1472,7 +1472,7 @@ parse_edp(struct drm_i915_private *i915, 
		break;

	}



	if (i915->vbt.version >= 173) {

	if (i915->display.vbt.version >= 173) {

		u8 vswing;



		/* Don't read from VBT if module parameter has valid value*/
@@ -1488,7 +1488,7 @@ parse_edp(struct drm_i915_private *i915, 
	panel->vbt.edp.drrs_msa_timing_delay =

		panel_bits(edp->sdrrs_msa_timing_delay, panel_type, 2);



	if (i915->vbt.version >= 244)

	if (i915->display.vbt.version >= 244)

		panel->vbt.edp.max_link_rate =

			edp->edp_max_port_link_rate[panel_type] * 20;

}
@@ -1520,7 +1520,7 @@ parse_psr(struct drm_i915_private *i915, 
	 * New psr options 0=500us, 1=100us, 2=2500us, 3=0us

	 * Old decimal value is wake up time in multiples of 100 us.

	 */

	if (i915->vbt.version >= 205 &&

	if (i915->display.vbt.version >= 205 &&

	    (DISPLAY_VER(i915) >= 9 && !IS_BROXTON(i915))) {

		switch (psr_table->tp1_wakeup_time) {

		case 0:
@@ -1566,7 +1566,7 @@ parse_psr(struct drm_i915_private *i915, 
		panel->vbt.psr.tp2_tp3_wakeup_time_us = psr_table->tp2_tp3_wakeup_time * 100;

	}



	if (i915->vbt.version >= 226) {

	if (i915->display.vbt.version >= 226) {

		u32 wakeup_time = psr->psr2_tp2_tp3_wakeup_time;



		wakeup_time = panel_bits(wakeup_time, panel_type, 2);
@@ -1598,7 +1598,7 @@ static void parse_dsi_backlight_ports(struct drm_i915_private *i915, 
{

	enum port port_bc = DISPLAY_VER(i915) >= 11 ? PORT_B : PORT_C;



	if (!panel->vbt.dsi.config->dual_link || i915->vbt.version < 197) {

	if (!panel->vbt.dsi.config->dual_link || i915->display.vbt.version < 197) {

		panel->vbt.dsi.bl_ports = BIT(port);

		if (panel->vbt.dsi.config->cabc_supported)

			panel->vbt.dsi.cabc_ports = BIT(port);
@@ -2053,7 +2053,7 @@ parse_compression_parameters(struct drm_i915_private *i915) 
	u16 block_size;

	int index;



	if (i915->vbt.version < 198)

	if (i915->display.vbt.version < 198)

		return;



	params = find_section(i915, BDB_COMPRESSION_PARAMETERS);
@@ -2073,7 +2073,7 @@ parse_compression_parameters(struct drm_i915_private *i915) 
		}

	}



	list_for_each_entry(devdata, &i915->vbt.display_devices, node) {

	list_for_each_entry(devdata, &i915->display.vbt.display_devices, node) {

		child = &devdata->child;



		if (!child->compression_enable)
@@ -2207,7 +2207,7 @@ static enum port get_port_by_ddc_pin(struct drm_i915_private *i915, u8 ddc_pin) 
		return PORT_NONE;



	for_each_port(port) {

		devdata = i915->vbt.ports[port];

		devdata = i915->display.vbt.ports[port];



		if (devdata && ddc_pin == devdata->child.ddc_pin)

			return port;
@@ -2256,7 +2256,7 @@ static void sanitize_ddc_pin(struct intel_bios_encoder_data *devdata, 
	 * there are real machines (eg. Asrock B250M-HDV) where VBT has both

	 * port A and port E with the same AUX ch and we must pick port E :(

	 */

	child = &i915->vbt.ports[p]->child;

	child = &i915->display.vbt.ports[p]->child;



	child->device_type &= ~DEVICE_TYPE_TMDS_DVI_SIGNALING;

	child->device_type |= DEVICE_TYPE_NOT_HDMI_OUTPUT;
@@ -2273,7 +2273,7 @@ static enum port get_port_by_aux_ch(struct drm_i915_private *i915, u8 aux_ch) 
		return PORT_NONE;



	for_each_port(port) {

		devdata = i915->vbt.ports[port];

		devdata = i915->display.vbt.ports[port];



		if (devdata && aux_ch == devdata->child.aux_channel)

			return port;
@@ -2308,7 +2308,7 @@ static void sanitize_aux_ch(struct intel_bios_encoder_data *devdata, 
	 * there are real machines (eg. Asrock B250M-HDV) where VBT has both

	 * port A and port E with the same AUX ch and we must pick port E :(

	 */

	child = &i915->vbt.ports[p]->child;

	child = &i915->display.vbt.ports[p]->child;



	child->device_type &= ~DEVICE_TYPE_DISPLAYPORT_OUTPUT;

	child->aux_channel = 0;
@@ -2482,10 +2482,10 @@ static int parse_bdb_216_dp_max_link_rate(const int vbt_max_link_rate) 


static int _intel_bios_dp_max_link_rate(const struct intel_bios_encoder_data *devdata)

{

	if (!devdata || devdata->i915->vbt.version < 216)

	if (!devdata || devdata->i915->display.vbt.version < 216)

		return 0;



	if (devdata->i915->vbt.version >= 230)

	if (devdata->i915->display.vbt.version >= 230)

		return parse_bdb_230_dp_max_link_rate(devdata->child.dp_max_link_rate);

	else

		return parse_bdb_216_dp_max_link_rate(devdata->child.dp_max_link_rate);
@@ -2546,7 +2546,7 @@ intel_bios_encoder_supports_edp(const struct intel_bios_encoder_data *devdata) 


static int _intel_bios_hdmi_level_shift(const struct intel_bios_encoder_data *devdata)

{

	if (!devdata || devdata->i915->vbt.version < 158)

	if (!devdata || devdata->i915->display.vbt.version < 158)

		return -1;



	return devdata->child.hdmi_level_shifter_value;
@@ -2554,7 +2554,7 @@ static int _intel_bios_hdmi_level_shift(const struct intel_bios_encoder_data *de 


static int _intel_bios_max_tmds_clock(const struct intel_bios_encoder_data *devdata)

{

	if (!devdata || devdata->i915->vbt.version < 204)

	if (!devdata || devdata->i915->display.vbt.version < 204)

		return 0;



	switch (devdata->child.hdmi_max_data_rate) {
@@ -2663,7 +2663,7 @@ static void parse_ddi_port(struct intel_bios_encoder_data *devdata) 
		return;

	}



	if (i915->vbt.ports[port]) {

	if (i915->display.vbt.ports[port]) {

		drm_dbg_kms(&i915->drm,

			    "More than one child device for port %c in VBT, using the first.\n",

			    port_name(port));
@@ -2678,7 +2678,7 @@ static void parse_ddi_port(struct intel_bios_encoder_data *devdata) 
	if (intel_bios_encoder_supports_dp(devdata))

		sanitize_aux_ch(devdata, port);



	i915->vbt.ports[port] = devdata;

	i915->display.vbt.ports[port] = devdata;

}



static bool has_ddi_port_info(struct drm_i915_private *i915)
@@ -2694,12 +2694,12 @@ static void parse_ddi_ports(struct drm_i915_private *i915) 
	if (!has_ddi_port_info(i915))

		return;



	list_for_each_entry(devdata, &i915->vbt.display_devices, node)

	list_for_each_entry(devdata, &i915->display.vbt.display_devices, node)

		parse_ddi_port(devdata);



	for_each_port(port) {

		if (i915->vbt.ports[port])

			print_ddi_port(i915->vbt.ports[port], port);

		if (i915->display.vbt.ports[port])

			print_ddi_port(i915->display.vbt.ports[port], port);

	}

}
@@ -2732,33 +2732,33 @@ parse_general_definitions(struct drm_i915_private *i915) 
	bus_pin = defs->crt_ddc_gmbus_pin;

	drm_dbg_kms(&i915->drm, "crt_ddc_bus_pin: %d\n", bus_pin);

	if (intel_gmbus_is_valid_pin(i915, bus_pin))

		i915->vbt.crt_ddc_pin = bus_pin;

		i915->display.vbt.crt_ddc_pin = bus_pin;



	if (i915->vbt.version < 106) {

	if (i915->display.vbt.version < 106) {

		expected_size = 22;

	} else if (i915->vbt.version < 111) {

	} else if (i915->display.vbt.version < 111) {

		expected_size = 27;

	} else if (i915->vbt.version < 195) {

	} else if (i915->display.vbt.version < 195) {

		expected_size = LEGACY_CHILD_DEVICE_CONFIG_SIZE;

	} else if (i915->vbt.version == 195) {

	} else if (i915->display.vbt.version == 195) {

		expected_size = 37;

	} else if (i915->vbt.version <= 215) {

	} else if (i915->display.vbt.version <= 215) {

		expected_size = 38;

	} else if (i915->vbt.version <= 237) {

	} else if (i915->display.vbt.version <= 237) {

		expected_size = 39;

	} else {

		expected_size = sizeof(*child);

		BUILD_BUG_ON(sizeof(*child) < 39);

		drm_dbg(&i915->drm,

			"Expected child device config size for VBT version %u not known; assuming %u\n",

			i915->vbt.version, expected_size);

			i915->display.vbt.version, expected_size);

	}



	/* Flag an error for unexpected size, but continue anyway. */

	if (defs->child_dev_size != expected_size)

		drm_err(&i915->drm,

			"Unexpected child device config size %u (expected %u for VBT version %u)\n",

			defs->child_dev_size, expected_size, i915->vbt.version);

			defs->child_dev_size, expected_size, i915->display.vbt.version);



	/* The legacy sized child device config is the minimum we need. */

	if (defs->child_dev_size < LEGACY_CHILD_DEVICE_CONFIG_SIZE) {
@@ -2794,10 +2794,10 @@ parse_general_definitions(struct drm_i915_private *i915) 
		memcpy(&devdata->child, child,

		       min_t(size_t, defs->child_dev_size, sizeof(*child)));



		list_add_tail(&devdata->node, &i915->vbt.display_devices);

		list_add_tail(&devdata->node, &i915->display.vbt.display_devices);

	}



	if (list_empty(&i915->vbt.display_devices))

	if (list_empty(&i915->display.vbt.display_devices))

		drm_dbg_kms(&i915->drm,

			    "no child dev is parsed from VBT\n");

}
@@ -2806,25 +2806,25 @@ parse_general_definitions(struct drm_i915_private *i915) 
static void

init_vbt_defaults(struct drm_i915_private *i915)

{

	i915->vbt.crt_ddc_pin = GMBUS_PIN_VGADDC;

	i915->display.vbt.crt_ddc_pin = GMBUS_PIN_VGADDC;



	/* general features */

	i915->vbt.int_tv_support = 1;

	i915->vbt.int_crt_support = 1;

	i915->display.vbt.int_tv_support = 1;

	i915->display.vbt.int_crt_support = 1;



	/* driver features */

	i915->vbt.int_lvds_support = 1;

	i915->display.vbt.int_lvds_support = 1;



	/* Default to using SSC */

	i915->vbt.lvds_use_ssc = 1;

	i915->display.vbt.lvds_use_ssc = 1;

	/*

	 * Core/SandyBridge/IvyBridge use alternative (120MHz) reference

	 * clock for LVDS.

	 */

	i915->vbt.lvds_ssc_freq = intel_bios_ssc_frequency(i915,

	i915->display.vbt.lvds_ssc_freq = intel_bios_ssc_frequency(i915,

								   !HAS_PCH_SPLIT(i915));

	drm_dbg_kms(&i915->drm, "Set default to SSC at %d kHz\n",

		    i915->vbt.lvds_ssc_freq);

		    i915->display.vbt.lvds_ssc_freq);

}



/* Common defaults which may be overridden by VBT. */
@@ -2885,7 +2885,7 @@ init_vbt_missing_defaults(struct drm_i915_private *i915) 
		if (port == PORT_A)

			child->device_type |= DEVICE_TYPE_INTERNAL_CONNECTOR;



		list_add_tail(&devdata->node, &i915->vbt.display_devices);

		list_add_tail(&devdata->node, &i915->display.vbt.display_devices);



		drm_dbg_kms(&i915->drm,

			    "Generating default VBT child device with type 0x04%x on port %c\n",
@@ -2893,7 +2893,7 @@ init_vbt_missing_defaults(struct drm_i915_private *i915) 
	}



	/* Bypass some minimum baseline VBT version checks */

	i915->vbt.version = 155;

	i915->display.vbt.version = 155;

}



static const struct bdb_header *get_bdb_header(const struct vbt_header *vbt)
@@ -3084,8 +3084,8 @@ void intel_bios_init(struct drm_i915_private *i915) 
	struct vbt_header *oprom_vbt = NULL;

	const struct bdb_header *bdb;



	INIT_LIST_HEAD(&i915->vbt.display_devices);

	INIT_LIST_HEAD(&i915->vbt.bdb_blocks);

	INIT_LIST_HEAD(&i915->display.vbt.display_devices);

	INIT_LIST_HEAD(&i915->display.vbt.bdb_blocks);



	if (!HAS_DISPLAY(i915)) {

		drm_dbg_kms(&i915->drm,
@@ -3113,11 +3113,11 @@ void intel_bios_init(struct drm_i915_private *i915) 
		goto out;



	bdb = get_bdb_header(vbt);

	i915->vbt.version = bdb->version;

	i915->display.vbt.version = bdb->version;



	drm_dbg_kms(&i915->drm,

		    "VBT signature \"%.*s\", BDB version %d\n",

		    (int)sizeof(vbt->signature), vbt->signature, i915->vbt.version);

		    (int)sizeof(vbt->signature), vbt->signature, i915->display.vbt.version);



	init_bdb_blocks(i915, bdb);
@@ -3174,13 +3174,13 @@ void intel_bios_driver_remove(struct drm_i915_private *i915) 
	struct intel_bios_encoder_data *devdata, *nd;

	struct bdb_block_entry *entry, *ne;



	list_for_each_entry_safe(devdata, nd, &i915->vbt.display_devices, node) {

	list_for_each_entry_safe(devdata, nd, &i915->display.vbt.display_devices, node) {

		list_del(&devdata->node);

		kfree(devdata->dsc);

		kfree(devdata);

	}



	list_for_each_entry_safe(entry, ne, &i915->vbt.bdb_blocks, node) {

	list_for_each_entry_safe(entry, ne, &i915->display.vbt.bdb_blocks, node) {

		list_del(&entry->node);

		kfree(entry);

	}
@@ -3214,13 +3214,13 @@ bool intel_bios_is_tv_present(struct drm_i915_private *i915) 
	const struct intel_bios_encoder_data *devdata;

	const struct child_device_config *child;



	if (!i915->vbt.int_tv_support)

	if (!i915->display.vbt.int_tv_support)

		return false;



	if (list_empty(&i915->vbt.display_devices))

	if (list_empty(&i915->display.vbt.display_devices))

		return true;



	list_for_each_entry(devdata, &i915->vbt.display_devices, node) {

	list_for_each_entry(devdata, &i915->display.vbt.display_devices, node) {

		child = &devdata->child;



		/*
@@ -3257,10 +3257,10 @@ bool intel_bios_is_lvds_present(struct drm_i915_private *i915, u8 *i2c_pin) 
	const struct intel_bios_encoder_data *devdata;

	const struct child_device_config *child;



	if (list_empty(&i915->vbt.display_devices))

	if (list_empty(&i915->display.vbt.display_devices))

		return true;



	list_for_each_entry(devdata, &i915->vbt.display_devices, node) {

	list_for_each_entry(devdata, &i915->display.vbt.display_devices, node) {

		child = &devdata->child;



		/* If the device type is not LFP, continue.
@@ -3306,7 +3306,7 @@ bool intel_bios_is_port_present(struct drm_i915_private *i915, enum port port) 
	if (WARN_ON(!has_ddi_port_info(i915)))

		return true;



	return i915->vbt.ports[port];

	return i915->display.vbt.ports[port];

}



/**
@@ -3366,7 +3366,7 @@ bool intel_bios_is_dsi_present(struct drm_i915_private *i915, 
	const struct child_device_config *child;

	u8 dvo_port;



	list_for_each_entry(devdata, &i915->vbt.display_devices, node) {

	list_for_each_entry(devdata, &i915->display.vbt.display_devices, node) {

		child = &devdata->child;



		if (!(child->device_type & DEVICE_TYPE_MIPI_OUTPUT))
@@ -3465,7 +3465,7 @@ bool intel_bios_get_dsc_params(struct intel_encoder *encoder, 
	const struct intel_bios_encoder_data *devdata;

	const struct child_device_config *child;



	list_for_each_entry(devdata, &i915->vbt.display_devices, node) {

	list_for_each_entry(devdata, &i915->display.vbt.display_devices, node) {

		child = &devdata->child;



		if (!(child->device_type & DEVICE_TYPE_MIPI_OUTPUT))
@@ -3496,7 +3496,7 @@ bool 
intel_bios_is_port_hpd_inverted(const struct drm_i915_private *i915,

				enum port port)

{

	const struct intel_bios_encoder_data *devdata = i915->vbt.ports[port];

	const struct intel_bios_encoder_data *devdata = i915->display.vbt.ports[port];



	if (drm_WARN_ON_ONCE(&i915->drm,

			     !IS_GEMINILAKE(i915) && !IS_BROXTON(i915)))
@@ -3516,7 +3516,7 @@ bool 
intel_bios_is_lspcon_present(const struct drm_i915_private *i915,

			     enum port port)

{

	const struct intel_bios_encoder_data *devdata = i915->vbt.ports[port];

	const struct intel_bios_encoder_data *devdata = i915->display.vbt.ports[port];



	return HAS_LSPCON(i915) && devdata && devdata->child.lspcon;

}
@@ -3532,7 +3532,7 @@ bool 
intel_bios_is_lane_reversal_needed(const struct drm_i915_private *i915,

				   enum port port)

{

	const struct intel_bios_encoder_data *devdata = i915->vbt.ports[port];

	const struct intel_bios_encoder_data *devdata = i915->display.vbt.ports[port];



	return devdata && devdata->child.lane_reversal;

}
@@ -3540,7 +3540,7 @@ intel_bios_is_lane_reversal_needed(const struct drm_i915_private *i915, 
enum aux_ch intel_bios_port_aux_ch(struct drm_i915_private *i915,

				   enum port port)

{

	const struct intel_bios_encoder_data *devdata = i915->vbt.ports[port];

	const struct intel_bios_encoder_data *devdata = i915->display.vbt.ports[port];

	enum aux_ch aux_ch;



	if (!devdata || !devdata->child.aux_channel) {
@@ -3634,7 +3634,7 @@ enum aux_ch intel_bios_port_aux_ch(struct drm_i915_private *i915, 
int intel_bios_max_tmds_clock(struct intel_encoder *encoder)

{

	struct drm_i915_private *i915 = to_i915(encoder->base.dev);

	const struct intel_bios_encoder_data *devdata = i915->vbt.ports[encoder->port];

	const struct intel_bios_encoder_data *devdata = i915->display.vbt.ports[encoder->port];



	return _intel_bios_max_tmds_clock(devdata);

}
@@ -3643,14 +3643,14 @@ int intel_bios_max_tmds_clock(struct intel_encoder *encoder) 
int intel_bios_hdmi_level_shift(struct intel_encoder *encoder)

{

	struct drm_i915_private *i915 = to_i915(encoder->base.dev);

	const struct intel_bios_encoder_data *devdata = i915->vbt.ports[encoder->port];

	const struct intel_bios_encoder_data *devdata = i915->display.vbt.ports[encoder->port];



	return _intel_bios_hdmi_level_shift(devdata);

}



int intel_bios_encoder_dp_boost_level(const struct intel_bios_encoder_data *devdata)

{

	if (!devdata || devdata->i915->vbt.version < 196 || !devdata->child.iboost)

	if (!devdata || devdata->i915->display.vbt.version < 196 || !devdata->child.iboost)

		return 0;



	return translate_iboost(devdata->child.dp_iboost_level);
@@ -3658,7 +3658,7 @@ int intel_bios_encoder_dp_boost_level(const struct intel_bios_encoder_data *devd 


int intel_bios_encoder_hdmi_boost_level(const struct intel_bios_encoder_data *devdata)

{

	if (!devdata || devdata->i915->vbt.version < 196 || !devdata->child.iboost)

	if (!devdata || devdata->i915->display.vbt.version < 196 || !devdata->child.iboost)

		return 0;



	return translate_iboost(devdata->child.hdmi_iboost_level);
@@ -3667,7 +3667,7 @@ int intel_bios_encoder_hdmi_boost_level(const struct intel_bios_encoder_data *de 
int intel_bios_dp_max_link_rate(struct intel_encoder *encoder)

{

	struct drm_i915_private *i915 = to_i915(encoder->base.dev);

	const struct intel_bios_encoder_data *devdata = i915->vbt.ports[encoder->port];

	const struct intel_bios_encoder_data *devdata = i915->display.vbt.ports[encoder->port];



	return _intel_bios_dp_max_link_rate(devdata);

}
@@ -3675,7 +3675,7 @@ int intel_bios_dp_max_link_rate(struct intel_encoder *encoder) 
int intel_bios_alternate_ddc_pin(struct intel_encoder *encoder)

{

	struct drm_i915_private *i915 = to_i915(encoder->base.dev);

	const struct intel_bios_encoder_data *devdata = i915->vbt.ports[encoder->port];

	const struct intel_bios_encoder_data *devdata = i915->display.vbt.ports[encoder->port];



	if (!devdata || !devdata->child.ddc_pin)

		return 0;
@@ -3685,16 +3685,16 @@ int intel_bios_alternate_ddc_pin(struct intel_encoder *encoder) 


bool intel_bios_encoder_supports_typec_usb(const struct intel_bios_encoder_data *devdata)

{

	return devdata->i915->vbt.version >= 195 && devdata->child.dp_usb_type_c;

	return devdata->i915->display.vbt.version >= 195 && devdata->child.dp_usb_type_c;

}



bool intel_bios_encoder_supports_tbt(const struct intel_bios_encoder_data *devdata)

{

	return devdata->i915->vbt.version >= 209 && devdata->child.tbt;

	return devdata->i915->display.vbt.version >= 209 && devdata->child.tbt;

}



const struct intel_bios_encoder_data *

intel_bios_encoder_data_lookup(struct drm_i915_private *i915, enum port port)

{

	return i915->vbt.ports[port];

	return i915->display.vbt.ports[port];

}

drivers/gpu/drm/i915/display/intel_crt.c

+2 −2
Original line number Diff line number Diff line
@@ -645,7 +645,7 @@ static bool intel_crt_detect_ddc(struct drm_connector *connector) 


	BUG_ON(crt->base.type != INTEL_OUTPUT_ANALOG);



	i2c = intel_gmbus_get_adapter(dev_priv, dev_priv->vbt.crt_ddc_pin);

	i2c = intel_gmbus_get_adapter(dev_priv, dev_priv->display.vbt.crt_ddc_pin);

	edid = intel_crt_get_edid(connector, i2c);



	if (edid) {
@@ -931,7 +931,7 @@ static int intel_crt_get_modes(struct drm_connector *connector) 
	wakeref = intel_display_power_get(dev_priv,

					  intel_encoder->power_domain);



	i2c = intel_gmbus_get_adapter(dev_priv, dev_priv->vbt.crt_ddc_pin);

	i2c = intel_gmbus_get_adapter(dev_priv, dev_priv->display.vbt.crt_ddc_pin);

	ret = intel_crt_ddc_get_modes(connector, i2c);

	if (ret || !IS_G4X(dev_priv))

		goto out;

drivers/gpu/drm/i915/display/intel_display.c

+6 −6
Original line number Diff line number Diff line
@@ -2772,12 +2772,12 @@ static void intel_panel_sanitize_ssc(struct drm_i915_private *dev_priv) 
						       PCH_DREF_CONTROL) &

			DREF_SSC1_ENABLE;



		if (dev_priv->vbt.lvds_use_ssc != bios_lvds_use_ssc) {

		if (dev_priv->display.vbt.lvds_use_ssc != bios_lvds_use_ssc) {

			drm_dbg_kms(&dev_priv->drm,

				    "SSC %s by BIOS, overriding VBT which says %s\n",

				    str_enabled_disabled(bios_lvds_use_ssc),

				    str_enabled_disabled(dev_priv->vbt.lvds_use_ssc));

			dev_priv->vbt.lvds_use_ssc = bios_lvds_use_ssc;

				    str_enabled_disabled(dev_priv->display.vbt.lvds_use_ssc));

			dev_priv->display.vbt.lvds_use_ssc = bios_lvds_use_ssc;

		}

	}

}
@@ -4373,7 +4373,7 @@ static int i9xx_pll_refclk(struct drm_device *dev, 
	u32 dpll = pipe_config->dpll_hw_state.dpll;



	if ((dpll & PLL_REF_INPUT_MASK) == PLLB_REF_INPUT_SPREADSPECTRUMIN)

		return dev_priv->vbt.lvds_ssc_freq;

		return dev_priv->display.vbt.lvds_ssc_freq;

	else if (HAS_PCH_SPLIT(dev_priv))

		return 120000;

	else if (DISPLAY_VER(dev_priv) != 2)
@@ -7923,7 +7923,7 @@ static bool intel_ddi_crt_present(struct drm_i915_private *dev_priv) 
	if (intel_de_read(dev_priv, DDI_BUF_CTL(PORT_A)) & DDI_A_4_LANES)

		return false;



	if (!dev_priv->vbt.int_crt_support)

	if (!dev_priv->display.vbt.int_crt_support)

		return false;



	return true;
@@ -8058,7 +8058,7 @@ static void intel_setup_outputs(struct drm_i915_private *dev_priv) 
	} else if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) {

		bool has_edp, has_port;



		if (IS_VALLEYVIEW(dev_priv) && dev_priv->vbt.int_crt_support)

		if (IS_VALLEYVIEW(dev_priv) && dev_priv->display.vbt.int_crt_support)

			intel_crt_init(dev_priv);



		/*

drivers/gpu/drm/i915/display/intel_display_core.h

+38 −0
Original line number Diff line number Diff line
@@ -6,11 +6,14 @@ 
#ifndef __INTEL_DISPLAY_CORE_H__

#define __INTEL_DISPLAY_CORE_H__



#include <linux/list.h>

#include <linux/mutex.h>

#include <linux/types.h>

#include <linux/wait.h>

#include <linux/workqueue.h>



#include <drm/drm_connector.h>



#include "intel_cdclk.h"

#include "intel_display.h"

#include "intel_dmc.h"
@@ -25,6 +28,7 @@ struct i915_audio_component; 
struct i915_hdcp_comp_master;

struct intel_atomic_state;

struct intel_audio_funcs;

struct intel_bios_encoder_data;

struct intel_cdclk_funcs;

struct intel_cdclk_vals;

struct intel_color_funcs;
@@ -153,6 +157,39 @@ struct intel_hotplug { 
	struct workqueue_struct *dp_wq;

};



struct intel_vbt_data {

	/* bdb version */

	u16 version;



	/* Feature bits */

	unsigned int int_tv_support:1;

	unsigned int int_crt_support:1;

	unsigned int lvds_use_ssc:1;

	unsigned int int_lvds_support:1;

	unsigned int display_clock_mode:1;

	unsigned int fdi_rx_polarity_inverted:1;

	int lvds_ssc_freq;

	enum drm_panel_orientation orientation;



	bool override_afc_startup;

	u8 override_afc_startup_val;



	int crt_ddc_pin;



	struct list_head display_devices;

	struct list_head bdb_blocks;



	struct intel_bios_encoder_data *ports[I915_MAX_PORTS]; /* Non-NULL if port present. */

	struct sdvo_device_mapping {

		u8 initialized;

		u8 dvo_port;

		u8 slave_addr;

		u8 dvo_wiring;

		u8 i2c_pin;

		u8 ddc_pin;

	} sdvo_mappings[2];

};



struct intel_wm {

	/*

	 * Raw watermark latency values:
@@ -311,6 +348,7 @@ struct intel_display { 
	struct intel_hotplug hotplug;

	struct intel_opregion opregion;

	struct intel_overlay *overlay;

	struct intel_vbt_data vbt;

	struct intel_wm wm;

};

drivers/gpu/drm/i915/display/intel_dp.c

+1 −1
Original line number Diff line number Diff line
@@ -5193,7 +5193,7 @@ intel_edp_add_properties(struct intel_dp *intel_dp) 
		return;



	drm_connector_set_panel_orientation_with_quirk(&connector->base,

						       i915->vbt.orientation,

						       i915->display.vbt.orientation,

						       fixed_mode->hdisplay,

						       fixed_mode->vdisplay);

}