Re: [PATCH i-g-t 1/4] tools/intel_vbt_decode: sync intel_vbt_defs.h with commit 1b85a9b04681

Nautiyal, Ankit K
2026-04-21T14:32:25Z

On 4/18/2026 12:48 AM, Ville Syrjälä wrote:
> On Fri, Apr 17, 2026 at 10:11:01PM +0300, Ville Syrjälä wrote:
>> On Fri, Apr 17, 2026 at 02:54:32PM +0300, Jani Nikula wrote:
>>> On Fri, 17 Apr 2026, Ville Syrjälä <ville.syrjala@linux.intel.com> wrote:
>>>> On Fri, Apr 17, 2026 at 11:47:14AM +0530, Nautiyal, Ankit K wrote:
>>>>> On 4/17/2026 11:09 AM, Karthik B S wrote:
>>>>>> Hi Ankit,
>>>>>>
>>>>>> On 4/17/2026 9:40 AM, Ankit Nautiyal wrote:
>>>>>>> Synchronize intel_vbt_defs.h with kernel commit:
>>>>>>> 1b85a9b04681 ("drm/i915/vbt: Add edp pipe joiner enable/disable bits")
>>>>>>>
>>>>>>> Bspec:20142
>>>>>>> Signed-off-by: Ankit Nautiyal <ankit.k.nautiyal@intel.com>
>>>>>>> Reviewed-by: Kamil Konieczny <kamil.konieczny@linux.intel.com>
>>>>>>> ---
>>>>>>>   tools/intel_vbt_defs.h | 1 +
>>>>>>>   1 file changed, 1 insertion(+)
>>>>>>>
>>>>>>> diff --git a/tools/intel_vbt_defs.h b/tools/intel_vbt_defs.h
>>>>>>> index 6612d3a4ec49..550a9bfba868 100644
>>>>>>> --- a/tools/intel_vbt_defs.h
>>>>>>> +++ b/tools/intel_vbt_defs.h
>>>>>>> @@ -1090,6 +1090,7 @@ struct bdb_edp {
>>>>>>>       u16 edp_dsc_disable;                    /* 251+ */
>>>>>>>       u16 t6_delay_support;                    /* 260+ */
>>>>>>>       u16 link_idle_time[16];                    /* 260+ */
>>>>>>> +    u16 joiner_enable;                    /* 261+ */
>>>>>> The variable name should be 'pipe_joiner_enable'. With this updated,
>>>>>>
>>>>>> Reviewed-by: Karthik B S <karthik.b.s@intel.com>
>>>>>
>>>>> Thanks Karthik, will fix this and send shortly.
>>>> How was this even different? You didn't retype these by hand into the
>>>> igt copy of the header did you? The proper procedure is to actually
>>>> copy the whole file from the kernel tree.
>>> Yeah, this. The commits aren't in the same order as in the kernel
>>> either, and they're missing one.
>>>
>>> I've scripted this years ago, for both PCI IDs and VBT defs, and I've
>>> shared the scripts too. Here's my current version.
>>>
>>> Change KERNEL and IGT paths to yours, update the repos, cd to IGT, and
>>> run.
>>>
>>> BR,
>>> Jani.
>>>
>>>
>>> #!/bin/bash
>>>
>>> SINCE=962601ac4c78
>>> KERNEL=$HOME/src/linux
>>> IGT=$HOME/src/intel-gpu-tools
>>>
>>> declare -g -A map
>>> map["drivers/gpu/drm/i915/display/intel_vbt_defs.h"]="tools/intel_vbt_defs.h"
>>> map["drivers/gpu/drm/i915/display/intel_dsi_vbt_defs.h"]="tools/intel_dsi_vbt_defs.h"
>>> map["include/drm/intel/pciids.h"]="lib/pciids.h"
>>>
>>> cd $KERNEL
>>>
>>> for infile in "${!map[@]}"; do
>>> outfile=${map[$infile]}
>>>
>>> echo "processing $infile -> $outfile"
>>>
>>> last=
>>> for commit in $(git log --reverse --pretty=%h $SINCE..HEAD -- $infile); do
>>> if ! git cat-file -e $commit:$infile 2>/dev/null; then
>>> continue
>>> fi
>>> if git show $commit:$infile | diff -q $IGT/$outfile - >/dev/null; then
>>> last=$commit
>>> break
>>> fi
>>> done
>>>
>>> if [[ -z "$last" ]]; then
>>> echo "last update to $infile not found"
>>> continue
>>> fi
>>>
>>> for commit in $(git log --reverse --pretty=%h $last..HEAD -- $infile); do
>>> prefix="${outfile%.*}"
>>> base="$(basename $outfile)"
>>> ref=$(git cite $commit)
> I presume that's your own git alias, or at least I don't have it.
> Would need to be typed out fully for other people to use this.

Right, git cite is a custom alias.

I already had it from something Jani shared earlier (I was CC’d), so it
worked for me without realizing it.

For reference the alias is:

[alias]
cite = log -1 --abbrev=12 '--format=%h (\"%s\")'

Regards,

Ankit

>
>>> git show $commit:$infile > $IGT/$outfile
>>> cd $IGT
>>> git commit -as \
>>> -m "${prefix}: sync ${base} with kernel commit $commit" \
>>> -m "Synchronize ${base} with kernel commit:" \
>>> -m "$ref"
>>> cd -
>>> done
>>> done
>> Good enough to put this into scripts/ with a quick howto at the top?
>> And then reference it from the generated commit messages so that the
>> next person is more likely to find it as well.
>>
>> --
>> Ville Syrjälä
>> Intel