Skip to content

Commit 9aec6f7

Browse files
committed
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: Imre Deak <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/0d0261a53aff5f141b16b482222a5ffce78e176e.1723213547.git.jani.nikula@intel.com Signed-off-by: Jani Nikula <[email protected]>
1 parent 769b081 commit 9aec6f7

18 files changed

+495
-451
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1279,6 +1279,7 @@ static const struct drm_encoder_funcs intel_dp_enc_funcs = {
12791279
bool g4x_dp_init(struct drm_i915_private *dev_priv,
12801280
i915_reg_t output_reg, enum port port)
12811281
{
1282+
struct intel_display *display = &dev_priv->display;
12821283
const struct intel_bios_encoder_data *devdata;
12831284
struct intel_digital_port *dig_port;
12841285
struct intel_encoder *intel_encoder;
@@ -1288,7 +1289,7 @@ bool g4x_dp_init(struct drm_i915_private *dev_priv,
12881289
if (!assert_port_valid(dev_priv, port))
12891290
return false;
12901291

1291-
devdata = intel_bios_encoder_data_lookup(dev_priv, port);
1292+
devdata = intel_bios_encoder_data_lookup(display, port);
12921293

12931294
/* FIXME bail? */
12941295
if (!devdata)

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -686,6 +686,7 @@ static bool assert_hdmi_port_valid(struct drm_i915_private *i915, enum port port
686686
void g4x_hdmi_init(struct drm_i915_private *dev_priv,
687687
i915_reg_t hdmi_reg, enum port port)
688688
{
689+
struct intel_display *display = &dev_priv->display;
689690
const struct intel_bios_encoder_data *devdata;
690691
struct intel_digital_port *dig_port;
691692
struct intel_encoder *intel_encoder;
@@ -697,7 +698,7 @@ void g4x_hdmi_init(struct drm_i915_private *dev_priv,
697698
if (!assert_hdmi_port_valid(dev_priv, port))
698699
return;
699700

700-
devdata = intel_bios_encoder_data_lookup(dev_priv, port);
701+
devdata = intel_bios_encoder_data_lookup(display, port);
701702

702703
/* FIXME bail? */
703704
if (!devdata)

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1945,6 +1945,7 @@ static void icl_dsi_add_properties(struct intel_connector *connector)
19451945
void icl_dsi_init(struct drm_i915_private *dev_priv,
19461946
const struct intel_bios_encoder_data *devdata)
19471947
{
1948+
struct intel_display *display = &dev_priv->display;
19481949
struct intel_dsi *intel_dsi;
19491950
struct intel_encoder *encoder;
19501951
struct intel_connector *intel_connector;
@@ -2008,7 +2009,7 @@ void icl_dsi_init(struct drm_i915_private *dev_priv,
20082009

20092010
intel_dsi->panel_power_off_time = ktime_get_boottime();
20102011

2011-
intel_bios_init_panel_late(dev_priv, &intel_connector->panel, encoder->devdata, NULL);
2012+
intel_bios_init_panel_late(display, &intel_connector->panel, encoder->devdata, NULL);
20122013

20132014
mutex_lock(&dev_priv->drm.mode_config.mutex);
20142015
intel_panel_add_vbt_lfp_fixed_mode(intel_connector);

0 commit comments

Comments
 (0)