Commit 8e266908 authored by Ville Syrjälä's avatar Ville Syrjälä

drm/i915/bios: Rename SDVO DTD blocks a bit

The SDVO LVDS blocks are specifically about LVDS, so stick
to naming that reflects that. This also makes the names match
the spec.
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240503122449.27266-6-ville.syrjala@linux.intel.comAcked-by: default avatarJani Nikula <jani.nikula@intel.com>
parent 6ac67ccf
...@@ -170,8 +170,8 @@ static const struct { ...@@ -170,8 +170,8 @@ static const struct {
.min_size = sizeof(struct bdb_driver_features), }, .min_size = sizeof(struct bdb_driver_features), },
{ .section_id = BDB_SDVO_LVDS_OPTIONS, { .section_id = BDB_SDVO_LVDS_OPTIONS,
.min_size = sizeof(struct bdb_sdvo_lvds_options), }, .min_size = sizeof(struct bdb_sdvo_lvds_options), },
{ .section_id = BDB_SDVO_PANEL_DTDS, { .section_id = BDB_SDVO_LVDS_DTD,
.min_size = sizeof(struct bdb_sdvo_panel_dtds), }, .min_size = sizeof(struct bdb_sdvo_lvds_dtd), },
{ .section_id = BDB_EDP, { .section_id = BDB_EDP,
.min_size = sizeof(struct bdb_edp), }, .min_size = sizeof(struct bdb_edp), },
{ .section_id = BDB_LFP_OPTIONS, { .section_id = BDB_LFP_OPTIONS,
...@@ -1091,19 +1091,18 @@ parse_lfp_backlight(struct drm_i915_private *i915, ...@@ -1091,19 +1091,18 @@ parse_lfp_backlight(struct drm_i915_private *i915,
panel->vbt.backlight.controller); panel->vbt.backlight.controller);
} }
/* Try to find sdvo panel data */
static void static void
parse_sdvo_panel_data(struct drm_i915_private *i915, parse_sdvo_lvds_data(struct drm_i915_private *i915,
struct intel_panel *panel) struct intel_panel *panel)
{ {
const struct bdb_sdvo_panel_dtds *dtds; const struct bdb_sdvo_lvds_dtd *dtd;
struct drm_display_mode *panel_fixed_mode; struct drm_display_mode *panel_fixed_mode;
int index; int index;
index = i915->display.params.vbt_sdvo_panel_type; index = i915->display.params.vbt_sdvo_panel_type;
if (index == -2) { if (index == -2) {
drm_dbg_kms(&i915->drm, drm_dbg_kms(&i915->drm,
"Ignore SDVO panel mode from BIOS VBT tables.\n"); "Ignore SDVO LVDS mode from BIOS VBT tables.\n");
return; return;
} }
...@@ -1117,20 +1116,20 @@ parse_sdvo_panel_data(struct drm_i915_private *i915, ...@@ -1117,20 +1116,20 @@ parse_sdvo_panel_data(struct drm_i915_private *i915,
index = sdvo_lvds_options->panel_type; index = sdvo_lvds_options->panel_type;
} }
dtds = bdb_find_section(i915, BDB_SDVO_PANEL_DTDS); dtd = bdb_find_section(i915, BDB_SDVO_LVDS_DTD);
if (!dtds) if (!dtd)
return; return;
panel_fixed_mode = kzalloc(sizeof(*panel_fixed_mode), GFP_KERNEL); panel_fixed_mode = kzalloc(sizeof(*panel_fixed_mode), GFP_KERNEL);
if (!panel_fixed_mode) if (!panel_fixed_mode)
return; return;
fill_detail_timing_data(i915, panel_fixed_mode, &dtds->dtds[index]); fill_detail_timing_data(i915, panel_fixed_mode, &dtd->dtd[index]);
panel->vbt.sdvo_lvds_vbt_mode = panel_fixed_mode; panel->vbt.sdvo_lvds_vbt_mode = panel_fixed_mode;
drm_dbg_kms(&i915->drm, drm_dbg_kms(&i915->drm,
"Found SDVO panel mode in BIOS VBT tables: " DRM_MODE_FMT "\n", "Found SDVO LVDS mode in BIOS VBT tables: " DRM_MODE_FMT "\n",
DRM_MODE_ARG(panel_fixed_mode)); DRM_MODE_ARG(panel_fixed_mode));
} }
...@@ -3257,7 +3256,7 @@ static void intel_bios_init_panel(struct drm_i915_private *i915, ...@@ -3257,7 +3256,7 @@ static void intel_bios_init_panel(struct drm_i915_private *i915,
parse_generic_dtd(i915, panel); parse_generic_dtd(i915, panel);
parse_lfp_data(i915, panel); parse_lfp_data(i915, panel);
parse_lfp_backlight(i915, panel); parse_lfp_backlight(i915, panel);
parse_sdvo_panel_data(i915, panel); parse_sdvo_lvds_data(i915, panel);
parse_panel_driver_features(i915, panel); parse_panel_driver_features(i915, panel);
parse_power_conservation_features(i915, panel); parse_power_conservation_features(i915, panel);
parse_edp(i915, panel); parse_edp(i915, panel);
......
...@@ -160,9 +160,9 @@ enum bdb_block_id { ...@@ -160,9 +160,9 @@ enum bdb_block_id {
BDB_OEM_CUSTOM = 20, BDB_OEM_CUSTOM = 20,
BDB_EFP_LIST = 21, /* workarounds for VGA hsync/vsync */ BDB_EFP_LIST = 21, /* workarounds for VGA hsync/vsync */
BDB_SDVO_LVDS_OPTIONS = 22, BDB_SDVO_LVDS_OPTIONS = 22,
BDB_SDVO_PANEL_DTDS = 23, BDB_SDVO_LVDS_DTD = 23,
BDB_SDVO_LVDS_PNP_IDS = 24, BDB_SDVO_LVDS_PNP_ID = 24,
BDB_SDVO_LVDS_POWER_SEQ = 25, BDB_SDVO_LVDS_PPS = 25,
BDB_TV_OPTIONS = 26, BDB_TV_OPTIONS = 26,
BDB_EDP = 27, BDB_EDP = 27,
BDB_LFP_OPTIONS = 40, BDB_LFP_OPTIONS = 40,
...@@ -686,11 +686,11 @@ struct bdb_sdvo_lvds_options { ...@@ -686,11 +686,11 @@ struct bdb_sdvo_lvds_options {
} __packed; } __packed;
/* /*
* Block 23 - SDVO LVDS Panel DTDs * Block 23 - SDVO LVDS DTD
*/ */
struct bdb_sdvo_panel_dtds { struct bdb_sdvo_lvds_dtd {
struct bdb_edid_dtd dtds[4]; struct bdb_edid_dtd dtd[4];
} __packed; } __packed;
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment