Commit 9aec6f76 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915/bios: convert to struct intel_display 



Going forward, struct intel_display shall replace struct
drm_i915_private as the main display device data pointer type. Convert
intel_bios.[ch] to struct intel_display.

Do one drive-by conversion of unnecessary hex usage to decimal.

Reviewed-by: default avatarImre Deak <imre.deak@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/0d0261a53aff5f141b16b482222a5ffce78e176e.1723213547.git.jani.nikula@intel.com


Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parent 769b081c

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

+2 −1
Original line number Diff line number Diff line
@@ -1279,6 +1279,7 @@ static const struct drm_encoder_funcs intel_dp_enc_funcs = { 
bool g4x_dp_init(struct drm_i915_private *dev_priv,

		 i915_reg_t output_reg, enum port port)

{

	struct intel_display *display = &dev_priv->display;

	const struct intel_bios_encoder_data *devdata;

	struct intel_digital_port *dig_port;

	struct intel_encoder *intel_encoder;
@@ -1288,7 +1289,7 @@ bool g4x_dp_init(struct drm_i915_private *dev_priv, 
	if (!assert_port_valid(dev_priv, port))

		return false;



	devdata = intel_bios_encoder_data_lookup(dev_priv, port);

	devdata = intel_bios_encoder_data_lookup(display, port);



	/* FIXME bail? */

	if (!devdata)

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

+2 −1
Original line number Diff line number Diff line
@@ -686,6 +686,7 @@ static bool assert_hdmi_port_valid(struct drm_i915_private *i915, enum port port 
void g4x_hdmi_init(struct drm_i915_private *dev_priv,

		   i915_reg_t hdmi_reg, enum port port)

{

	struct intel_display *display = &dev_priv->display;

	const struct intel_bios_encoder_data *devdata;

	struct intel_digital_port *dig_port;

	struct intel_encoder *intel_encoder;
@@ -697,7 +698,7 @@ void g4x_hdmi_init(struct drm_i915_private *dev_priv, 
	if (!assert_hdmi_port_valid(dev_priv, port))

		return;



	devdata = intel_bios_encoder_data_lookup(dev_priv, port);

	devdata = intel_bios_encoder_data_lookup(display, port);



	/* FIXME bail? */

	if (!devdata)

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

+2 −1
Original line number Diff line number Diff line
@@ -1945,6 +1945,7 @@ static void icl_dsi_add_properties(struct intel_connector *connector) 
void icl_dsi_init(struct drm_i915_private *dev_priv,

		  const struct intel_bios_encoder_data *devdata)

{

	struct intel_display *display = &dev_priv->display;

	struct intel_dsi *intel_dsi;

	struct intel_encoder *encoder;

	struct intel_connector *intel_connector;
@@ -2008,7 +2009,7 @@ void icl_dsi_init(struct drm_i915_private *dev_priv, 


	intel_dsi->panel_power_off_time = ktime_get_boottime();



	intel_bios_init_panel_late(dev_priv, &intel_connector->panel, encoder->devdata, NULL);

	intel_bios_init_panel_late(display, &intel_connector->panel, encoder->devdata, NULL);



	mutex_lock(&dev_priv->drm.mode_config.mutex);

	intel_panel_add_vbt_lfp_fixed_mode(intel_connector);

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

+436 −408

File changed.

Preview size limit exceeded, changes collapsed.

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

+14 −14
Original line number Diff line number Diff line
@@ -33,9 +33,9 @@ 
#include <linux/types.h>



struct drm_edid;

struct drm_i915_private;

struct intel_bios_encoder_data;

struct intel_crtc_state;

struct intel_display;

struct intel_encoder;

struct intel_panel;

enum aux_ch;
@@ -232,28 +232,28 @@ struct mipi_pps_data { 
	u16 panel_power_cycle_delay;

} __packed;



void intel_bios_init(struct drm_i915_private *dev_priv);

void intel_bios_init_panel_early(struct drm_i915_private *dev_priv,

void intel_bios_init(struct intel_display *display);

void intel_bios_init_panel_early(struct intel_display *display,

				 struct intel_panel *panel,

				 const struct intel_bios_encoder_data *devdata);

void intel_bios_init_panel_late(struct drm_i915_private *dev_priv,

void intel_bios_init_panel_late(struct intel_display *display,

				struct intel_panel *panel,

				const struct intel_bios_encoder_data *devdata,

				const struct drm_edid *drm_edid);

void intel_bios_fini_panel(struct intel_panel *panel);

void intel_bios_driver_remove(struct drm_i915_private *dev_priv);

bool intel_bios_is_valid_vbt(struct drm_i915_private *i915,

void intel_bios_driver_remove(struct intel_display *display);

bool intel_bios_is_valid_vbt(struct intel_display *display,

			     const void *buf, size_t size);

bool intel_bios_is_tv_present(struct drm_i915_private *dev_priv);

bool intel_bios_is_lvds_present(struct drm_i915_private *dev_priv, u8 *i2c_pin);

bool intel_bios_is_port_present(struct drm_i915_private *dev_priv, enum port port);

bool intel_bios_is_dsi_present(struct drm_i915_private *dev_priv, enum port *port);

bool intel_bios_is_tv_present(struct intel_display *display);

bool intel_bios_is_lvds_present(struct intel_display *display, u8 *i2c_pin);

bool intel_bios_is_port_present(struct intel_display *display, enum port port);

bool intel_bios_is_dsi_present(struct intel_display *display, enum port *port);

bool intel_bios_get_dsc_params(struct intel_encoder *encoder,

			       struct intel_crtc_state *crtc_state,

			       int dsc_max_bpc);



const struct intel_bios_encoder_data *

intel_bios_encoder_data_lookup(struct drm_i915_private *i915, enum port port);

intel_bios_encoder_data_lookup(struct intel_display *display, enum port port);



bool intel_bios_encoder_supports_dvi(const struct intel_bios_encoder_data *devdata);

bool intel_bios_encoder_supports_hdmi(const struct intel_bios_encoder_data *devdata);
@@ -277,10 +277,10 @@ int intel_bios_hdmi_ddc_pin(const struct intel_bios_encoder_data *devdata); 
int intel_bios_hdmi_level_shift(const struct intel_bios_encoder_data *devdata);

int intel_bios_hdmi_max_tmds_clock(const struct intel_bios_encoder_data *devdata);



void intel_bios_for_each_encoder(struct drm_i915_private *i915,

				 void (*func)(struct drm_i915_private *i915,

void intel_bios_for_each_encoder(struct intel_display *display,

				 void (*func)(struct intel_display *display,

					      const struct intel_bios_encoder_data *devdata));



void intel_bios_debugfs_register(struct drm_i915_private *i915);

void intel_bios_debugfs_register(struct intel_display *display);



#endif /* _INTEL_BIOS_H_ */