From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 1BCB2C6FD1D for ; Wed, 15 Mar 2023 12:21:23 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9C9E110E9BF; Wed, 15 Mar 2023 12:21:22 +0000 (UTC) Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by gabe.freedesktop.org (Postfix) with ESMTPS id 62BAE10E386 for ; Wed, 15 Mar 2023 12:21:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1678882880; x=1710418880; h=message-id:date:mime-version:subject:to:references:from: in-reply-to:content-transfer-encoding; bh=H5CjZ2I9OLcI5ANpClqt5Etf55Cl8mSCQT7xBzYYOwU=; b=gYqWqDW/FHAlI45GvBKSwUqvA8/8WP4xClYTUfBvl4vFriSE20BKk0Cg bieoFVQesbigJ6oTRjsNGtGZTOGe6dmMnbT+JfBh5kp7EsrpCBYTb0OzQ q6kjnsP1BIVqmn9z0n1KSjKknyN3dVz++qm1hWN4B662JwFsNWPqjARIm uF4/GL+KFboq0hnwqCdMe4CjjHhl4erBcy3K0760yxn5pP6lzccDMWtGD iqU6w/x/XB/1ajosvoUkbO87s5PiJ0/0mo2QJrUv/BYAAyGNUsIgnvLNA Dp4FYAVNjj1hBePIx39gv9l/u5wFuOM2xxcZCK7nStaiBBZPMl3AFzRrU A==; X-IronPort-AV: E=McAfee;i="6500,9779,10649"; a="321524867" X-IronPort-AV: E=Sophos;i="5.98,262,1673942400"; d="scan'208";a="321524867" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Mar 2023 05:21:08 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10649"; a="656741196" X-IronPort-AV: E=Sophos;i="5.98,262,1673942400"; d="scan'208";a="656741196" Received: from amanojku-mobl.ger.corp.intel.com (HELO [10.249.43.130]) ([10.249.43.130]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Mar 2023 05:21:07 -0700 Message-ID: <67754c33-a6af-8f33-67cd-e59d50632461@linux.intel.com> Date: Wed, 15 Mar 2023 13:21:05 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Firefox/102.0 Thunderbird/102.9.0 To: Jani Nikula , intel-gfx@lists.freedesktop.org References: <20230315121924.2314693-1-jani.nikula@intel.com> Content-Language: en-US From: Maarten Lankhorst In-Reply-To: <20230315121924.2314693-1-jani.nikula@intel.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Intel-gfx] [PATCH] drm/i915/bios: Rename find_section to find_bdb_section X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" 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 > > This prevents a namespace collision on other archs. > > Signed-off-by: Maarten Lankhorst > Signed-off-by: Jani Nikula > --- > 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");