Re: [PATCH 2/4] scripts/update-linux-headers: include PCI ID header for Intel GPUs

[Cornelia Huck <cohuck@redhat.com>]

On Thu, Feb 06 2025, Corvin Köhne <corvin.koehne@gmail.com> wrote:

> From: Corvin Köhne <c.koehne@beckhoff.com>
>
> We've recently imported the PCI ID header for Intel GPUs into our tree.
> Add it to our helper script to make it easier for us to sync this file
> in the future.
>
> Signed-off-by: Corvin Köhne <c.koehne@beckhoff.com>
> ---
>  scripts/update-linux-headers.sh | 6 ++++++
>  1 file changed, 6 insertions(+)
>
> diff --git a/scripts/update-linux-headers.sh b/scripts/update-linux-headers.sh
> index 8913e4fb99..a4ff5a8fe9 100755
> --- a/scripts/update-linux-headers.sh
> +++ b/scripts/update-linux-headers.sh
> @@ -269,6 +269,12 @@ mkdir -p "$output/include/standard-headers/drm"
>  cp_portable "$hdrdir/include/drm/drm_fourcc.h" \
>              "$output/include/standard-headers/drm"
>  
> +# Linux does not install the PCI IDs header for i915 devices, so we have to
> +# pick it up from the source tree itself.
> +mkdir -p "$output/include/standard-headers/drm/intel"
> +cp_portable "$linux/include/drm/intel/pciids.h" \
> +            "$output/include/standard-headers/drm/intel"
> +
>  cat <<EOF >$output/include/standard-headers/linux/types.h
>  /* For QEMU all types are already defined via osdep.h, so this
>   * header does not need to do anything.

The correct process here would be:
1. update the script (this patch)
2. run a full headers update against Linux v.13 (replaces patch 1)

I'll leave discussion of the whole series to the others :)

Thanks,
Cornelia