[PATCH 2/5] drm/i915/bios: Enable parse of two integrated panels timing data
Animesh Manna
animesh.manna at intel.com
Wed May 25 16:53:18 UTC 2022
Continuing the conversion from single integrated VBT data to two.
Signed-off-by: Animesh Manna <animesh.manna at intel.com>
---
drivers/gpu/drm/i915/display/intel_bios.c | 43 ++++++++++++--------
drivers/gpu/drm/i915/display/intel_dsi_vbt.c | 8 +++-
drivers/gpu/drm/i915/display/intel_panel.c | 2 +-
drivers/gpu/drm/i915/i915_drv.h | 2 +-
4 files changed, 35 insertions(+), 20 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_bios.c b/drivers/gpu/drm/i915/display/intel_bios.c
index e7ebccb78ca7..19b14b23ca68 100644
--- a/drivers/gpu/drm/i915/display/intel_bios.c
+++ b/drivers/gpu/drm/i915/display/intel_bios.c
@@ -735,16 +735,17 @@ parse_panel_options(struct drm_i915_private *i915,
static void
parse_lfp_panel_dtd(struct drm_i915_private *i915,
const struct bdb_lvds_lfp_data *lvds_lfp_data,
- const struct bdb_lvds_lfp_data_ptrs *lvds_lfp_data_ptrs)
+ const struct bdb_lvds_lfp_data_ptrs *lvds_lfp_data_ptrs,
+ struct intel_bios_port_info *info,
+ int panel_index)
{
const struct lvds_dvo_timing *panel_dvo_timing;
const struct lvds_fp_timing *fp_timing;
struct drm_display_mode *panel_fixed_mode;
- int panel_type = i915->vbt.panel_type;
panel_dvo_timing = get_lvds_dvo_timing(lvds_lfp_data,
lvds_lfp_data_ptrs,
- panel_type);
+ panel_index);
panel_fixed_mode = kzalloc(sizeof(*panel_fixed_mode), GFP_KERNEL);
if (!panel_fixed_mode)
@@ -752,7 +753,7 @@ parse_lfp_panel_dtd(struct drm_i915_private *i915,
fill_detail_timing_data(panel_fixed_mode, panel_dvo_timing);
- i915->vbt.lfp_lvds_vbt_mode = panel_fixed_mode;
+ info->lfp_lvds_vbt_mode = panel_fixed_mode;
drm_dbg_kms(&i915->drm,
"Found panel mode in BIOS VBT legacy lfp table: " DRM_MODE_FMT "\n",
@@ -760,7 +761,7 @@ parse_lfp_panel_dtd(struct drm_i915_private *i915,
fp_timing = get_lvds_fp_timing(lvds_lfp_data,
lvds_lfp_data_ptrs,
- panel_type);
+ panel_index);
/* check the resolution, just to be sure */
if (fp_timing->x_res == panel_fixed_mode->hdisplay &&
@@ -773,7 +774,9 @@ parse_lfp_panel_dtd(struct drm_i915_private *i915,
}
static void
-parse_lfp_data(struct drm_i915_private *i915)
+parse_lfp_data(struct drm_i915_private *i915,
+ struct intel_bios_port_info *info,
+ int panel_index)
{
const struct bdb_lvds_lfp_data *data;
const struct bdb_lvds_lfp_data_tail *tail;
@@ -788,8 +791,8 @@ parse_lfp_data(struct drm_i915_private *i915)
if (!data)
return;
- if (!i915->vbt.lfp_lvds_vbt_mode)
- parse_lfp_panel_dtd(i915, data, ptrs);
+ if (!info->lfp_lvds_vbt_mode)
+ parse_lfp_panel_dtd(i915, data, ptrs, info, panel_index);
tail = get_lfp_data_tail(data, ptrs);
if (!tail)
@@ -805,7 +808,9 @@ parse_lfp_data(struct drm_i915_private *i915)
}
static void
-parse_generic_dtd(struct drm_i915_private *i915)
+parse_generic_dtd(struct drm_i915_private *i915,
+ struct intel_bios_port_info *info,
+ int panel_index)
{
const struct bdb_generic_dtd *generic_dtd;
const struct generic_dtd_entry *dtd;
@@ -840,14 +845,14 @@ parse_generic_dtd(struct drm_i915_private *i915)
num_dtd = (get_blocksize(generic_dtd) -
sizeof(struct bdb_generic_dtd)) / generic_dtd->gdtd_size;
- if (i915->vbt.panel_type >= num_dtd) {
+ if (panel_index >= num_dtd) {
drm_err(&i915->drm,
"Panel type %d not found in table of %d DTD's\n",
- i915->vbt.panel_type, num_dtd);
+ panel_index, num_dtd);
return;
}
- dtd = &generic_dtd->dtd[i915->vbt.panel_type];
+ dtd = &generic_dtd->dtd[panel_index];
panel_fixed_mode = kzalloc(sizeof(*panel_fixed_mode), GFP_KERNEL);
if (!panel_fixed_mode)
@@ -890,7 +895,7 @@ parse_generic_dtd(struct drm_i915_private *i915)
"Found panel mode in BIOS VBT generic dtd table: " DRM_MODE_FMT "\n",
DRM_MODE_ARG(panel_fixed_mode));
- i915->vbt.lfp_lvds_vbt_mode = panel_fixed_mode;
+ info->lfp_lvds_vbt_mode = panel_fixed_mode;
}
static void
@@ -2524,6 +2529,8 @@ static void parse_integrated_panel(struct drm_i915_private *i915,
parse_panel_options(i915, bdb, info, panel_index);
parse_power_conservation_features(i915, bdb, info, panel_index);
parse_driver_features_drrs_only(i915, bdb, info);
+ parse_generic_dtd(i915, info, panel_index);
+ parse_lfp_data(i915, info, panel_index);
}
static void parse_ddi_port(struct drm_i915_private *i915,
@@ -3038,8 +3045,6 @@ void intel_bios_init(struct drm_i915_private *i915)
parse_general_features(i915);
parse_general_definitions(i915);
parse_panel_type(i915);
- parse_generic_dtd(i915);
- parse_lfp_data(i915);
parse_lfp_backlight(i915);
parse_sdvo_panel_data(i915);
parse_driver_features(i915);
@@ -3073,6 +3078,7 @@ void intel_bios_driver_remove(struct drm_i915_private *i915)
{
struct intel_bios_encoder_data *devdata, *nd;
struct bdb_block_entry *entry, *ne;
+ int i;
list_for_each_entry_safe(devdata, nd, &i915->vbt.display_devices, node) {
list_del(&devdata->node);
@@ -3085,10 +3091,13 @@ void intel_bios_driver_remove(struct drm_i915_private *i915)
kfree(entry);
}
+ for (i = 0; i < I915_MAX_PORTS; i++) {
+ kfree(i915->vbt.port_info[i].lfp_lvds_vbt_mode);
+ i915->vbt.port_info[i].lfp_lvds_vbt_mode = NULL;
+ }
+
kfree(i915->vbt.sdvo_lvds_vbt_mode);
i915->vbt.sdvo_lvds_vbt_mode = NULL;
- kfree(i915->vbt.lfp_lvds_vbt_mode);
- i915->vbt.lfp_lvds_vbt_mode = NULL;
kfree(i915->vbt.dsi.data);
i915->vbt.dsi.data = NULL;
kfree(i915->vbt.dsi.pps);
diff --git a/drivers/gpu/drm/i915/display/intel_dsi_vbt.c b/drivers/gpu/drm/i915/display/intel_dsi_vbt.c
index dd24aef925f2..905a35412979 100644
--- a/drivers/gpu/drm/i915/display/intel_dsi_vbt.c
+++ b/drivers/gpu/drm/i915/display/intel_dsi_vbt.c
@@ -736,10 +736,16 @@ bool intel_dsi_vbt_init(struct intel_dsi *intel_dsi, u16 panel_id)
struct drm_i915_private *dev_priv = to_i915(dev);
struct mipi_config *mipi_config = dev_priv->vbt.dsi.config;
struct mipi_pps_data *pps = dev_priv->vbt.dsi.pps;
- struct drm_display_mode *mode = dev_priv->vbt.lfp_lvds_vbt_mode;
+ struct intel_encoder *encoder = &intel_dsi->base;
+ const struct drm_display_mode *mode = dev_priv->vbt.port_info[encoder->port].lfp_lvds_vbt_mode;
u16 burst_mode_ratio;
enum port port;
+ if (!mode) {
+ drm_dbg_kms(&dev_priv->drm, "lfp_lvds_vbt_mode not set\n");
+ return false;
+ }
+
drm_dbg_kms(&dev_priv->drm, "\n");
intel_dsi->eotp_pkt = mipi_config->eot_pkt_disabled ? 0 : 1;
diff --git a/drivers/gpu/drm/i915/display/intel_panel.c b/drivers/gpu/drm/i915/display/intel_panel.c
index d1d1b59102d6..cfbcc9cd86d6 100644
--- a/drivers/gpu/drm/i915/display/intel_panel.c
+++ b/drivers/gpu/drm/i915/display/intel_panel.c
@@ -260,7 +260,7 @@ void intel_panel_add_vbt_lfp_fixed_mode(struct intel_connector *connector)
struct drm_i915_private *i915 = to_i915(connector->base.dev);
const struct drm_display_mode *mode;
- mode = i915->vbt.lfp_lvds_vbt_mode;
+ mode = i915->vbt.port_info[connector->encoder->port].lfp_lvds_vbt_mode;
if (!mode)
return;
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index f2dbed67f567..7123a7d4cf6c 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -306,13 +306,13 @@ i915_fence_timeout(const struct drm_i915_private *i915)
struct intel_bios_port_info {
enum drrs_type drrs_type;
+ struct drm_display_mode *lfp_lvds_vbt_mode; /* if any */
};
struct intel_vbt_data {
/* bdb version */
u16 version;
- struct drm_display_mode *lfp_lvds_vbt_mode; /* if any */
struct drm_display_mode *sdvo_lvds_vbt_mode; /* if any */
/* Feature bits */
--
2.29.0
More information about the Intel-gfx-trybot
mailing list