* [Intel-gfx] [PATCH] drm/i915: Fix build with WERROR=y
@ 2023-03-13 9:39 Ville Syrjala
2023-03-13 10:20 ` Matthew Auld
` (2 more replies)
0 siblings, 3 replies; 7+ messages in thread
From: Ville Syrjala @ 2023-03-13 9:39 UTC (permalink / raw)
To: intel-gfx; +Cc: Lucas De Marchi
From: Ville Syrjälä <ville.syrjala@linux.intel.com>
Remove the unused i915 variable to fix the build with WERROR=y.
Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Fixes: d1b3657fb5b6 ("drm/i915: Remove redundant check for DG1")
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
drivers/gpu/drm/i915/gt/intel_workarounds.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/drivers/gpu/drm/i915/gt/intel_workarounds.c b/drivers/gpu/drm/i915/gt/intel_workarounds.c
index 90af399cb0a3..e7ee24bcad89 100644
--- a/drivers/gpu/drm/i915/gt/intel_workarounds.c
+++ b/drivers/gpu/drm/i915/gt/intel_workarounds.c
@@ -1476,8 +1476,6 @@ gen12_gt_workarounds_init(struct intel_gt *gt, struct i915_wa_list *wal)
static void
dg1_gt_workarounds_init(struct intel_gt *gt, struct i915_wa_list *wal)
{
- struct drm_i915_private *i915 = gt->i915;
-
gen12_gt_workarounds_init(gt, wal);
/* Wa_1409420604:dg1 */
--
2.39.2
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [Intel-gfx] [PATCH] drm/i915: Fix build with WERROR=y
2023-03-13 9:39 [Intel-gfx] [PATCH] drm/i915: Fix build with WERROR=y Ville Syrjala
@ 2023-03-13 10:20 ` Matthew Auld
2023-03-13 10:44 ` Ville Syrjälä
2023-03-13 11:02 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for " Patchwork
2 siblings, 0 replies; 7+ messages in thread
From: Matthew Auld @ 2023-03-13 10:20 UTC (permalink / raw)
To: Ville Syrjala; +Cc: intel-gfx, Lucas De Marchi
On Mon, 13 Mar 2023 at 09:39, Ville Syrjala
<ville.syrjala@linux.intel.com> wrote:
>
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> Remove the unused i915 variable to fix the build with WERROR=y.
>
> Cc: Lucas De Marchi <lucas.demarchi@intel.com>
> Fixes: d1b3657fb5b6 ("drm/i915: Remove redundant check for DG1")
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Matthew Auld <matthew.auld@intel.com>
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [Intel-gfx] [PATCH] drm/i915: Fix build with WERROR=y
2023-03-13 9:39 [Intel-gfx] [PATCH] drm/i915: Fix build with WERROR=y Ville Syrjala
2023-03-13 10:20 ` Matthew Auld
@ 2023-03-13 10:44 ` Ville Syrjälä
2023-03-13 10:59 ` Ville Syrjälä
2023-03-13 11:02 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for " Patchwork
2 siblings, 1 reply; 7+ messages in thread
From: Ville Syrjälä @ 2023-03-13 10:44 UTC (permalink / raw)
To: intel-gfx; +Cc: Matt Roper, Lucas De Marchi
On Mon, Mar 13, 2023 at 11:39:13AM +0200, Ville Syrjala wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> Remove the unused i915 variable to fix the build with WERROR=y.
Argh. Turns out this is actually caused by
commit 69ea87e1591a ("drm/i915/dg1: Drop support for pre-production steppings")
being merged through drm-intel-next instead of drm-intel-gt-next.
So both drm-intel-next and drm-intel-gt-next still needs that i915
pointer, and only when both are merged to drm-tip we need to get
rid of it.
In the future it would be better to stick to the gt vs. not-gt
split more rigorously to avoid such issues.
I guess I'll need to do a fixup patch now...
>
> Cc: Lucas De Marchi <lucas.demarchi@intel.com>
> Fixes: d1b3657fb5b6 ("drm/i915: Remove redundant check for DG1")
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> ---
> drivers/gpu/drm/i915/gt/intel_workarounds.c | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/gt/intel_workarounds.c b/drivers/gpu/drm/i915/gt/intel_workarounds.c
> index 90af399cb0a3..e7ee24bcad89 100644
> --- a/drivers/gpu/drm/i915/gt/intel_workarounds.c
> +++ b/drivers/gpu/drm/i915/gt/intel_workarounds.c
> @@ -1476,8 +1476,6 @@ gen12_gt_workarounds_init(struct intel_gt *gt, struct i915_wa_list *wal)
> static void
> dg1_gt_workarounds_init(struct intel_gt *gt, struct i915_wa_list *wal)
> {
> - struct drm_i915_private *i915 = gt->i915;
> -
> gen12_gt_workarounds_init(gt, wal);
>
> /* Wa_1409420604:dg1 */
> --
> 2.39.2
--
Ville Syrjälä
Intel
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [Intel-gfx] [PATCH] drm/i915: Fix build with WERROR=y
2023-03-13 10:44 ` Ville Syrjälä
@ 2023-03-13 10:59 ` Ville Syrjälä
0 siblings, 0 replies; 7+ messages in thread
From: Ville Syrjälä @ 2023-03-13 10:59 UTC (permalink / raw)
To: intel-gfx; +Cc: Lucas De Marchi, Matt Roper
On Mon, Mar 13, 2023 at 12:44:52PM +0200, Ville Syrjälä wrote:
> On Mon, Mar 13, 2023 at 11:39:13AM +0200, Ville Syrjala wrote:
> > From: Ville Syrjälä <ville.syrjala@linux.intel.com>
> >
> > Remove the unused i915 variable to fix the build with WERROR=y.
>
> Argh. Turns out this is actually caused by
> commit 69ea87e1591a ("drm/i915/dg1: Drop support for pre-production steppings")
> being merged through drm-intel-next instead of drm-intel-gt-next.
>
> So both drm-intel-next and drm-intel-gt-next still needs that i915
> pointer, and only when both are merged to drm-tip we need to get
> rid of it.
>
> In the future it would be better to stick to the gt vs. not-gt
> split more rigorously to avoid such issues.
>
> I guess I'll need to do a fixup patch now...
Fixup in place, drm-tip builds again.
>
> >
> > Cc: Lucas De Marchi <lucas.demarchi@intel.com>
> > Fixes: d1b3657fb5b6 ("drm/i915: Remove redundant check for DG1")
> > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> > ---
> > drivers/gpu/drm/i915/gt/intel_workarounds.c | 2 --
> > 1 file changed, 2 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/i915/gt/intel_workarounds.c b/drivers/gpu/drm/i915/gt/intel_workarounds.c
> > index 90af399cb0a3..e7ee24bcad89 100644
> > --- a/drivers/gpu/drm/i915/gt/intel_workarounds.c
> > +++ b/drivers/gpu/drm/i915/gt/intel_workarounds.c
> > @@ -1476,8 +1476,6 @@ gen12_gt_workarounds_init(struct intel_gt *gt, struct i915_wa_list *wal)
> > static void
> > dg1_gt_workarounds_init(struct intel_gt *gt, struct i915_wa_list *wal)
> > {
> > - struct drm_i915_private *i915 = gt->i915;
> > -
> > gen12_gt_workarounds_init(gt, wal);
> >
> > /* Wa_1409420604:dg1 */
> > --
> > 2.39.2
>
> --
> Ville Syrjälä
> Intel
--
Ville Syrjälä
Intel
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Intel-gfx] ✗ Fi.CI.BUILD: failure for drm/i915: Fix build with WERROR=y
2023-03-13 9:39 [Intel-gfx] [PATCH] drm/i915: Fix build with WERROR=y Ville Syrjala
2023-03-13 10:20 ` Matthew Auld
2023-03-13 10:44 ` Ville Syrjälä
@ 2023-03-13 11:02 ` Patchwork
2023-03-13 11:08 ` Ville Syrjälä
2 siblings, 1 reply; 7+ messages in thread
From: Patchwork @ 2023-03-13 11:02 UTC (permalink / raw)
To: Ville Syrjälä; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: Fix build with WERROR=y
URL : https://patchwork.freedesktop.org/series/115046/
State : failure
== Summary ==
Error: make failed
CALL scripts/checksyscalls.sh
DESCEND objtool
INSTALL libsubcmd_headers
CC [M] drivers/gpu/drm/i915/gt/intel_workarounds.o
In file included from drivers/gpu/drm/i915/gt/intel_workarounds.c:6:
drivers/gpu/drm/i915/gt/intel_workarounds.c: In function ‘dg1_gt_workarounds_init’:
drivers/gpu/drm/i915/gt/intel_workarounds.c:1482:13: error: ‘i915’ undeclared (first use in this function); did you mean ‘to_i915’?
1482 | if (IS_DG1(i915))
| ^~~~
./drivers/gpu/drm/i915/i915_drv.h:559:45: note: in definition of macro ‘IS_DG1’
559 | #define IS_DG1(dev_priv) IS_PLATFORM(dev_priv, INTEL_DG1)
| ^~~~~~~~
drivers/gpu/drm/i915/gt/intel_workarounds.c:1482:13: note: each undeclared identifier is reported only once for each function it appears in
1482 | if (IS_DG1(i915))
| ^~~~
./drivers/gpu/drm/i915/i915_drv.h:559:45: note: in definition of macro ‘IS_DG1’
559 | #define IS_DG1(dev_priv) IS_PLATFORM(dev_priv, INTEL_DG1)
| ^~~~~~~~
make[5]: *** [scripts/Makefile.build:252: drivers/gpu/drm/i915/gt/intel_workarounds.o] Error 1
make[4]: *** [scripts/Makefile.build:494: drivers/gpu/drm/i915] Error 2
make[3]: *** [scripts/Makefile.build:494: drivers/gpu/drm] Error 2
make[2]: *** [scripts/Makefile.build:494: drivers/gpu] Error 2
make[1]: *** [scripts/Makefile.build:494: drivers] Error 2
make: *** [Makefile:2028: .] Error 2
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [Intel-gfx] ✗ Fi.CI.BUILD: failure for drm/i915: Fix build with WERROR=y
2023-03-13 11:02 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for " Patchwork
@ 2023-03-13 11:08 ` Ville Syrjälä
2023-03-13 11:24 ` Musial, Ewelina
0 siblings, 1 reply; 7+ messages in thread
From: Ville Syrjälä @ 2023-03-13 11:08 UTC (permalink / raw)
To: intel-gfx
On Mon, Mar 13, 2023 at 11:02:17AM -0000, Patchwork wrote:
> == Series Details ==
>
> Series: drm/i915: Fix build with WERROR=y
> URL : https://patchwork.freedesktop.org/series/115046/
> State : failure
>
> == Summary ==
>
> Error: make failed
> CALL scripts/checksyscalls.sh
> DESCEND objtool
> INSTALL libsubcmd_headers
> CC [M] drivers/gpu/drm/i915/gt/intel_workarounds.o
> In file included from drivers/gpu/drm/i915/gt/intel_workarounds.c:6:
> drivers/gpu/drm/i915/gt/intel_workarounds.c: In function ‘dg1_gt_workarounds_init’:
> drivers/gpu/drm/i915/gt/intel_workarounds.c:1482:13: error: ‘i915’ undeclared (first use in this function); did you mean ‘to_i915’?
Huh. I guess CI keeps on trying to build against the last succesfully
built drm-tip tag? But there is no hint here about that...
Ewelina, this seems to be another place where CI needs improvements:
- report the baseline against which the patch was applied
- report drm-tip build failures
> 1482 | if (IS_DG1(i915))
> | ^~~~
> ./drivers/gpu/drm/i915/i915_drv.h:559:45: note: in definition of macro ‘IS_DG1’
> 559 | #define IS_DG1(dev_priv) IS_PLATFORM(dev_priv, INTEL_DG1)
> | ^~~~~~~~
> drivers/gpu/drm/i915/gt/intel_workarounds.c:1482:13: note: each undeclared identifier is reported only once for each function it appears in
> 1482 | if (IS_DG1(i915))
> | ^~~~
> ./drivers/gpu/drm/i915/i915_drv.h:559:45: note: in definition of macro ‘IS_DG1’
> 559 | #define IS_DG1(dev_priv) IS_PLATFORM(dev_priv, INTEL_DG1)
> | ^~~~~~~~
> make[5]: *** [scripts/Makefile.build:252: drivers/gpu/drm/i915/gt/intel_workarounds.o] Error 1
> make[4]: *** [scripts/Makefile.build:494: drivers/gpu/drm/i915] Error 2
> make[3]: *** [scripts/Makefile.build:494: drivers/gpu/drm] Error 2
> make[2]: *** [scripts/Makefile.build:494: drivers/gpu] Error 2
> make[1]: *** [scripts/Makefile.build:494: drivers] Error 2
> make: *** [Makefile:2028: .] Error 2
>
--
Ville Syrjälä
Intel
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [Intel-gfx] ✗ Fi.CI.BUILD: failure for drm/i915: Fix build with WERROR=y
2023-03-13 11:08 ` Ville Syrjälä
@ 2023-03-13 11:24 ` Musial, Ewelina
0 siblings, 0 replies; 7+ messages in thread
From: Musial, Ewelina @ 2023-03-13 11:24 UTC (permalink / raw)
To: Ville Syrjälä, intel-gfx@lists.freedesktop.org,
SCG SCSS CI
@SCG SCSS CI - please take a look
-----Original Message-----
From: Ville Syrjälä <ville.syrjala@linux.intel.com>
Sent: poniedziałek, 13 marca 2023 12:09
To: intel-gfx@lists.freedesktop.org
Cc: Musial, Ewelina <ewelina.musial@intel.com>
Subject: Re: ✗ Fi.CI.BUILD: failure for drm/i915: Fix build with WERROR=y
On Mon, Mar 13, 2023 at 11:02:17AM -0000, Patchwork wrote:
> == Series Details ==
>
> Series: drm/i915: Fix build with WERROR=y
> URL : https://patchwork.freedesktop.org/series/115046/
> State : failure
>
> == Summary ==
>
> Error: make failed
> CALL scripts/checksyscalls.sh
> DESCEND objtool
> INSTALL libsubcmd_headers
> CC [M] drivers/gpu/drm/i915/gt/intel_workarounds.o
> In file included from drivers/gpu/drm/i915/gt/intel_workarounds.c:6:
> drivers/gpu/drm/i915/gt/intel_workarounds.c: In function ‘dg1_gt_workarounds_init’:
> drivers/gpu/drm/i915/gt/intel_workarounds.c:1482:13: error: ‘i915’ undeclared (first use in this function); did you mean ‘to_i915’?
Huh. I guess CI keeps on trying to build against the last succesfully built drm-tip tag? But there is no hint here about that...
Ewelina, this seems to be another place where CI needs improvements:
- report the baseline against which the patch was applied
- report drm-tip build failures
> 1482 | if (IS_DG1(i915))
> | ^~~~
> ./drivers/gpu/drm/i915/i915_drv.h:559:45: note: in definition of macro ‘IS_DG1’
> 559 | #define IS_DG1(dev_priv) IS_PLATFORM(dev_priv, INTEL_DG1)
> | ^~~~~~~~
> drivers/gpu/drm/i915/gt/intel_workarounds.c:1482:13: note: each
> undeclared identifier is reported only once for each function it
> appears in
> 1482 | if (IS_DG1(i915))
> | ^~~~
> ./drivers/gpu/drm/i915/i915_drv.h:559:45: note: in definition of macro ‘IS_DG1’
> 559 | #define IS_DG1(dev_priv) IS_PLATFORM(dev_priv, INTEL_DG1)
> | ^~~~~~~~
> make[5]: *** [scripts/Makefile.build:252:
> drivers/gpu/drm/i915/gt/intel_workarounds.o] Error 1
> make[4]: *** [scripts/Makefile.build:494: drivers/gpu/drm/i915] Error
> 2
> make[3]: *** [scripts/Makefile.build:494: drivers/gpu/drm] Error 2
> make[2]: *** [scripts/Makefile.build:494: drivers/gpu] Error 2
> make[1]: *** [scripts/Makefile.build:494: drivers] Error 2
> make: *** [Makefile:2028: .] Error 2
>
--
Ville Syrjälä
Intel
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2023-03-13 11:24 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-03-13 9:39 [Intel-gfx] [PATCH] drm/i915: Fix build with WERROR=y Ville Syrjala
2023-03-13 10:20 ` Matthew Auld
2023-03-13 10:44 ` Ville Syrjälä
2023-03-13 10:59 ` Ville Syrjälä
2023-03-13 11:02 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for " Patchwork
2023-03-13 11:08 ` Ville Syrjälä
2023-03-13 11:24 ` Musial, Ewelina
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).