linux-next: build failure after merge of the drm

linux-next: build failure after merge of the drm

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 592 bytes --]

Hi all,

After merging the drm tree, today's linux-next build (x86_64
allmodconfig) failed like this:

/tmp/next/build/drivers/gpu/drm/xe/xe_gt_sriov_pf_config.c: In function 'pf_get_threshold':
/tmp/next/build/drivers/gpu/drm/xe/xe_gt_sriov_pf_config.c:1788:27: error: unused variable 'xe' [-Werror=unused-variable]
 1788 |         struct xe_device *xe = gt_to_xe(gt);
      |                           ^~
cc1: all warnings being treated as errors

Caused by commit

  629df234bfe73d ("drm/xe/pf: Introduce functions to configure VF thresholds")

I have used the tree from 20240627 instead.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build failure after merge of the drm

[Michal Wajdeczko]

On 28.06.2024 19:03, Mark Brown wrote:
> Hi all,
> 
> After merging the drm tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> /tmp/next/build/drivers/gpu/drm/xe/xe_gt_sriov_pf_config.c: In function 'pf_get_threshold':
> /tmp/next/build/drivers/gpu/drm/xe/xe_gt_sriov_pf_config.c:1788:27: error: unused variable 'xe' [-Werror=unused-variable]
>  1788 |         struct xe_device *xe = gt_to_xe(gt);
>       |                           ^~
> cc1: all warnings being treated as errors
> 
> Caused by commit
> 
>   629df234bfe73d ("drm/xe/pf: Introduce functions to configure VF thresholds")

it must have been something else wrong, as this commit [1] does not
contain this line, it was not part of patch itself [2] and I can't find
any other commit related to this function on drm-tip

but it was noticed today and some fixup was already applied [3]

[1]
https://gitlab.freedesktop.org/drm/xe/kernel/-/commit/629df234bfe73dacb4bb0daa4bc2c14824dba159
[2] https://patchwork.freedesktop.org/patch/594015/?series=133236&rev=2
[3]
https://patchwork.freedesktop.org/patch/601248/?series=135512&rev=1#comment_1094525

> 
> I have used the tree from 20240627 instead.

Re: linux-next: build failure after merge of the drm

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 941 bytes --]

On Fri, Jun 28, 2024 at 07:58:23PM +0200, Michal Wajdeczko wrote:
> On 28.06.2024 19:03, Mark Brown wrote:

> > /tmp/next/build/drivers/gpu/drm/xe/xe_gt_sriov_pf_config.c: In function 'pf_get_threshold':
> > /tmp/next/build/drivers/gpu/drm/xe/xe_gt_sriov_pf_config.c:1788:27: error: unused variable 'xe' [-Werror=unused-variable]
> >  1788 |         struct xe_device *xe = gt_to_xe(gt);
> >       |                           ^~
> > cc1: all warnings being treated as errors

> >   629df234bfe73d ("drm/xe/pf: Introduce functions to configure VF thresholds")


> it must have been something else wrong, as this commit [1] does not
> contain this line, it was not part of patch itself [2] and I can't find
> any other commit related to this function on drm-tip

> but it was noticed today and some fixup was already applied [3]

The fixup claims that it was a bogus merge in drm-tip rather than the
commit above which introduced the function.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build failure after merge of the drm

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 789 bytes --]

Hi all,

On Fri, 28 Jun 2024 18:03:39 +0100 Mark Brown <broonie@kernel.org> wrote:
>
> After merging the drm tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> /tmp/next/build/drivers/gpu/drm/xe/xe_gt_sriov_pf_config.c: In function 'pf_get_threshold':
> /tmp/next/build/drivers/gpu/drm/xe/xe_gt_sriov_pf_config.c:1788:27: error: unused variable 'xe' [-Werror=unused-variable]
>  1788 |         struct xe_device *xe = gt_to_xe(gt);
>       |                           ^~
> cc1: all warnings being treated as errors
> 
> Caused by commit
> 
>   629df234bfe73d ("drm/xe/pf: Introduce functions to configure VF thresholds")
> 
> I have used the tree from 20240627 instead.

I am still seeing that build failure.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build failure after merge of the drm

[Michal Wajdeczko]

+ Rodrigo for help

On 03.07.2024 04:36, Stephen Rothwell wrote:
> Hi all,
> 
> On Fri, 28 Jun 2024 18:03:39 +0100 Mark Brown <broonie@kernel.org> wrote:
>>
>> After merging the drm tree, today's linux-next build (x86_64
>> allmodconfig) failed like this:
>>
>> /tmp/next/build/drivers/gpu/drm/xe/xe_gt_sriov_pf_config.c: In function 'pf_get_threshold':
>> /tmp/next/build/drivers/gpu/drm/xe/xe_gt_sriov_pf_config.c:1788:27: error: unused variable 'xe' [-Werror=unused-variable]
>>  1788 |         struct xe_device *xe = gt_to_xe(gt);
>>       |                           ^~
>> cc1: all warnings being treated as errors
>>
>> Caused by commit
>>
>>   629df234bfe73d ("drm/xe/pf: Introduce functions to configure VF thresholds")
>>
>> I have used the tree from 20240627 instead.
> 
> I am still seeing that build failure.
> 

as explained before, this additional var is not present in
drm-xe/drm-xe-next

AFAICS this additional var comes from the drm/drm-next and is applied to
drm-tip as something like:


commit fa60cd98341b3a176de428a182e13ebd7a5ea4b7 (from
fb625bf6187d97c3cd28d680b14bf80f84207e5a)
Merge: f733fce76fff fb625bf6187d
Author: Thomas Zimmermann <tzimmermann@suse.de>
Date:   Wed Jul 3 10:12:05 2024 +0200

    Merge remote-tracking branch 'drm/drm-next' into drm-tip

    # Conflicts:
    #       drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c
    #       drivers/gpu/drm/amd/display/dc/hwss/dcn35/dcn35_init.c
    #       drivers/gpu/drm/amd/pm/swsmu/inc/smu_types.h
    #       drivers/gpu/drm/xe/xe_gt_idle.c
    #       drivers/gpu/drm/xe/xe_guc_pc.c

diff --git a/drivers/gpu/drm/xe/xe_gt_sriov_pf_config.c
b/drivers/gpu/drm/xe/xe_gt_sriov_pf_config.c
index 694671497f6e..a5c9dfa1077c 100644
--- a/drivers/gpu/drm/xe/xe_gt_sriov_pf_config.c
+++ b/drivers/gpu/drm/xe/xe_gt_sriov_pf_config.c
@@ -1785,6 +1785,7 @@ static int pf_get_threshold(struct xe_gt *gt,
unsigned int vfid,
                            enum xe_guc_klv_threshold_index index)
 {
        struct xe_gt_sriov_config *config = pf_pick_vf_config(gt, vfid);
+       struct xe_device *xe = gt_to_xe(gt);

        return config->thresholds[index];
 }


and later drm-tip removes that by merging fixup from the topic branch:

commit 1179bb6a96b57c1584497920768ac9c40c7874e4 (from
29a62552d265091cd444bf819f4e4fd3fa7f471c)
Merge: 29a62552d265 428c3ef38ef5
Author: Thomas Zimmermann <tzimmermann@suse.de>
Date:   Wed Jul 3 10:12:10 2024 +0200

    Merge remote-tracking branch 'drm-xe/topic/xe-for-CI' into drm-tip

diff --git a/drivers/gpu/drm/xe/xe_gt_sriov_pf_config.c
b/drivers/gpu/drm/xe/xe_gt_sriov_pf_config.c
index c8936aae7f43..db6c213da847 100644
--- a/drivers/gpu/drm/xe/xe_gt_sriov_pf_config.c
+++ b/drivers/gpu/drm/xe/xe_gt_sriov_pf_config.c
@@ -1785,7 +1785,6 @@ static int pf_get_threshold(struct xe_gt *gt,
unsigned int vfid,
                            enum xe_guc_klv_threshold_index index)
 {
        struct xe_gt_sriov_config *config = pf_pick_vf_config(gt, vfid);
-       struct xe_device *xe = gt_to_xe(gt);

        return config->thresholds[index];
 }

Re: linux-next: build failure after merge of the drm

[Thomas Hellström]

Hi

On Wed, 2024-07-03 at 13:46 +0200, Michal Wajdeczko wrote:
> + Rodrigo for help
> 
> On 03.07.2024 04:36, Stephen Rothwell wrote:
> > Hi all,
> > 
> > On Fri, 28 Jun 2024 18:03:39 +0100 Mark Brown <broonie@kernel.org>
> > wrote:
> > > 
> > > After merging the drm tree, today's linux-next build (x86_64
> > > allmodconfig) failed like this:
> > > 
> > > /tmp/next/build/drivers/gpu/drm/xe/xe_gt_sriov_pf_config.c: In
> > > function 'pf_get_threshold':
> > > /tmp/next/build/drivers/gpu/drm/xe/xe_gt_sriov_pf_config.c:1788:2
> > > 7: error: unused variable 'xe' [-Werror=unused-variable]
> > >  1788 |         struct xe_device *xe = gt_to_xe(gt);
> > >       |                           ^~
> > > cc1: all warnings being treated as errors
> > > 
> > > Caused by commit
> > > 
> > >   629df234bfe73d ("drm/xe/pf: Introduce functions to configure VF
> > > thresholds")
> > > 
> > > I have used the tree from 20240627 instead.
> > 
> > I am still seeing that build failure.
> > 

I see that git for an unknown reason introduces this line as an
automatic resolve merging drm-next into the drm-tip build. Later there
was a manual fixup for this after merging another branch into drm-tip
but that's too late.

So I've added a manual fixup to drm-rerere to remove this line just
after the merge that somehow introduces it.

/Thomas