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

From: Michal Wajdeczko <[email-masked]>
Date: Wed, 3 Jul 2024 13:46:23 +0200

+ 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 <[email-masked]> 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 <[email-masked]>
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 <[email-masked]>
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];
 }