[Intel-gfx] [PATCH] drm/i915/bios: Rename find_section to find_bdb_section
Maarten Lankhorst
maarten.lankhorst at linux.intel.com
Wed Mar 15 12:21:05 UTC 2023
Hey,
Feel free to merge once CI build results are in. Should have sent it
after Xe went public. :)
~Maarten
On 2023-03-15 13:19, Jani Nikula wrote:
> From: Maarten Lankhorst <maarten.lankhorst at linux.intel.com>
>
> This prevents a namespace collision on other archs.
>
> Signed-off-by: Maarten Lankhorst <maarten.lankhorst at linux.intel.com>
> Signed-off-by: Jani Nikula <jani.nikula at intel.com>
> ---
> drivers/gpu/drm/i915/display/intel_bios.c | 46 +++++++++++------------
> 1 file changed, 23 insertions(+), 23 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_bios.c b/drivers/gpu/drm/i915/display/intel_bios.c
> index e54febd34ca9..75e69dffc5e9 100644
> --- a/drivers/gpu/drm/i915/display/intel_bios.c
> +++ b/drivers/gpu/drm/i915/display/intel_bios.c
> @@ -141,8 +141,8 @@ struct bdb_block_entry {
> };
>
> static const void *
> -find_section(struct drm_i915_private *i915,
> - enum bdb_block_id section_id)
> +bdb_find_section(struct drm_i915_private *i915,
> + enum bdb_block_id section_id)
> {
> struct bdb_block_entry *entry;
>
> @@ -201,7 +201,7 @@ static size_t lfp_data_min_size(struct drm_i915_private *i915)
> const struct bdb_lvds_lfp_data_ptrs *ptrs;
> size_t size;
>
> - ptrs = find_section(i915, BDB_LVDS_LFP_DATA_PTRS);
> + ptrs = bdb_find_section(i915, BDB_LVDS_LFP_DATA_PTRS);
> if (!ptrs)
> return 0;
>
> @@ -630,7 +630,7 @@ static int vbt_get_panel_type(struct drm_i915_private *i915,
> {
> const struct bdb_lvds_options *lvds_options;
>
> - lvds_options = find_section(i915, BDB_LVDS_OPTIONS);
> + lvds_options = bdb_find_section(i915, BDB_LVDS_OPTIONS);
> if (!lvds_options)
> return -1;
>
> @@ -671,11 +671,11 @@ static int pnpid_get_panel_type(struct drm_i915_private *i915,
>
> dump_pnp_id(i915, edid_id, "EDID");
>
> - ptrs = find_section(i915, BDB_LVDS_LFP_DATA_PTRS);
> + ptrs = bdb_find_section(i915, BDB_LVDS_LFP_DATA_PTRS);
> if (!ptrs)
> return -1;
>
> - data = find_section(i915, BDB_LVDS_LFP_DATA);
> + data = bdb_find_section(i915, BDB_LVDS_LFP_DATA);
> if (!data)
> return -1;
>
> @@ -791,7 +791,7 @@ parse_panel_options(struct drm_i915_private *i915,
> int panel_type = panel->vbt.panel_type;
> int drrs_mode;
>
> - lvds_options = find_section(i915, BDB_LVDS_OPTIONS);
> + lvds_options = bdb_find_section(i915, BDB_LVDS_OPTIONS);
> if (!lvds_options)
> return;
>
> @@ -881,11 +881,11 @@ parse_lfp_data(struct drm_i915_private *i915,
> const struct lvds_pnp_id *pnp_id;
> int panel_type = panel->vbt.panel_type;
>
> - ptrs = find_section(i915, BDB_LVDS_LFP_DATA_PTRS);
> + ptrs = bdb_find_section(i915, BDB_LVDS_LFP_DATA_PTRS);
> if (!ptrs)
> return;
>
> - data = find_section(i915, BDB_LVDS_LFP_DATA);
> + data = bdb_find_section(i915, BDB_LVDS_LFP_DATA);
> if (!data)
> return;
>
> @@ -932,7 +932,7 @@ parse_generic_dtd(struct drm_i915_private *i915,
> if (i915->display.vbt.version < 229)
> return;
>
> - generic_dtd = find_section(i915, BDB_GENERIC_DTD);
> + generic_dtd = bdb_find_section(i915, BDB_GENERIC_DTD);
> if (!generic_dtd)
> return;
>
> @@ -1011,7 +1011,7 @@ parse_lfp_backlight(struct drm_i915_private *i915,
> int panel_type = panel->vbt.panel_type;
> u16 level;
>
> - backlight_data = find_section(i915, BDB_LVDS_BACKLIGHT);
> + backlight_data = bdb_find_section(i915, BDB_LVDS_BACKLIGHT);
> if (!backlight_data)
> return;
>
> @@ -1119,14 +1119,14 @@ parse_sdvo_panel_data(struct drm_i915_private *i915,
> if (index == -1) {
> const struct bdb_sdvo_lvds_options *sdvo_lvds_options;
>
> - sdvo_lvds_options = find_section(i915, BDB_SDVO_LVDS_OPTIONS);
> + sdvo_lvds_options = bdb_find_section(i915, BDB_SDVO_LVDS_OPTIONS);
> if (!sdvo_lvds_options)
> return;
>
> index = sdvo_lvds_options->panel_type;
> }
>
> - dtds = find_section(i915, BDB_SDVO_PANEL_DTDS);
> + dtds = bdb_find_section(i915, BDB_SDVO_PANEL_DTDS);
> if (!dtds)
> return;
>
> @@ -1162,7 +1162,7 @@ parse_general_features(struct drm_i915_private *i915)
> {
> const struct bdb_general_features *general;
>
> - general = find_section(i915, BDB_GENERAL_FEATURES);
> + general = bdb_find_section(i915, BDB_GENERAL_FEATURES);
> if (!general)
> return;
>
> @@ -1285,7 +1285,7 @@ parse_driver_features(struct drm_i915_private *i915)
> {
> const struct bdb_driver_features *driver;
>
> - driver = find_section(i915, BDB_DRIVER_FEATURES);
> + driver = bdb_find_section(i915, BDB_DRIVER_FEATURES);
> if (!driver)
> return;
>
> @@ -1322,7 +1322,7 @@ parse_panel_driver_features(struct drm_i915_private *i915,
> {
> const struct bdb_driver_features *driver;
>
> - driver = find_section(i915, BDB_DRIVER_FEATURES);
> + driver = bdb_find_section(i915, BDB_DRIVER_FEATURES);
> if (!driver)
> return;
>
> @@ -1362,7 +1362,7 @@ parse_power_conservation_features(struct drm_i915_private *i915,
> if (i915->display.vbt.version < 228)
> return;
>
> - power = find_section(i915, BDB_LFP_POWER);
> + power = bdb_find_section(i915, BDB_LFP_POWER);
> if (!power)
> return;
>
> @@ -1402,7 +1402,7 @@ parse_edp(struct drm_i915_private *i915,
> const struct edp_fast_link_params *edp_link_params;
> int panel_type = panel->vbt.panel_type;
>
> - edp = find_section(i915, BDB_EDP);
> + edp = bdb_find_section(i915, BDB_EDP);
> if (!edp)
> return;
>
> @@ -1532,7 +1532,7 @@ parse_psr(struct drm_i915_private *i915,
> const struct psr_table *psr_table;
> int panel_type = panel->vbt.panel_type;
>
> - psr = find_section(i915, BDB_PSR);
> + psr = bdb_find_section(i915, BDB_PSR);
> if (!psr) {
> drm_dbg_kms(&i915->drm, "No PSR BDB found.\n");
> return;
> @@ -1693,7 +1693,7 @@ parse_mipi_config(struct drm_i915_private *i915,
> /* Parse #52 for panel index used from panel_type already
> * parsed
> */
> - start = find_section(i915, BDB_MIPI_CONFIG);
> + start = bdb_find_section(i915, BDB_MIPI_CONFIG);
> if (!start) {
> drm_dbg_kms(&i915->drm, "No MIPI config BDB found");
> return;
> @@ -2005,7 +2005,7 @@ parse_mipi_sequence(struct drm_i915_private *i915,
> if (panel->vbt.dsi.panel_id != MIPI_DSI_GENERIC_PANEL_ID)
> return;
>
> - sequence = find_section(i915, BDB_MIPI_SEQUENCE);
> + sequence = bdb_find_section(i915, BDB_MIPI_SEQUENCE);
> if (!sequence) {
> drm_dbg_kms(&i915->drm,
> "No MIPI Sequence found, parsing complete\n");
> @@ -2086,7 +2086,7 @@ parse_compression_parameters(struct drm_i915_private *i915)
> if (i915->display.vbt.version < 198)
> return;
>
> - params = find_section(i915, BDB_COMPRESSION_PARAMETERS);
> + params = bdb_find_section(i915, BDB_COMPRESSION_PARAMETERS);
> if (params) {
> /* Sanity checks */
> if (params->entry_size != sizeof(params->data[0])) {
> @@ -2792,7 +2792,7 @@ parse_general_definitions(struct drm_i915_private *i915)
> u16 block_size;
> int bus_pin;
>
> - defs = find_section(i915, BDB_GENERAL_DEFINITIONS);
> + defs = bdb_find_section(i915, BDB_GENERAL_DEFINITIONS);
> if (!defs) {
> drm_dbg_kms(&i915->drm,
> "No general definition block is found, no devices defined.\n");
More information about the Intel-gfx
mailing list