[PATCH i-g-t 2/5] tools/intel_vbt_decode: Remove intel_bios.h

[Kamil Konieczny]

Hi Jani,
On 2025-08-14 at 15:48:53 +0300, Jani Nikula wrote:
> With the DSI VBT defs having been split to a separate file, intel_bios.h
> has become rather small. Incorporate the remaining contents to
> intel_vbt_decode.c. Use existing macros for LVDS config.
> 
> Signed-off-by: Jani Nikula <jani.nikula at intel.com>

Please resend this as fdo patchwork has some problems and this one
is missing (so it cannot create a series and CI cannot test it).

Regards,
Kamil

> ---
>  tools/intel_bios.h       | 47 ----------------------------------------
>  tools/intel_vbt_decode.c | 19 +++++++++++-----
>  2 files changed, 14 insertions(+), 52 deletions(-)
>  delete mode 100644 tools/intel_bios.h
>
> diff --git a/tools/intel_bios.h b/tools/intel_bios.h
> deleted file mode 100644
> index 0bb4455d1f26..000000000000
> --- a/tools/intel_bios.h
> +++ /dev/null
> @@ -1,47 +0,0 @@
> -/*
> - * Copyright ? 2006 Intel Corporation
> - *
> - * Permission is hereby granted, free of charge, to any person obtaining a
> - * copy of this software and associated documentation files (the "Software"),
> - * to deal in the Software without restriction, including without limitation
> - * the rights to use, copy, modify, merge, publish, distribute, sublicense,
> - * and/or sell copies of the Software, and to permit persons to whom the
> - * Software is furnished to do so, subject to the following conditions:
> - *
> - * The above copyright notice and this permission notice (including the next
> - * paragraph) shall be included in all copies or substantial portions of the
> - * Software.
> - *
> - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
> - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
> - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
> - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
> - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
> - * SOFTWARE.
> - *
> - * Authors:
> - *    Eric Anholt <eric at anholt.net>
> - *
> - */
> -
> -#ifndef _INTEL_BIOS_H_
> -#define _INTEL_BIOS_H_
> -
> -#include <stdint.h>
> -
> -#define DEVICE_TYPE_DP_DVI		0x68d6
> -#define DEVICE_TYPE_DVI			0x68d2
> -#define DEVICE_TYPE_MIPI		0x7cc2
> -
> -struct bdb_legacy_child_devices {
> -	uint8_t child_dev_size;
> -	uint8_t devices[0]; /* presumably 7 * 33 */
> -} __attribute__ ((packed));
> -
> -#define BDB_DRIVER_NO_LVDS	0
> -#define BDB_DRIVER_INT_LVDS	1
> -#define BDB_DRIVER_SDVO_LVDS	2
> -#define BDB_DRIVER_EDP		3
> -
> -#endif /* _INTEL_BIOS_H_ */
> diff --git a/tools/intel_vbt_decode.c b/tools/intel_vbt_decode.c
> index f7dee8646b4a..307c4da14843 100644
> --- a/tools/intel_vbt_decode.c
> +++ b/tools/intel_vbt_decode.c
> @@ -40,7 +40,6 @@
>  
>  #include "igt_aux.h"
>  #include "igt_halffloat.h"
> -#include "intel_bios.h"
>  #include "intel_chipset.h"
>  #include "intel_io.h"
>  #include "drmtest.h"
> @@ -55,6 +54,16 @@ typedef uint64_t u64;
>  #define _INTEL_BIOS_PRIVATE
>  #include "intel_vbt_defs.h"
>  
> +/* additional macros for parsing */
> +#define DEVICE_TYPE_DP_DVI		0x68d6
> +#define DEVICE_TYPE_DVI			0x68d2
> +#define DEVICE_TYPE_MIPI		0x7cc2
> +
> +struct bdb_legacy_child_devices {
> +	uint8_t child_dev_size;
> +	uint8_t devices[0]; /* presumably 7 * 33 */
> +} __attribute__ ((packed));
> +
>  #define YESNO(val) ((val) ? "yes" : "no")
>  
>  /* This is not for mapping to memory layout. */
> @@ -1816,10 +1825,10 @@ static void dump_lfp_data(struct context *context,
>  }
>  
>  static const char * const lvds_config[] = {
> -	[BDB_DRIVER_NO_LVDS] = "No LVDS",
> -	[BDB_DRIVER_INT_LVDS] = "Integrated LVDS",
> -	[BDB_DRIVER_SDVO_LVDS] = "SDVO LVDS",
> -	[BDB_DRIVER_EDP] = "Embedded DisplayPort",
> +	[BDB_DRIVER_FEATURE_NO_LVDS] = "No LVDS",
> +	[BDB_DRIVER_FEATURE_INT_LVDS] = "Integrated LVDS",
> +	[BDB_DRIVER_FEATURE_SDVO_LVDS] = "SDVO LVDS",
> +	[BDB_DRIVER_FEATURE_INT_SDVO_LVDS] = "Embedded DisplayPort",
>  };
>  
>  static const char *default_algorithm(bool algorithm)
> -- 
> 2.47.2
>