From: Michal Wajdeczko <michal.wajdeczko@intel•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>,
Dave Airlie <airlied@redhat•com>,
Rodrigo Vivi <rodrigo.vivi@intel•com>
Cc: "Mark Brown" <broonie@kernel•org>,
DRI <dri-devel@lists•freedesktop.org>,
"Piotr Piórkowski" <piotr.piorkowski@intel•com>,
buildfailureaftermergeofthedrmtree@sirena•org.uk,
"Linux Kernel Mailing List" <linux-kernel@vger•kernel.org>,
"Linux Next Mailing List" <linux-next@vger•kernel.org>
Subject: Re: linux-next: build failure after merge of the drm
Date: Wed, 3 Jul 2024 13:46:23 +0200 [thread overview]
Message-ID: <10c3d9b8-bf5b-42c1-9c87-36828f5c995c@intel.com> (raw)
In-Reply-To: <20240703123643.5b4dc83f@canb.auug.org.au>
+ 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];
}
next prev parent reply other threads:[~2024-07-03 11:46 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-28 17:03 linux-next: build failure after merge of the drm Mark Brown
2024-06-28 17:58 ` Michal Wajdeczko
2024-06-28 18:06 ` Mark Brown
2024-07-03 2:36 ` Stephen Rothwell
2024-07-03 11:46 ` Michal Wajdeczko [this message]
2024-07-04 7:02 ` Thomas Hellström
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=10c3d9b8-bf5b-42c1-9c87-36828f5c995c@intel.com \
--to=michal.wajdeczko@intel$(echo .)com \
--cc=airlied@redhat$(echo .)com \
--cc=broonie@kernel$(echo .)org \
--cc=buildfailureaftermergeofthedrmtree@sirena$(echo .)org.uk \
--cc=dri-devel@lists$(echo .)freedesktop.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=piotr.piorkowski@intel$(echo .)com \
--cc=rodrigo.vivi@intel$(echo .)com \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox