Re: linux-next: build failure after merge of the drm-misc tree
On Wed, Sep 4, 2024, 11:58 Jani Nikula wrote:
> On Wed, 04 Sep 2024, Stephen Rothwell wrote:
> > Hi all,
> >
> > After merging the drm-misc tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
> >
> > drivers/gpu/drm/bridge/ti-tdp158.c: In function 'tdp158_enable':
> > drivers/gpu/drm/bridge/ti-tdp158.c:31:9: error: implicit declaration of
> function 'gpiod_set_value_cansleep' [-Wimplicit-function-declaration]
> >31 | gpiod_set_value_cansleep(tdp158->enable, 1);
> > | ^~~~
> > drivers/gpu/drm/bridge/ti-tdp158.c: In function 'tdp158_probe':
> > drivers/gpu/drm/bridge/ti-tdp158.c:80:26: error: implicit declaration of
> function 'devm_gpiod_get_optional'; did you mean
> 'devm_regulator_get_optional'? [-Wimplicit-function-declaration]
> >80 | tdp158->enable = devm_gpiod_get_optional(dev, "enable",
> GPIOD_OUT_LOW);
> > | ^~~
> > | devm_regulator_get_optional
> > drivers/gpu/drm/bridge/ti-tdp158.c:80:65: error: 'GPIOD_OUT_LOW'
> undeclared (first use in this function)
> >80 | tdp158->enable = devm_gpiod_get_optional(dev, "enable",
> GPIOD_OUT_LOW);
> > |
> ^
> > drivers/gpu/drm/bridge/ti-tdp158.c:80:65: note: each undeclared
> identifier is reported only once for each function it appears in
> >
> > Caused by commit
> >
> > a15710027afb ("drm/bridge: add support for TI TDP158")
> >
> > I have used the drm-misc tree from next-20240903 for today.
>
> Fixed by commit 532f0d109658 ("drm/bridge/tdp158: fix build failure") in
> drm-misc-next.
>
Thank you Jani
Re: linux-next: build failure after merge of the drm-misc tree
On Wed, 04 Sep 2024, Stephen Rothwell wrote:
> Hi all,
>
> After merging the drm-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/gpu/drm/bridge/ti-tdp158.c: In function 'tdp158_enable':
> drivers/gpu/drm/bridge/ti-tdp158.c:31:9: error: implicit declaration of
> function 'gpiod_set_value_cansleep' [-Wimplicit-function-declaration]
>31 | gpiod_set_value_cansleep(tdp158->enable, 1);
> | ^~~~
> drivers/gpu/drm/bridge/ti-tdp158.c: In function 'tdp158_probe':
> drivers/gpu/drm/bridge/ti-tdp158.c:80:26: error: implicit declaration of
> function 'devm_gpiod_get_optional'; did you mean
> 'devm_regulator_get_optional'? [-Wimplicit-function-declaration]
>80 | tdp158->enable = devm_gpiod_get_optional(dev, "enable",
> GPIOD_OUT_LOW);
> | ^~~
> | devm_regulator_get_optional
> drivers/gpu/drm/bridge/ti-tdp158.c:80:65: error: 'GPIOD_OUT_LOW' undeclared
> (first use in this function)
>80 | tdp158->enable = devm_gpiod_get_optional(dev, "enable",
> GPIOD_OUT_LOW);
> |
> ^
> drivers/gpu/drm/bridge/ti-tdp158.c:80:65: note: each undeclared identifier is
> reported only once for each function it appears in
>
> Caused by commit
>
> a15710027afb ("drm/bridge: add support for TI TDP158")
>
> I have used the drm-misc tree from next-20240903 for today.
Fixed by commit 532f0d109658 ("drm/bridge/tdp158: fix build failure") in
drm-misc-next.
BR,
Jani.
--
Jani Nikula, Intel
linux-next: build failure after merge of the drm-misc tree
Hi all,
After merging the drm-misc tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/gpu/drm/bridge/ti-tdp158.c: In function 'tdp158_enable':
drivers/gpu/drm/bridge/ti-tdp158.c:31:9: error: implicit declaration of
function 'gpiod_set_value_cansleep' [-Wimplicit-function-declaration]
31 | gpiod_set_value_cansleep(tdp158->enable, 1);
| ^~~~
drivers/gpu/drm/bridge/ti-tdp158.c: In function 'tdp158_probe':
drivers/gpu/drm/bridge/ti-tdp158.c:80:26: error: implicit declaration of
function 'devm_gpiod_get_optional'; did you mean 'devm_regulator_get_optional'?
[-Wimplicit-function-declaration]
80 | tdp158->enable = devm_gpiod_get_optional(dev, "enable",
GPIOD_OUT_LOW);
| ^~~
| devm_regulator_get_optional
drivers/gpu/drm/bridge/ti-tdp158.c:80:65: error: 'GPIOD_OUT_LOW' undeclared
(first use in this function)
80 | tdp158->enable = devm_gpiod_get_optional(dev, "enable",
GPIOD_OUT_LOW);
|
^
drivers/gpu/drm/bridge/ti-tdp158.c:80:65: note: each undeclared identifier is
reported only once for each function it appears in
Caused by commit
a15710027afb ("drm/bridge: add support for TI TDP158")
I have used the drm-misc tree from next-20240903 for today.
--
Cheers,
Stephen Rothwell
pgpe99VdAOaFT.pgp
Description: OpenPGP digital signature
Re: linux-next: build failure after merge of the drm-misc tree
Hi,
On Wed, May 29, 2024 at 12:35:31PM GMT, Stephen Rothwell wrote:
> Hi all,
>
> After merging the drm-misc tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
>
> drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c: In function
> 'sun4i_hdmi_connector_mode_valid':
> drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c:213:17: error: implicit declaration of
> function 'drm_connector_hdmi_compute_mode_clock'; did you mean
> 'drm_hdmi_compute_mode_clock'? [-Werror=implicit-function-declaration]
> 213 | drm_connector_hdmi_compute_mode_clock(mode, 8,
> | ^
> | drm_hdmi_compute_mode_clock
> cc1: some warnings being treated as errors
>
> Caused by commit
>
> ea64761a54a2 ("drm/sun4i: hdmi: Switch to HDMI connector")
>
> I have used the drm-misc tree from next-20240528 for today.
Thanks for the report. A fix is now merged into drm-misc-next
https://lore.kernel.org/dri-devel/20240528151056.2104153-1-mrip...@kernel.org/
Maxime
signature.asc
Description: PGP signature
linux-next: build failure after merge of the drm-misc tree
Hi all,
After merging the drm-misc tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:
drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c: In function
'sun4i_hdmi_connector_mode_valid':
drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c:213:17: error: implicit declaration of
function 'drm_connector_hdmi_compute_mode_clock'; did you mean
'drm_hdmi_compute_mode_clock'? [-Werror=implicit-function-declaration]
213 | drm_connector_hdmi_compute_mode_clock(mode, 8,
| ^
| drm_hdmi_compute_mode_clock
cc1: some warnings being treated as errors
Caused by commit
ea64761a54a2 ("drm/sun4i: hdmi: Switch to HDMI connector")
I have used the drm-misc tree from next-20240528 for today.
--
Cheers,
Stephen Rothwell
pgp7cArRfjvZS.pgp
Description: OpenPGP digital signature
linux-next: build failure after merge of the drm-misc tree
Hi all,
After merging the drm-misc tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:
In file included from drivers/gpu/drm/v3d/v3d_drv.h:14,
from drivers/gpu/drm/v3d/v3d_bo.c:26:
drivers/gpu/drm/v3d/v3d_performance_counters.h:118:43: warning:
'v3d_v42_performance_counters' defined but not used [-Wunused-const-variable=]
118 | static const struct v3d_perf_counter_desc
v3d_v42_performance_counters[] = {
| ^~~~
In file included from drivers/gpu/drm/v3d/v3d_drv.h:14,
from drivers/gpu/drm/v3d/v3d_fence.c:4:
drivers/gpu/drm/v3d/v3d_performance_counters.h:118:43: warning:
'v3d_v42_performance_counters' defined but not used [-Wunused-const-variable=]
118 | static const struct v3d_perf_counter_desc
v3d_v42_performance_counters[] = {
| ^~~~
In file included from drivers/gpu/drm/v3d/v3d_drv.h:14,
from drivers/gpu/drm/v3d/v3d_gem.c:15:
drivers/gpu/drm/v3d/v3d_performance_counters.h:118:43: warning:
'v3d_v42_performance_counters' defined but not used [-Wunused-const-variable=]
118 | static const struct v3d_perf_counter_desc
v3d_v42_performance_counters[] = {
| ^~~~
In file included from drivers/gpu/drm/v3d/v3d_drv.h:14,
from drivers/gpu/drm/v3d/v3d_mmu.c:21:
drivers/gpu/drm/v3d/v3d_performance_counters.h:118:43: warning:
'v3d_v42_performance_counters' defined but not used [-Wunused-const-variable=]
118 | static const struct v3d_perf_counter_desc
v3d_v42_performance_counters[] = {
| ^~~~
In file included from drivers/gpu/drm/v3d/v3d_drv.h:14,
from drivers/gpu/drm/v3d/v3d_irq.c:19:
drivers/gpu/drm/v3d/v3d_performance_counters.h:118:43: warning:
'v3d_v42_performance_counters' defined but not used [-Wunused-const-variable=]
118 | static const struct v3d_perf_counter_desc
v3d_v42_performance_counters[] = {
| ^~~~
In file included from drivers/gpu/drm/v3d/v3d_drv.h:14,
from drivers/gpu/drm/v3d/v3d_sched.c:26:
drivers/gpu/drm/v3d/v3d_performance_counters.h:118:43: warning:
'v3d_v42_performance_counters' defined but not used [-Wunused-const-variable=]
118 | static const struct v3d_perf_counter_desc
v3d_v42_performance_counters[] = {
| ^~~~
In file included from drivers/gpu/drm/v3d/v3d_drv.h:14,
from drivers/gpu/drm/v3d/v3d_trace_points.c:4:
drivers/gpu/drm/v3d/v3d_performance_counters.h:118:43: warning:
'v3d_v42_performance_counters' defined but not used [-Wunused-const-variable=]
118 | static const struct v3d_perf_counter_desc
v3d_v42_performance_counters[] = {
| ^~~~
In file included from drivers/gpu/drm/v3d/v3d_drv.h:14,
from drivers/gpu/drm/v3d/v3d_sysfs.c:9:
drivers/gpu/drm/v3d/v3d_performance_counters.h:118:43: warning:
'v3d_v42_performance_counters' defined but not used [-Wunused-const-variable=]
118 | static const struct v3d_perf_counter_desc
v3d_v42_performance_counters[] = {
| ^~~~
In file included from drivers/gpu/drm/v3d/v3d_drv.h:14,
from drivers/gpu/drm/v3d/v3d_debugfs.c:12:
drivers/gpu/drm/v3d/v3d_performance_counters.h:118:43: warning:
'v3d_v42_performance_counters' defined but not used [-Wunused-const-variable=]
118 | static const struct v3d_perf_counter_desc
v3d_v42_performance_counters[] = {
| ^~~~
In file included from drivers/gpu/drm/v3d/v3d_drv.h:14,
from drivers/gpu/drm/v3d/v3d_submit.c:9:
drivers/gpu/drm/v3d/v3d_performance_counters.h:118:43: warning:
'v3d_v42_performance_counters' defined but not used [-Wunused-const-variable=]
118 | static const struct v3d_perf_counter_desc
v3d_v42_performance_counters[] = {
| ^~~~
Caused by commit
3cbcbe016c31 ("drm/v3d: Add Performance Counters descriptions for V3D 4.2 and
7.1")
I have used the drm-misc tree from next-20240528 for today.
--
Cheers,
Stephen Rothwell
pgpvoz0I5GVxB.pgp
Description: OpenPGP digital signature
linux-next: build failure after merge of the drm-misc tree
Hi all,
After merging the drm-misc tree, today's linux-next build
(x86_64_allmodconfig) failed like this:
In file included from drivers/gpu/drm/panthor/panthor_fw.c:19:
drivers/gpu/drm/panthor/panthor_fw.c: In function 'panthor_job_irq_suspend':
drivers/gpu/drm/panthor/panthor_device.h:326:13: error: unused variable
'cookie' [-Werror=unused-variable]
326 | int cookie;
\
| ^~
drivers/gpu/drm/panthor/panthor_fw.c:979:1: note: in expansion of macro
'PANTHOR_IRQ_HANDLER'
979 | PANTHOR_IRQ_HANDLER(job, JOB, panthor_job_irq_handler);
| ^~~
drivers/gpu/drm/panthor/panthor_fw.c: In function 'panthor_job_irq_resume':
drivers/gpu/drm/panthor/panthor_device.h:336:13: error: unused variable
'cookie' [-Werror=unused-variable]
336 | int cookie;
\
| ^~
drivers/gpu/drm/panthor/panthor_fw.c:979:1: note: in expansion of macro
'PANTHOR_IRQ_HANDLER'
979 | PANTHOR_IRQ_HANDLER(job, JOB, panthor_job_irq_handler);
| ^~~
cc1: all warnings being treated as errors
In file included from drivers/gpu/drm/panthor/panthor_gpu.c:19:
drivers/gpu/drm/panthor/panthor_gpu.c: In function 'panthor_gpu_irq_suspend':
drivers/gpu/drm/panthor/panthor_device.h:326:13: error: unused variable
'cookie' [-Werror=unused-variable]
326 | int cookie;
\
| ^~
drivers/gpu/drm/panthor/panthor_gpu.c:166:1: note: in expansion of macro
'PANTHOR_IRQ_HANDLER'
166 | PANTHOR_IRQ_HANDLER(gpu, GPU, panthor_gpu_irq_handler);
| ^~~
drivers/gpu/drm/panthor/panthor_gpu.c: In function 'panthor_gpu_irq_resume':
drivers/gpu/drm/panthor/panthor_device.h:336:13: error: unused variable
'cookie' [-Werror=unused-variable]
336 | int cookie;
\
| ^~
drivers/gpu/drm/panthor/panthor_gpu.c:166:1: note: in expansion of macro
'PANTHOR_IRQ_HANDLER'
166 | PANTHOR_IRQ_HANDLER(gpu, GPU, panthor_gpu_irq_handler);
| ^~~
cc1: all warnings being treated as errors
In file included from drivers/gpu/drm/panthor/panthor_mmu.c:30:
drivers/gpu/drm/panthor/panthor_mmu.c: In function 'panthor_mmu_irq_suspend':
drivers/gpu/drm/panthor/panthor_device.h:326:13: error: unused variable
'cookie' [-Werror=unused-variable]
326 | int cookie;
\
| ^~
drivers/gpu/drm/panthor/panthor_mmu.c:1689:1: note: in expansion of macro
'PANTHOR_IRQ_HANDLER'
1689 | PANTHOR_IRQ_HANDLER(mmu, MMU, panthor_mmu_irq_handler);
| ^~~
drivers/gpu/drm/panthor/panthor_mmu.c: In function 'panthor_mmu_irq_resume':
drivers/gpu/drm/panthor/panthor_device.h:336:13: error: unused variable
'cookie' [-Werror=unused-variable]
336 | int cookie;
\
| ^~
drivers/gpu/drm/panthor/panthor_mmu.c:1689:1: note: in expansion of macro
'PANTHOR_IRQ_HANDLER'
1689 | PANTHOR_IRQ_HANDLER(mmu, MMU, panthor_mmu_irq_handler);
| ^~~
cc1: all warnings being treated as errors
Caused by commit
962f88b9c916 ("drm/panthor: Drop the dev_enter/exit() sections in
_irq_suspend/resume()")
I have used the drm-misc tree from next-20240402 for today.
--
Cheers,
Stephen Rothwell
pgpHuhSODs95K.pgp
Description: OpenPGP digital signature
Re: linux-next: build failure after merge of the drm-misc tree
Am 25.02.24 um 22:47 schrieb Stephen Rothwell:
Hi all,
On Mon, 26 Feb 2024 08:41:16 +1100 Stephen Rothwell
wrote:
On Tue, 20 Feb 2024 08:48:21 +1100 Stephen Rothwell
wrote:
On Mon, 12 Feb 2024 15:15:54 +0200 Jani Nikula
wrote:
On Tue, 06 Feb 2024, Stephen Rothwell wrote:
After merging the drm-misc tree, today's linux-next build (i386 defconfig)
failed like this:
In function 'i915_ttm_placement_from_obj',
inlined from 'i915_ttm_get_pages' at
drivers/gpu/drm/i915/gem/i915_gem_ttm.c:847:2:
drivers/gpu/drm/i915/gem/i915_gem_ttm.c:165:18: error: 'places[0].flags' is
used uninitialized [-Werror=uninitialized]
165 | places[0].flags |= TTM_PL_FLAG_DESIRED;
| ~^~
drivers/gpu/drm/i915/gem/i915_gem_ttm.c: In function 'i915_ttm_get_pages':
drivers/gpu/drm/i915/gem/i915_gem_ttm.c:837:26: note: 'places' declared here
837 | struct ttm_place places[I915_TTM_MAX_PLACEMENTS + 1];
| ^~
Caused by commit
a78a8da51b36 ("drm/ttm: replace busy placement with flags v6")
Cc: more people.
I applied the following hack for today:
From: Stephen Rothwell
Date: Tue, 6 Feb 2024 15:17:54 +1100
Subject: [PATCH] drm/ttm: initialise places
Signed-off-by: Stephen Rothwell
---
drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
index 80c6cafc8887..34e699e67c25 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
@@ -834,7 +834,7 @@ static int __i915_ttm_get_pages(struct drm_i915_gem_object
*obj,
static int i915_ttm_get_pages(struct drm_i915_gem_object *obj)
{
- struct ttm_place places[I915_TTM_MAX_PLACEMENTS + 1];
+ struct ttm_place places[I915_TTM_MAX_PLACEMENTS + 1] = {};
struct ttm_placement placement;
/* restricted by sg_alloc_table */
--
2.43.0
I am still applying the above patch ...
Any progress?
And this commit is now in the drm tree.
Sorry for the delay. Oring in the flag needs to come after the call and
not before it.
Going to fix this.
Thanks,
Christian.
Re: linux-next: build failure after merge of the drm-misc tree
Hi all,
On Mon, 26 Feb 2024 08:41:16 +1100 Stephen Rothwell
wrote:
>
> On Tue, 20 Feb 2024 08:48:21 +1100 Stephen Rothwell
> wrote:
> >
> > On Mon, 12 Feb 2024 15:15:54 +0200 Jani Nikula
> > wrote:
> > >
> > > On Tue, 06 Feb 2024, Stephen Rothwell wrote:
> > > >
> > > > After merging the drm-misc tree, today's linux-next build (i386
> > > > defconfig)
> > > > failed like this:
> > > >
> > > > In function 'i915_ttm_placement_from_obj',
> > > > inlined from 'i915_ttm_get_pages' at
> > > > drivers/gpu/drm/i915/gem/i915_gem_ttm.c:847:2:
> > > > drivers/gpu/drm/i915/gem/i915_gem_ttm.c:165:18: error:
> > > > 'places[0].flags' is used uninitialized [-Werror=uninitialized]
> > > > 165 | places[0].flags |= TTM_PL_FLAG_DESIRED;
> > > > | ~^~
> > > > drivers/gpu/drm/i915/gem/i915_gem_ttm.c: In function
> > > > 'i915_ttm_get_pages':
> > > > drivers/gpu/drm/i915/gem/i915_gem_ttm.c:837:26: note: 'places' declared
> > > > here
> > > > 837 | struct ttm_place places[I915_TTM_MAX_PLACEMENTS + 1];
> > > > | ^~
> > > >
> > > > Caused by commit
> > > >
> > > > a78a8da51b36 ("drm/ttm: replace busy placement with flags v6")
> > >
> > > Cc: more people.
> > >
> > > >
> > > > I applied the following hack for today:
> > > >
> > > > From: Stephen Rothwell
> > > > Date: Tue, 6 Feb 2024 15:17:54 +1100
> > > > Subject: [PATCH] drm/ttm: initialise places
> > > >
> > > > Signed-off-by: Stephen Rothwell
> > > > ---
> > > > drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 2 +-
> > > > 1 file changed, 1 insertion(+), 1 deletion(-)
> > > >
> > > > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
> > > > b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
> > > > index 80c6cafc8887..34e699e67c25 100644
> > > > --- a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
> > > > +++ b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
> > > > @@ -834,7 +834,7 @@ static int __i915_ttm_get_pages(struct
> > > > drm_i915_gem_object *obj,
> > > >
> > > > static int i915_ttm_get_pages(struct drm_i915_gem_object *obj)
> > > > {
> > > > - struct ttm_place places[I915_TTM_MAX_PLACEMENTS + 1];
> > > > + struct ttm_place places[I915_TTM_MAX_PLACEMENTS + 1] = {};
> > > > struct ttm_placement placement;
> > > >
> > > > /* restricted by sg_alloc_table */
> > > > --
> > > > 2.43.0
> >
> > I am still applying the above patch ...
>
> Any progress?
And this commit is now in the drm tree.
--
Cheers,
Stephen Rothwell
pgpoJ2ArDwx2h.pgp
Description: OpenPGP digital signature
Re: linux-next: build failure after merge of the drm-misc tree
Hi all,
On Tue, 20 Feb 2024 08:48:21 +1100 Stephen Rothwell
wrote:
>
> On Mon, 12 Feb 2024 15:15:54 +0200 Jani Nikula
> wrote:
> >
> > On Tue, 06 Feb 2024, Stephen Rothwell wrote:
> > >
> > > After merging the drm-misc tree, today's linux-next build (i386 defconfig)
> > > failed like this:
> > >
> > > In function 'i915_ttm_placement_from_obj',
> > > inlined from 'i915_ttm_get_pages' at
> > > drivers/gpu/drm/i915/gem/i915_gem_ttm.c:847:2:
> > > drivers/gpu/drm/i915/gem/i915_gem_ttm.c:165:18: error: 'places[0].flags'
> > > is used uninitialized [-Werror=uninitialized]
> > > 165 | places[0].flags |= TTM_PL_FLAG_DESIRED;
> > > | ~^~
> > > drivers/gpu/drm/i915/gem/i915_gem_ttm.c: In function 'i915_ttm_get_pages':
> > > drivers/gpu/drm/i915/gem/i915_gem_ttm.c:837:26: note: 'places' declared
> > > here
> > > 837 | struct ttm_place places[I915_TTM_MAX_PLACEMENTS + 1];
> > > | ^~
> > >
> > > Caused by commit
> > >
> > > a78a8da51b36 ("drm/ttm: replace busy placement with flags v6")
> >
> > Cc: more people.
> >
> > >
> > > I applied the following hack for today:
> > >
> > > From: Stephen Rothwell
> > > Date: Tue, 6 Feb 2024 15:17:54 +1100
> > > Subject: [PATCH] drm/ttm: initialise places
> > >
> > > Signed-off-by: Stephen Rothwell
> > > ---
> > > drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 2 +-
> > > 1 file changed, 1 insertion(+), 1 deletion(-)
> > >
> > > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
> > > b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
> > > index 80c6cafc8887..34e699e67c25 100644
> > > --- a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
> > > +++ b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
> > > @@ -834,7 +834,7 @@ static int __i915_ttm_get_pages(struct
> > > drm_i915_gem_object *obj,
> > >
> > > static int i915_ttm_get_pages(struct drm_i915_gem_object *obj)
> > > {
> > > - struct ttm_place places[I915_TTM_MAX_PLACEMENTS + 1];
> > > + struct ttm_place places[I915_TTM_MAX_PLACEMENTS + 1] = {};
> > > struct ttm_placement placement;
> > >
> > > /* restricted by sg_alloc_table */
> > > --
> > > 2.43.0
>
> I am still applying the above patch ...
Any progress?
--
Cheers,
Stephen Rothwell
pgpbT8cfeqoTB.pgp
Description: OpenPGP digital signature
RE: linux-next: build failure after merge of the drm-misc tree
Hi Geert,
Thanks for the feedback.
> -Original Message-
> From: Geert Uytterhoeven
> Sent: Thursday, February 22, 2024 8:29 AM
> Subject: Re: linux-next: build failure after merge of the drm-misc tree
>
> Hi Biju,
>
> On Thu, Feb 22, 2024 at 9:14 AM Biju Das
> wrote:
> > > -Original Message-
> > > From: Stephen Rothwell
> > > Sent: Thursday, February 22, 2024 1:46 AM
> > > Subject: linux-next: build failure after merge of the drm-misc tree
> > >
> > > After merging the drm-misc tree, today's linux-next build (x86_64
> > > allmodconfig) failed like this:
> > >
> > > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:47:6: error:
> > > redefinition of 'rzg2l_du_vsp_enable'
> > >47 | void rzg2l_du_vsp_enable(struct rzg2l_du_crtc *crtc)
> > > | ^~~
> > > In file included from drivers/gpu/drm/renesas/rz-du/rzg2l_du_drv.h:18,
> > > from drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:30:
> > > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h:72:20: note: previous
> > > definition of 'rzg2l_du_vsp_enable' with type 'void(struct
> > > rzg2l_du_crtc *)'
> > >72 | static inline void rzg2l_du_vsp_enable(struct rzg2l_du_crtc
> > > *crtc) { };
> > > |^~~
> > > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:61:6: error:
> > > redefinition of 'rzg2l_du_vsp_disable'
> > >61 | void rzg2l_du_vsp_disable(struct rzg2l_du_crtc *crtc)
> > > | ^~~~
> > > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h:73:20: note: previous
> > > definition of 'rzg2l_du_vsp_disable' with type 'void(struct
> > > rzg2l_du_crtc *)'
> > >73 | static inline void rzg2l_du_vsp_disable(struct rzg2l_du_crtc
> > > *crtc) { };
> > > |^~~~
> > > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:66:6: error:
> > > redefinition of 'rzg2l_du_vsp_atomic_flush'
> > >66 | void rzg2l_du_vsp_atomic_flush(struct rzg2l_du_crtc *crtc)
> > > | ^
> > > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h:74:20: note: previous
> > > definition of 'rzg2l_du_vsp_atomic_flush' with type 'void(struct
> > > rzg2l_du_crtc *)'
> > >74 | static inline void rzg2l_du_vsp_atomic_flush(struct
> > > rzg2l_du_crtc
> > > *crtc) { };
> > > |^
> > > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:76:19: error:
> > > redefinition of 'rzg2l_du_vsp_get_drm_plane'
> > >76 | struct drm_plane *rzg2l_du_vsp_get_drm_plane(struct
> > > rzg2l_du_crtc *crtc,
> > > | ^~
> > > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h:75:33: note: previous
> > > definition of 'rzg2l_du_vsp_get_drm_plane' with type 'struct
> > > drm_plane *(struct rzg2l_du_crtc *, unsigned int)'
> > >75 | static inline struct drm_plane
> > > *rzg2l_du_vsp_get_drm_plane(struct
> > > rzg2l_du_crtc *crtc,
> > > | ^~
> > > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:302:5: error:
> > > redefinition of 'rzg2l_du_vsp_init'
> > > 302 | int rzg2l_du_vsp_init(struct rzg2l_du_vsp *vsp, struct
> > > device_node *np,
> > > | ^
> > > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h:66:19: note: previous
> > > definition of 'rzg2l_du_vsp_init' with type 'int(struct rzg2l_du_vsp
> > > *, struct device_node *, unsigned int)'
> > >66 | static inline int rzg2l_du_vsp_init(struct rzg2l_du_vsp
> > > *vsp, struct device_node *np,
> > > | ^
> > >
> > > Caused by commit
> > >
> > > 768e9e61b3b9 ("drm: renesas: Add RZ/G2L DU Support")
> > >
> > > I have used the drm-misc tree from next-20240221 for today.
> >
> > I will send an incremental patch to fix this build error with x86 on
> drm-next.
> >
> > I need to use the macro #if IS_ENABLED(CONFIG_VIDEO_RENESAS_VSP1)
> > in drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h to fix this error.
>
> Looks like you're also missing an EXPORT_SYMBOL_GPL(rzg2l_du_vsp_enable)?
Yes, Will add this aswell, as CONFIG_VIDEO_RENESAS_VSP1=m for x86.
Cheers,
Biju
RE: linux-next: build failure after merge of the drm-misc tree
Hi Maxime Ripard,
> -Original Message-
> From: Maxime Ripard
> Sent: Thursday, February 22, 2024 8:32 AM
> To: Biju Das
> Subject: Re: linux-next: build failure after merge of the drm-misc tree
>
> Hi Biju,
>
> On Thu, Feb 22, 2024 at 08:14:14AM +, Biju Das wrote:
> > > -Original Message-
> > > From: Stephen Rothwell
> > > Sent: Thursday, February 22, 2024 1:46 AM
> > > Subject: linux-next: build failure after merge of the drm-misc tree
> > >
> > > Hi all,
> > >
> > > After merging the drm-misc tree, today's linux-next build (x86_64
> > > allmodconfig) failed like this:
> > >
> > > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:47:6: error:
> > > redefinition of 'rzg2l_du_vsp_enable'
> > >47 | void rzg2l_du_vsp_enable(struct rzg2l_du_crtc *crtc)
> > > | ^~~
> > > In file included from drivers/gpu/drm/renesas/rz-du/rzg2l_du_drv.h:18,
> > > from drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:30:
> > > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h:72:20: note: previous
> > > definition of 'rzg2l_du_vsp_enable' with type 'void(struct
> > > rzg2l_du_crtc *)'
> > >72 | static inline void rzg2l_du_vsp_enable(struct rzg2l_du_crtc
> > > *crtc) { };
> > > |^~~
> > > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:61:6: error:
> > > redefinition of 'rzg2l_du_vsp_disable'
> > >61 | void rzg2l_du_vsp_disable(struct rzg2l_du_crtc *crtc)
> > > | ^~~~
> > > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h:73:20: note: previous
> > > definition of 'rzg2l_du_vsp_disable' with type 'void(struct
> > > rzg2l_du_crtc *)'
> > >73 | static inline void rzg2l_du_vsp_disable(struct rzg2l_du_crtc
> > > *crtc) { };
> > > |^~~~
> > > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:66:6: error:
> > > redefinition of 'rzg2l_du_vsp_atomic_flush'
> > >66 | void rzg2l_du_vsp_atomic_flush(struct rzg2l_du_crtc *crtc)
> > > | ^
> > > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h:74:20: note: previous
> > > definition of 'rzg2l_du_vsp_atomic_flush' with type 'void(struct
> > > rzg2l_du_crtc *)'
> > >74 | static inline void rzg2l_du_vsp_atomic_flush(struct
> > > rzg2l_du_crtc
> > > *crtc) { };
> > > |^
> > > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:76:19: error:
> > > redefinition of 'rzg2l_du_vsp_get_drm_plane'
> > >76 | struct drm_plane *rzg2l_du_vsp_get_drm_plane(struct
> > > rzg2l_du_crtc *crtc,
> > > | ^~
> > > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h:75:33: note: previous
> > > definition of 'rzg2l_du_vsp_get_drm_plane' with type 'struct
> > > drm_plane *(struct rzg2l_du_crtc *, unsigned int)'
> > >75 | static inline struct drm_plane
> > > *rzg2l_du_vsp_get_drm_plane(struct
> > > rzg2l_du_crtc *crtc,
> > > | ^~
> > > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:302:5: error:
> > > redefinition of 'rzg2l_du_vsp_init'
> > > 302 | int rzg2l_du_vsp_init(struct rzg2l_du_vsp *vsp, struct
> > > device_node *np,
> > > | ^
> > > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h:66:19: note: previous
> > > definition of 'rzg2l_du_vsp_init' with type 'int(struct rzg2l_du_vsp
> > > *, struct device_node *, unsigned int)'
> > >66 | static inline int rzg2l_du_vsp_init(struct rzg2l_du_vsp
> > > *vsp, struct device_node *np,
> > > | ^
> > >
> > > Caused by commit
> > >
> > > 768e9e61b3b9 ("drm: renesas: Add RZ/G2L DU Support")
> > >
> > > I have used the drm-misc tree from next-20240221 for today.
> >
> > I will send an incremental patch to fix this build error with x86 on
> drm-next.
>
> Any chance you can do it today? We need to send the drm-misc-next PR.
Yes I am on it.
Cheers,
Biju
RE: linux-next: build failure after merge of the drm-misc tree
Hi All,
> -Original Message-
> From: Stephen Rothwell
> Sent: Thursday, February 22, 2024 1:46 AM
> Subject: linux-next: build failure after merge of the drm-misc tree
>
> Hi all,
>
> After merging the drm-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:47:6: error: redefinition of
> 'rzg2l_du_vsp_enable'
>47 | void rzg2l_du_vsp_enable(struct rzg2l_du_crtc *crtc)
> | ^~~
> In file included from drivers/gpu/drm/renesas/rz-du/rzg2l_du_drv.h:18,
> from drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:30:
> drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h:72:20: note: previous
> definition of 'rzg2l_du_vsp_enable' with type 'void(struct rzg2l_du_crtc
> *)'
>72 | static inline void rzg2l_du_vsp_enable(struct rzg2l_du_crtc *crtc)
> { };
> |^~~
> drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:61:6: error: redefinition of
> 'rzg2l_du_vsp_disable'
>61 | void rzg2l_du_vsp_disable(struct rzg2l_du_crtc *crtc)
> | ^~~~
> drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h:73:20: note: previous
> definition of 'rzg2l_du_vsp_disable' with type 'void(struct rzg2l_du_crtc
> *)'
>73 | static inline void rzg2l_du_vsp_disable(struct rzg2l_du_crtc
> *crtc) { };
> |^~~~
> drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:66:6: error: redefinition of
> 'rzg2l_du_vsp_atomic_flush'
>66 | void rzg2l_du_vsp_atomic_flush(struct rzg2l_du_crtc *crtc)
> | ^
> drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h:74:20: note: previous
> definition of 'rzg2l_du_vsp_atomic_flush' with type 'void(struct
> rzg2l_du_crtc *)'
>74 | static inline void rzg2l_du_vsp_atomic_flush(struct rzg2l_du_crtc
> *crtc) { };
> |^
> drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:76:19: error: redefinition of
> 'rzg2l_du_vsp_get_drm_plane'
>76 | struct drm_plane *rzg2l_du_vsp_get_drm_plane(struct rzg2l_du_crtc
> *crtc,
> | ^~
> drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h:75:33: note: previous
> definition of 'rzg2l_du_vsp_get_drm_plane' with type 'struct drm_plane
> *(struct rzg2l_du_crtc *, unsigned int)'
>75 | static inline struct drm_plane *rzg2l_du_vsp_get_drm_plane(struct
> rzg2l_du_crtc *crtc,
> | ^~
> drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:302:5: error: redefinition of
> 'rzg2l_du_vsp_init'
> 302 | int rzg2l_du_vsp_init(struct rzg2l_du_vsp *vsp, struct device_node
> *np,
> | ^
> drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h:66:19: note: previous
> definition of 'rzg2l_du_vsp_init' with type 'int(struct rzg2l_du_vsp *,
> struct device_node *, unsigned int)'
>66 | static inline int rzg2l_du_vsp_init(struct rzg2l_du_vsp *vsp,
> struct device_node *np,
> | ^
>
> Caused by commit
>
> 768e9e61b3b9 ("drm: renesas: Add RZ/G2L DU Support")
>
> I have used the drm-misc tree from next-20240221 for today.
I will send an incremental patch to fix this build error with x86 on drm-next.
I need to use the macro #if IS_ENABLED(CONFIG_VIDEO_RENESAS_VSP1)
in drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h to fix this error.
Cheers,
Biju
Re: linux-next: build failure after merge of the drm-misc tree
Hi Biju,
On Thu, Feb 22, 2024 at 08:14:14AM +, Biju Das wrote:
> > -Original Message-
> > From: Stephen Rothwell
> > Sent: Thursday, February 22, 2024 1:46 AM
> > Subject: linux-next: build failure after merge of the drm-misc tree
> >
> > Hi all,
> >
> > After merging the drm-misc tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
> >
> > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:47:6: error: redefinition of
> > 'rzg2l_du_vsp_enable'
> >47 | void rzg2l_du_vsp_enable(struct rzg2l_du_crtc *crtc)
> > | ^~~
> > In file included from drivers/gpu/drm/renesas/rz-du/rzg2l_du_drv.h:18,
> > from drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:30:
> > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h:72:20: note: previous
> > definition of 'rzg2l_du_vsp_enable' with type 'void(struct rzg2l_du_crtc
> > *)'
> >72 | static inline void rzg2l_du_vsp_enable(struct rzg2l_du_crtc *crtc)
> > { };
> > |^~~
> > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:61:6: error: redefinition of
> > 'rzg2l_du_vsp_disable'
> >61 | void rzg2l_du_vsp_disable(struct rzg2l_du_crtc *crtc)
> > | ^~~~
> > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h:73:20: note: previous
> > definition of 'rzg2l_du_vsp_disable' with type 'void(struct rzg2l_du_crtc
> > *)'
> >73 | static inline void rzg2l_du_vsp_disable(struct rzg2l_du_crtc
> > *crtc) { };
> > |^~~~
> > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:66:6: error: redefinition of
> > 'rzg2l_du_vsp_atomic_flush'
> >66 | void rzg2l_du_vsp_atomic_flush(struct rzg2l_du_crtc *crtc)
> > | ^
> > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h:74:20: note: previous
> > definition of 'rzg2l_du_vsp_atomic_flush' with type 'void(struct
> > rzg2l_du_crtc *)'
> >74 | static inline void rzg2l_du_vsp_atomic_flush(struct rzg2l_du_crtc
> > *crtc) { };
> > |^
> > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:76:19: error: redefinition of
> > 'rzg2l_du_vsp_get_drm_plane'
> >76 | struct drm_plane *rzg2l_du_vsp_get_drm_plane(struct rzg2l_du_crtc
> > *crtc,
> > | ^~
> > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h:75:33: note: previous
> > definition of 'rzg2l_du_vsp_get_drm_plane' with type 'struct drm_plane
> > *(struct rzg2l_du_crtc *, unsigned int)'
> >75 | static inline struct drm_plane *rzg2l_du_vsp_get_drm_plane(struct
> > rzg2l_du_crtc *crtc,
> > | ^~
> > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:302:5: error: redefinition of
> > 'rzg2l_du_vsp_init'
> > 302 | int rzg2l_du_vsp_init(struct rzg2l_du_vsp *vsp, struct device_node
> > *np,
> > | ^
> > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h:66:19: note: previous
> > definition of 'rzg2l_du_vsp_init' with type 'int(struct rzg2l_du_vsp *,
> > struct device_node *, unsigned int)'
> >66 | static inline int rzg2l_du_vsp_init(struct rzg2l_du_vsp *vsp,
> > struct device_node *np,
> > | ^
> >
> > Caused by commit
> >
> > 768e9e61b3b9 ("drm: renesas: Add RZ/G2L DU Support")
> >
> > I have used the drm-misc tree from next-20240221 for today.
>
> I will send an incremental patch to fix this build error with x86 on drm-next.
Any chance you can do it today? We need to send the drm-misc-next PR.
Maxime
signature.asc
Description: PGP signature
Re: linux-next: build failure after merge of the drm-misc tree
Hi Biju,
On Thu, Feb 22, 2024 at 9:14 AM Biju Das wrote:
> > -Original Message-
> > From: Stephen Rothwell
> > Sent: Thursday, February 22, 2024 1:46 AM
> > Subject: linux-next: build failure after merge of the drm-misc tree
> >
> > After merging the drm-misc tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
> >
> > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:47:6: error: redefinition of
> > 'rzg2l_du_vsp_enable'
> >47 | void rzg2l_du_vsp_enable(struct rzg2l_du_crtc *crtc)
> > | ^~~
> > In file included from drivers/gpu/drm/renesas/rz-du/rzg2l_du_drv.h:18,
> > from drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:30:
> > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h:72:20: note: previous
> > definition of 'rzg2l_du_vsp_enable' with type 'void(struct rzg2l_du_crtc
> > *)'
> >72 | static inline void rzg2l_du_vsp_enable(struct rzg2l_du_crtc *crtc)
> > { };
> > |^~~
> > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:61:6: error: redefinition of
> > 'rzg2l_du_vsp_disable'
> >61 | void rzg2l_du_vsp_disable(struct rzg2l_du_crtc *crtc)
> > | ^~~~
> > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h:73:20: note: previous
> > definition of 'rzg2l_du_vsp_disable' with type 'void(struct rzg2l_du_crtc
> > *)'
> >73 | static inline void rzg2l_du_vsp_disable(struct rzg2l_du_crtc
> > *crtc) { };
> > |^~~~
> > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:66:6: error: redefinition of
> > 'rzg2l_du_vsp_atomic_flush'
> >66 | void rzg2l_du_vsp_atomic_flush(struct rzg2l_du_crtc *crtc)
> > | ^
> > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h:74:20: note: previous
> > definition of 'rzg2l_du_vsp_atomic_flush' with type 'void(struct
> > rzg2l_du_crtc *)'
> >74 | static inline void rzg2l_du_vsp_atomic_flush(struct rzg2l_du_crtc
> > *crtc) { };
> > |^
> > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:76:19: error: redefinition of
> > 'rzg2l_du_vsp_get_drm_plane'
> >76 | struct drm_plane *rzg2l_du_vsp_get_drm_plane(struct rzg2l_du_crtc
> > *crtc,
> > | ^~
> > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h:75:33: note: previous
> > definition of 'rzg2l_du_vsp_get_drm_plane' with type 'struct drm_plane
> > *(struct rzg2l_du_crtc *, unsigned int)'
> >75 | static inline struct drm_plane *rzg2l_du_vsp_get_drm_plane(struct
> > rzg2l_du_crtc *crtc,
> > | ^~
> > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:302:5: error: redefinition of
> > 'rzg2l_du_vsp_init'
> > 302 | int rzg2l_du_vsp_init(struct rzg2l_du_vsp *vsp, struct device_node
> > *np,
> > | ^
> > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h:66:19: note: previous
> > definition of 'rzg2l_du_vsp_init' with type 'int(struct rzg2l_du_vsp *,
> > struct device_node *, unsigned int)'
> >66 | static inline int rzg2l_du_vsp_init(struct rzg2l_du_vsp *vsp,
> > struct device_node *np,
> > | ^
> >
> > Caused by commit
> >
> > 768e9e61b3b9 ("drm: renesas: Add RZ/G2L DU Support")
> >
> > I have used the drm-misc tree from next-20240221 for today.
>
> I will send an incremental patch to fix this build error with x86 on drm-next.
>
> I need to use the macro #if IS_ENABLED(CONFIG_VIDEO_RENESAS_VSP1)
> in drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h to fix this error.
Looks like you're also missing an EXPORT_SYMBOL_GPL(rzg2l_du_vsp_enable)?
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- ge...@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
linux-next: build failure after merge of the drm-misc tree
Hi all,
After merging the drm-misc tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:47:6: error: redefinition of
'rzg2l_du_vsp_enable'
47 | void rzg2l_du_vsp_enable(struct rzg2l_du_crtc *crtc)
| ^~~
In file included from drivers/gpu/drm/renesas/rz-du/rzg2l_du_drv.h:18,
from drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:30:
drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h:72:20: note: previous definition
of 'rzg2l_du_vsp_enable' with type 'void(struct rzg2l_du_crtc *)'
72 | static inline void rzg2l_du_vsp_enable(struct rzg2l_du_crtc *crtc) { };
|^~~
drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:61:6: error: redefinition of
'rzg2l_du_vsp_disable'
61 | void rzg2l_du_vsp_disable(struct rzg2l_du_crtc *crtc)
| ^~~~
drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h:73:20: note: previous definition
of 'rzg2l_du_vsp_disable' with type 'void(struct rzg2l_du_crtc *)'
73 | static inline void rzg2l_du_vsp_disable(struct rzg2l_du_crtc *crtc) { };
|^~~~
drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:66:6: error: redefinition of
'rzg2l_du_vsp_atomic_flush'
66 | void rzg2l_du_vsp_atomic_flush(struct rzg2l_du_crtc *crtc)
| ^
drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h:74:20: note: previous definition
of 'rzg2l_du_vsp_atomic_flush' with type 'void(struct rzg2l_du_crtc *)'
74 | static inline void rzg2l_du_vsp_atomic_flush(struct rzg2l_du_crtc
*crtc) { };
|^
drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:76:19: error: redefinition of
'rzg2l_du_vsp_get_drm_plane'
76 | struct drm_plane *rzg2l_du_vsp_get_drm_plane(struct rzg2l_du_crtc *crtc,
| ^~
drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h:75:33: note: previous definition
of 'rzg2l_du_vsp_get_drm_plane' with type 'struct drm_plane *(struct
rzg2l_du_crtc *, unsigned int)'
75 | static inline struct drm_plane *rzg2l_du_vsp_get_drm_plane(struct
rzg2l_du_crtc *crtc,
| ^~
drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:302:5: error: redefinition of
'rzg2l_du_vsp_init'
302 | int rzg2l_du_vsp_init(struct rzg2l_du_vsp *vsp, struct device_node *np,
| ^
drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h:66:19: note: previous definition
of 'rzg2l_du_vsp_init' with type 'int(struct rzg2l_du_vsp *, struct device_node
*, unsigned int)'
66 | static inline int rzg2l_du_vsp_init(struct rzg2l_du_vsp *vsp, struct
device_node *np,
| ^
Caused by commit
768e9e61b3b9 ("drm: renesas: Add RZ/G2L DU Support")
I have used the drm-misc tree from next-20240221 for today.
--
Cheers,
Stephen Rothwell
pgp5Yv6hyy52w.pgp
Description: OpenPGP digital signature
Re: linux-next: build failure after merge of the drm-misc tree
Hi all,
On Mon, 12 Feb 2024 15:15:54 +0200 Jani Nikula
wrote:
>
> On Tue, 06 Feb 2024, Stephen Rothwell wrote:
> >
> > After merging the drm-misc tree, today's linux-next build (i386 defconfig)
> > failed like this:
> >
> > In function 'i915_ttm_placement_from_obj',
> > inlined from 'i915_ttm_get_pages' at
> > drivers/gpu/drm/i915/gem/i915_gem_ttm.c:847:2:
> > drivers/gpu/drm/i915/gem/i915_gem_ttm.c:165:18: error: 'places[0].flags' is
> > used uninitialized [-Werror=uninitialized]
> > 165 | places[0].flags |= TTM_PL_FLAG_DESIRED;
> > | ~^~
> > drivers/gpu/drm/i915/gem/i915_gem_ttm.c: In function 'i915_ttm_get_pages':
> > drivers/gpu/drm/i915/gem/i915_gem_ttm.c:837:26: note: 'places' declared here
> > 837 | struct ttm_place places[I915_TTM_MAX_PLACEMENTS + 1];
> > | ^~
> >
> > Caused by commit
> >
> > a78a8da51b36 ("drm/ttm: replace busy placement with flags v6")
>
> Cc: more people.
>
> >
> > I applied the following hack for today:
> >
> > From: Stephen Rothwell
> > Date: Tue, 6 Feb 2024 15:17:54 +1100
> > Subject: [PATCH] drm/ttm: initialise places
> >
> > Signed-off-by: Stephen Rothwell
> > ---
> > drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
> > b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
> > index 80c6cafc8887..34e699e67c25 100644
> > --- a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
> > +++ b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
> > @@ -834,7 +834,7 @@ static int __i915_ttm_get_pages(struct
> > drm_i915_gem_object *obj,
> >
> > static int i915_ttm_get_pages(struct drm_i915_gem_object *obj)
> > {
> > - struct ttm_place places[I915_TTM_MAX_PLACEMENTS + 1];
> > + struct ttm_place places[I915_TTM_MAX_PLACEMENTS + 1] = {};
> > struct ttm_placement placement;
> >
> > /* restricted by sg_alloc_table */
> > --
> > 2.43.0
I am still applying the above patch ...
--
Cheers,
Stephen Rothwell
pgpIRyeKbrwaj.pgp
Description: OpenPGP digital signature
linux-next: build failure after merge of the drm-misc tree
Hi all,
After merging the drm-misc tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/gpu/drm/xe/xe_guc_submit.c: In function 'simple_error_capture':
drivers/gpu/drm/xe/xe_guc_submit.c:814:48: error: passing argument 1 of
'drm_err_printer' from incompatible pointer type
[-Werror=incompatible-pointer-types]
814 | struct drm_printer p = drm_err_printer("");
|^~
||
|char *
In file included from drivers/gpu/drm/xe/xe_assert.h:11,
from drivers/gpu/drm/xe/xe_guc_submit.c:19:
include/drm/drm_print.h:349:69: note: expected 'struct drm_device *' but
argument is of type 'char *'
349 | static inline struct drm_printer drm_err_printer(struct drm_device *drm,
| ~~~^~~
drivers/gpu/drm/xe/xe_guc_submit.c:814:32: error: too few arguments to function
'drm_err_printer'
814 | struct drm_printer p = drm_err_printer("");
|^~~
include/drm/drm_print.h:349:34: note: declared here
349 | static inline struct drm_printer drm_err_printer(struct drm_device *drm,
| ^~~
cc1: all warnings being treated as errors
Caused by commit
5e0c04c8c40b ("drm/print: make drm_err_printer() device specific by using
drm_err()")
I have used the drm-misc tree from next-20240209 again today.
--
Cheers,
Stephen Rothwell
pgpdGRKhpbvw8.pgp
Description: OpenPGP digital signature
Re: linux-next: build failure after merge of the drm-misc tree
On Tue, 06 Feb 2024, Stephen Rothwell wrote:
> Hi all,
>
> After merging the drm-misc tree, today's linux-next build (i386 defconfig)
> failed like this:
>
> In function 'i915_ttm_placement_from_obj',
> inlined from 'i915_ttm_get_pages' at
> drivers/gpu/drm/i915/gem/i915_gem_ttm.c:847:2:
> drivers/gpu/drm/i915/gem/i915_gem_ttm.c:165:18: error: 'places[0].flags' is
> used uninitialized [-Werror=uninitialized]
> 165 | places[0].flags |= TTM_PL_FLAG_DESIRED;
> | ~^~
> drivers/gpu/drm/i915/gem/i915_gem_ttm.c: In function 'i915_ttm_get_pages':
> drivers/gpu/drm/i915/gem/i915_gem_ttm.c:837:26: note: 'places' declared here
> 837 | struct ttm_place places[I915_TTM_MAX_PLACEMENTS + 1];
> | ^~
>
> Caused by commit
>
> a78a8da51b36 ("drm/ttm: replace busy placement with flags v6")
Cc: more people.
>
> I applied the following hack for today:
>
> From: Stephen Rothwell
> Date: Tue, 6 Feb 2024 15:17:54 +1100
> Subject: [PATCH] drm/ttm: initialise places
>
> Signed-off-by: Stephen Rothwell
> ---
> drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
> b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
> index 80c6cafc8887..34e699e67c25 100644
> --- a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
> +++ b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
> @@ -834,7 +834,7 @@ static int __i915_ttm_get_pages(struct
> drm_i915_gem_object *obj,
>
> static int i915_ttm_get_pages(struct drm_i915_gem_object *obj)
> {
> - struct ttm_place places[I915_TTM_MAX_PLACEMENTS + 1];
> + struct ttm_place places[I915_TTM_MAX_PLACEMENTS + 1] = {};
> struct ttm_placement placement;
>
> /* restricted by sg_alloc_table */
> --
> 2.43.0
--
Jani Nikula, Intel
Re: linux-next: build failure after merge of the drm-misc tree
On Mon, 12 Feb 2024, Jani Nikula wrote:
> On Mon, 12 Feb 2024, Stephen Rothwell wrote:
>> Hi all,
>>
>> After merging the drm-misc tree, today's linux-next build (x86_64
>> allmodconfig) failed like this:
>>
>> drivers/gpu/drm/tests/drm_mm_test.c: In function 'drm_test_mm_debug':
>> drivers/gpu/drm/tests/drm_mm_test.c:191:32: error: implicit declaration of
>> function 'drm_debug_printer'; did you mean 'drm_dbg_printer'?
>> [-Werror=implicit-function-declaration]
>> 191 | struct drm_printer p = drm_debug_printer(test->name);
>> |^
>> |drm_dbg_printer
>> drivers/gpu/drm/tests/drm_mm_test.c:191:32: error: invalid initializer
>> cc1: all warnings being treated as errors
>>
>> Caused by commit
>>
>> e154c4fc7bf2 ("drm: remove drm_debug_printer in favor of drm_dbg_printer")
>>
>> I have used the drm-misc tree from next-20240209 for today.
>
> Fix at [1].
Commit 826eafebf68b ("drm/tests: mm: Convert to drm_dbg_printer") in
drm-misc-next.
>
> BR,
> Jani.
>
>
> [1]
> https://lore.kernel.org/r/20240209140818.106685-1-michal.winiar...@intel.com
--
Jani Nikula, Intel
Re: linux-next: build failure after merge of the drm-misc tree
On Mon, 12 Feb 2024, Stephen Rothwell wrote:
> Hi all,
>
> After merging the drm-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/gpu/drm/tests/drm_mm_test.c: In function 'drm_test_mm_debug':
> drivers/gpu/drm/tests/drm_mm_test.c:191:32: error: implicit declaration of
> function 'drm_debug_printer'; did you mean 'drm_dbg_printer'?
> [-Werror=implicit-function-declaration]
> 191 | struct drm_printer p = drm_debug_printer(test->name);
> |^
> |drm_dbg_printer
> drivers/gpu/drm/tests/drm_mm_test.c:191:32: error: invalid initializer
> cc1: all warnings being treated as errors
>
> Caused by commit
>
> e154c4fc7bf2 ("drm: remove drm_debug_printer in favor of drm_dbg_printer")
>
> I have used the drm-misc tree from next-20240209 for today.
Fix at [1].
BR,
Jani.
[1] https://lore.kernel.org/r/20240209140818.106685-1-michal.winiar...@intel.com
--
Jani Nikula, Intel
linux-next: build failure after merge of the drm-misc tree
Hi all,
After merging the drm-misc tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/gpu/drm/tests/drm_mm_test.c: In function 'drm_test_mm_debug':
drivers/gpu/drm/tests/drm_mm_test.c:191:32: error: implicit declaration of
function 'drm_debug_printer'; did you mean 'drm_dbg_printer'?
[-Werror=implicit-function-declaration]
191 | struct drm_printer p = drm_debug_printer(test->name);
|^
|drm_dbg_printer
drivers/gpu/drm/tests/drm_mm_test.c:191:32: error: invalid initializer
cc1: all warnings being treated as errors
Caused by commit
e154c4fc7bf2 ("drm: remove drm_debug_printer in favor of drm_dbg_printer")
I have used the drm-misc tree from next-20240209 for today.
--
Cheers,
Stephen Rothwell
pgp_BlgWqj6bz.pgp
Description: OpenPGP digital signature
Re: linux-next: build failure after merge of the drm-misc tree
Hi all,
On Tue, 6 Feb 2024 15:28:50 +1100 Stephen Rothwell
wrote:
>
> After merging the drm-misc tree, today's linux-next build (i386 defconfig)
> failed like this:
>
> In function 'i915_ttm_placement_from_obj',
> inlined from 'i915_ttm_get_pages' at
> drivers/gpu/drm/i915/gem/i915_gem_ttm.c:847:2:
> drivers/gpu/drm/i915/gem/i915_gem_ttm.c:165:18: error: 'places[0].flags' is
> used uninitialized [-Werror=uninitialized]
> 165 | places[0].flags |= TTM_PL_FLAG_DESIRED;
> | ~^~
> drivers/gpu/drm/i915/gem/i915_gem_ttm.c: In function 'i915_ttm_get_pages':
> drivers/gpu/drm/i915/gem/i915_gem_ttm.c:837:26: note: 'places' declared here
> 837 | struct ttm_place places[I915_TTM_MAX_PLACEMENTS + 1];
> | ^~
>
> Caused by commit
>
> a78a8da51b36 ("drm/ttm: replace busy placement with flags v6")
>
> I applied the following hack for today:
>
> From: Stephen Rothwell
> Date: Tue, 6 Feb 2024 15:17:54 +1100
> Subject: [PATCH] drm/ttm: initialise places
>
> Signed-off-by: Stephen Rothwell
> ---
> drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
> b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
> index 80c6cafc8887..34e699e67c25 100644
> --- a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
> +++ b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
> @@ -834,7 +834,7 @@ static int __i915_ttm_get_pages(struct
> drm_i915_gem_object *obj,
>
> static int i915_ttm_get_pages(struct drm_i915_gem_object *obj)
> {
> - struct ttm_place places[I915_TTM_MAX_PLACEMENTS + 1];
> + struct ttm_place places[I915_TTM_MAX_PLACEMENTS + 1] = {};
> struct ttm_placement placement;
>
> /* restricted by sg_alloc_table */
> --
> 2.43.0
I am still applying the above patch :-(
--
Cheers,
Stephen Rothwell
pgplsL9aaHaeV.pgp
Description: OpenPGP digital signature
Re: Re: linux-next: build failure after merge of the drm-misc tree
On Wed, 07 Feb 2024, Thomas Hellström wrote: > Indeed. Not even drm-misc itself compiles with xe enabled. I'll ping > drm-misc maintainers. We'll need CONFIG_DRM_XE=m enabled in drm-rerere/drm-misc-*_defconfig, and get people to use that. BR, Jani. -- Jani Nikula, Intel
Re: Re: linux-next: build failure after merge of the drm-misc tree
On Tue, 2024-02-06 at 14:21 -0600, Lucas De Marchi wrote:
> On Tue, Feb 06, 2024 at 01:39:28PM +0100, Thomas Hellström wrote:
> > Hi
> >
> > On Tue, 2024-02-06 at 12:28 +1100, Stephen Rothwell wrote:
> > > Hi all,
> > >
> > > After merging the drm-misc tree, today's linux-next build (x86_64
> > > allmodconfig) failed like this:
> > >
> > >
> > > Caused by commit
> > >
> > > a78a8da51b36 ("drm/ttm: replace busy placement with flags v6")
> > >
> > > interacting with commit
> > >
> > > dd08ebf6c352 ("drm/xe: Introduce a new DRM driver for Intel
> > > GPUs")
> > >
> > > (and maybe others) from Linus' tree (v6.8-rc1).
> > >
> > > I have applied the following merge fix patch for today. This
> > > makes
> > > it build,
> > > but more is likely needed ...
> >
> > There was a manual fixup for the drm-misc-next merge into drm-tip
> > that
> > did the right thing here.
> >
> > How do we ensure these are included into the linux-next builds?
>
> I think it should have been done in commit 4db102dcb039 ("Merge
> drm/drm-next into drm-misc-next")
> when drm-next merged back into drm-misc-next. Now one option is
> probably a
> commit on drm-misc-next with this content:
> https://cgit.freedesktop.org/drm-tip/tree/fixups/drm-misc-next.patch?h=rerere-cache&id=c39c6e3d74203820ef630884a5323237696bd36c
>
>
> Lucas De Marchi
Indeed. Not even drm-misc itself compiles with xe enabled. I'll ping
drm-misc maintainers.
/Thomas
Re: linux-next: build failure after merge of the drm-misc tree
Hi all, On Tue, 6 Feb 2024 12:28:22 +1100 Stephen Rothwell wrote: > > After merging the drm-misc tree, today's linux-next build (x86_64 > allmodconfig) failed like this: drivers/gpu/drm/xe/xe_bo.c:41:10: error: 'struct ttm_placement' has no member named 'num_busy_placement'; did you mean 'num_placement'? 41 | .num_busy_placement = 1, | ^~ | num_placement drivers/gpu/drm/xe/xe_bo.c:41:31: error: excess elements in struct initializer [-Werror] 41 | .num_busy_placement = 1, | ^ drivers/gpu/drm/xe/xe_bo.c:41:31: note: (near initialization for 'sys_placement') drivers/gpu/drm/xe/xe_bo.c:42:10: error: 'struct ttm_placement' has no member named 'busy_placement'; did you mean 'num_placement'? 42 | .busy_placement = &sys_placement_flags, | ^~ | num_placement drivers/gpu/drm/xe/xe_bo.c:42:27: error: excess elements in struct initializer [-Werror] 42 | .busy_placement = &sys_placement_flags, | ^ drivers/gpu/drm/xe/xe_bo.c:42:27: note: (near initialization for 'sys_placement') drivers/gpu/drm/xe/xe_bo.c:55:10: error: 'struct ttm_placement' has no member named 'num_busy_placement'; did you mean 'num_placement'? 55 | .num_busy_placement = 1, | ^~ | num_placement drivers/gpu/drm/xe/xe_bo.c:55:31: error: excess elements in struct initializer [-Werror] 55 | .num_busy_placement = 1, | ^ drivers/gpu/drm/xe/xe_bo.c:55:31: note: (near initialization for 'tt_placement') drivers/gpu/drm/xe/xe_bo.c:56:10: error: 'struct ttm_placement' has no member named 'busy_placement'; did you mean 'num_placement'? 56 | .busy_placement = &sys_placement_flags, | ^~ | num_placement drivers/gpu/drm/xe/xe_bo.c:56:27: error: excess elements in struct initializer [-Werror] 56 | .busy_placement = &sys_placement_flags, | ^ drivers/gpu/drm/xe/xe_bo.c:56:27: note: (near initialization for 'tt_placement') drivers/gpu/drm/xe/xe_bo.c: In function '__xe_bo_placement_for_flags': drivers/gpu/drm/xe/xe_bo.c:233:18: error: 'struct ttm_placement' has no member named 'num_busy_placement'; did you mean 'num_placement'? 233 | .num_busy_placement = c, | ^~ | num_placement drivers/gpu/drm/xe/xe_bo.c:233:39: error: excess elements in struct initializer [-Werror] 233 | .num_busy_placement = c, | ^ drivers/gpu/drm/xe/xe_bo.c:233:39: note: (near initialization for '(anonymous)') drivers/gpu/drm/xe/xe_bo.c:234:18: error: 'struct ttm_placement' has no member named 'busy_placement'; did you mean 'num_placement'? 234 | .busy_placement = bo->placements, | ^~ | num_placement drivers/gpu/drm/xe/xe_bo.c:234:35: error: excess elements in struct initializer [-Werror] 234 | .busy_placement = bo->placements, | ^~ drivers/gpu/drm/xe/xe_bo.c:234:35: note: (near initialization for '(anonymous)') drivers/gpu/drm/xe/xe_bo.c: In function 'xe_evict_flags': drivers/gpu/drm/xe/xe_bo.c:254:36: error: 'struct ttm_placement' has no member named 'num_busy_placement'; did you mean 'num_placement'? 254 | placement->num_busy_placement = 0; |^~ |num_placement drivers/gpu/drm/xe/xe_bo.c: In function '__xe_bo_fixed_placement': drivers/gpu/drm/xe/xe_bo.c:1356:18: error: 'struct ttm_placement' has no member named 'num_busy_placement'; did you mean 'num_placement'? 1356 | .num_busy_placement = 1, | ^~ | num_placement drivers/gpu/drm/xe/xe_bo.c:1356:39: error: excess elements in struct initializer [-Werror] 1356 | .num_busy_placement = 1, | ^ drivers/gpu/drm/xe/xe_bo.c:1356:39: note: (near initialization for '(anonymous)') drivers/gpu/drm/xe/xe_bo.c:1357:18: error: 'struct ttm_placement' has no member named 'busy_placement'; did you mean 'num_placement'? 1357 | .busy_placement = place, | ^~ | num_placement drivers/gpu/drm/xe/xe_bo.c:1357:35: error: excess elements in struct initializer [-Werror] 1357 | .busy_placement = place, | ^ drivers/gpu/drm/xe/xe_bo.c:1357:35: note: (near initialization for '(anonymous)') drivers/gpu/drm/xe/xe_bo.c: In function 'xe_bo_migrate': drivers/gpu/drm/xe/xe_bo.c:2115:19: error: 'struct ttm_pl
Re: Re: linux-next: build failure after merge of the drm-misc tree
On Tue, Feb 06, 2024 at 01:39:28PM +0100, Thomas Hellström wrote:
Hi
On Tue, 2024-02-06 at 12:28 +1100, Stephen Rothwell wrote:
Hi all,
After merging the drm-misc tree, today's linux-next build (x86_64
allmodconfig) failed like this:
Caused by commit
a78a8da51b36 ("drm/ttm: replace busy placement with flags v6")
interacting with commit
dd08ebf6c352 ("drm/xe: Introduce a new DRM driver for Intel GPUs")
(and maybe others) from Linus' tree (v6.8-rc1).
I have applied the following merge fix patch for today. This makes
it build,
but more is likely needed ...
There was a manual fixup for the drm-misc-next merge into drm-tip that
did the right thing here.
How do we ensure these are included into the linux-next builds?
I think it should have been done in commit 4db102dcb039 ("Merge drm/drm-next into
drm-misc-next")
when drm-next merged back into drm-misc-next. Now one option is probably a
commit on drm-misc-next with this content:
https://cgit.freedesktop.org/drm-tip/tree/fixups/drm-misc-next.patch?h=rerere-cache&id=c39c6e3d74203820ef630884a5323237696bd36c
Lucas De Marchi
Re: linux-next: build failure after merge of the drm-misc tree
Hi
On Tue, 2024-02-06 at 12:28 +1100, Stephen Rothwell wrote:
> Hi all,
>
> After merging the drm-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
>
> Caused by commit
>
> a78a8da51b36 ("drm/ttm: replace busy placement with flags v6")
>
> interacting with commit
>
> dd08ebf6c352 ("drm/xe: Introduce a new DRM driver for Intel GPUs")
>
> (and maybe others) from Linus' tree (v6.8-rc1).
>
> I have applied the following merge fix patch for today. This makes
> it build,
> but more is likely needed ...
There was a manual fixup for the drm-misc-next merge into drm-tip that
did the right thing here.
How do we ensure these are included into the linux-next builds?
Thanks,
Thomas
>
> From: Stephen Rothwell
> Date: Tue, 6 Feb 2024 12:21:07 +1100
> Subject: [PATCH] fix up for "drm/ttm: replace busy placement with
> flags v6"
>
> interacting with commit
>
> dd08ebf6c352 ("drm/xe: Introduce a new DRM driver for Intel GPUs")
>
> Signed-off-by: Stephen Rothwell
> ---
> drivers/gpu/drm/xe/xe_bo.c | 11 ---
> 1 file changed, 11 deletions(-)
>
> diff --git a/drivers/gpu/drm/xe/xe_bo.c b/drivers/gpu/drm/xe/xe_bo.c
> index 0b0e262e2166..280dbda8ae5a 100644
> --- a/drivers/gpu/drm/xe/xe_bo.c
> +++ b/drivers/gpu/drm/xe/xe_bo.c
> @@ -38,8 +38,6 @@ static const struct ttm_place sys_placement_flags =
> {
> static struct ttm_placement sys_placement = {
> .num_placement = 1,
> .placement = &sys_placement_flags,
> - .num_busy_placement = 1,
> - .busy_placement = &sys_placement_flags,
> };
>
> static const struct ttm_place tt_placement_flags = {
> @@ -52,8 +50,6 @@ static const struct ttm_place tt_placement_flags =
> {
> static struct ttm_placement tt_placement = {
> .num_placement = 1,
> .placement = &tt_placement_flags,
> - .num_busy_placement = 1,
> - .busy_placement = &sys_placement_flags,
> };
>
> bool mem_type_is_vram(u32 mem_type)
> @@ -230,8 +226,6 @@ static int __xe_bo_placement_for_flags(struct
> xe_device *xe, struct xe_bo *bo,
> bo->placement = (struct ttm_placement) {
> .num_placement = c,
> .placement = bo->placements,
> - .num_busy_placement = c,
> - .busy_placement = bo->placements,
> };
>
> return 0;
> @@ -251,7 +245,6 @@ static void xe_evict_flags(struct
> ttm_buffer_object *tbo,
> /* Don't handle scatter gather BOs */
> if (tbo->type == ttm_bo_type_sg) {
> placement->num_placement = 0;
> - placement->num_busy_placement = 0;
> return;
> }
>
> @@ -1353,8 +1346,6 @@ static int __xe_bo_fixed_placement(struct
> xe_device *xe,
> bo->placement = (struct ttm_placement) {
> .num_placement = 1,
> .placement = place,
> - .num_busy_placement = 1,
> - .busy_placement = place,
> };
>
> return 0;
> @@ -2112,9 +2103,7 @@ int xe_bo_migrate(struct xe_bo *bo, u32
> mem_type)
>
> xe_place_from_ttm_type(mem_type, &requested);
> placement.num_placement = 1;
> - placement.num_busy_placement = 1;
> placement.placement = &requested;
> - placement.busy_placement = &requested;
>
> /*
> * Stolen needs to be handled like below VRAM handling if we
> ever need
> --
> 2.43.0
>
Re: linux-next: build failure after merge of the drm-misc tree
On Tue, 06 Feb 2024, Stephen Rothwell wrote:
> Hi all,
>
> After merging the drm-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
>
> Caused by commit
>
> a78a8da51b36 ("drm/ttm: replace busy placement with flags v6")
>
> interacting with commit
>
> dd08ebf6c352 ("drm/xe: Introduce a new DRM driver for Intel GPUs")
>
> (and maybe others) from Linus' tree (v6.8-rc1).
>
> I have applied the following merge fix patch for today. This makes it build,
> but more is likely needed ...
>
> From: Stephen Rothwell
> Date: Tue, 6 Feb 2024 12:21:07 +1100
> Subject: [PATCH] fix up for "drm/ttm: replace busy placement with flags v6"
>
> interacting with commit
>
> dd08ebf6c352 ("drm/xe: Introduce a new DRM driver for Intel GPUs")
>
> Signed-off-by: Stephen Rothwell
> ---
> drivers/gpu/drm/xe/xe_bo.c | 11 ---
> 1 file changed, 11 deletions(-)
Please see the new MAINTAINERS entry for drm/xe changes:
INTEL DRM XE DRIVER (Lunar Lake and newer)
M: Lucas De Marchi
M: Oded Gabbay
M: Thomas Hellström
L: intel...@lists.freedesktop.org
BR,
Jani.
--
Jani Nikula, Intel
✓ Fi.CI.BAT: success for linux-next: build failure after merge of the drm-misc tree
== Series Details ==
Series: linux-next: build failure after merge of the drm-misc tree
URL : https://patchwork.freedesktop.org/series/129561/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_14229 -> Patchwork_129561v1
Summary
---
**SUCCESS**
No regressions found.
External URL:
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_129561v1/index.html
Participating hosts (36 -> 36)
--
Additional (2): bat-kbl-2 bat-jsl-1
Missing(2): bat-mtlp-8 fi-pnv-d510
Known issues
Here are the changes found in Patchwork_129561v1 that come from known issues:
### CI changes ###
Issues hit
* boot:
- fi-apl-guc: [PASS][1] -> [FAIL][2] ([i915#8293])
[1]:
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_14229/fi-apl-guc/boot.html
[2]:
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_129561v1/fi-apl-guc/boot.html
### IGT changes ###
Issues hit
* igt@debugfs_test@basic-hwmon:
- bat-jsl-1: NOTRUN -> [SKIP][3] ([i915#9318])
[3]:
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_129561v1/bat-jsl-1/igt@debugfs_t...@basic-hwmon.html
* igt@fbdev@info:
- bat-kbl-2: NOTRUN -> [SKIP][4] ([fdo#109271] / [i915#1849])
[4]:
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_129561v1/bat-kbl-2/igt@fb...@info.html
* igt@gem_huc_copy@huc-copy:
- bat-jsl-1: NOTRUN -> [SKIP][5] ([i915#2190])
[5]:
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_129561v1/bat-jsl-1/igt@gem_huc_c...@huc-copy.html
* igt@gem_lmem_swapping@parallel-random-engines:
- bat-kbl-2: NOTRUN -> [SKIP][6] ([fdo#109271]) +35 other tests
skip
[6]:
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_129561v1/bat-kbl-2/igt@gem_lmem_swapp...@parallel-random-engines.html
* igt@gem_lmem_swapping@verify-random:
- bat-jsl-1: NOTRUN -> [SKIP][7] ([i915#4613]) +3 other tests skip
[7]:
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_129561v1/bat-jsl-1/igt@gem_lmem_swapp...@verify-random.html
* igt@kms_cursor_legacy@basic-busy-flip-before-cursor-legacy:
- bat-jsl-1: NOTRUN -> [SKIP][8] ([i915#4103]) +1 other test skip
[8]:
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_129561v1/bat-jsl-1/igt@kms_cursor_leg...@basic-busy-flip-before-cursor-legacy.html
* igt@kms_dsc@dsc-basic:
- bat-jsl-1: NOTRUN -> [SKIP][9] ([i915#3555] / [i915#9886])
[9]:
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_129561v1/bat-jsl-1/igt@kms_...@dsc-basic.html
* igt@kms_force_connector_basic@force-load-detect:
- bat-jsl-1: NOTRUN -> [SKIP][10] ([fdo#109285])
[10]:
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_129561v1/bat-jsl-1/igt@kms_force_connector_ba...@force-load-detect.html
* igt@kms_setmode@basic-clone-single-crtc:
- bat-jsl-1: NOTRUN -> [SKIP][11] ([i915#3555])
[11]:
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_129561v1/bat-jsl-1/igt@kms_setm...@basic-clone-single-crtc.html
Possible fixes
* igt@i915_selftest@live@gt_engines:
- {bat-adls-6}: [TIMEOUT][12] ([i915#10026]) -> [PASS][13]
[12]:
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_14229/bat-adls-6/igt@i915_selftest@live@gt_engines.html
[13]:
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_129561v1/bat-adls-6/igt@i915_selftest@live@gt_engines.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109285]: https://bugs.freedesktop.org/show_bug.cgi?id=109285
[i915#10026]: https://gitlab.freedesktop.org/drm/intel/issues/10026
[i915#10196]: https://gitlab.freedesktop.org/drm/intel/issues/10196
[i915#10212]: https://gitlab.freedesktop.org/drm/intel/issues/10212
[i915#10214]: https://gitlab.freedesktop.org/drm/intel/issues/10214
[i915#10216]: https://gitlab.freedesktop.org/drm/intel/issues/10216
[i915#1849]: https://gitlab.freedesktop.org/drm/intel/issues/1849
[i915#2190]: https://gitlab.freedesktop.org/drm/intel/issues/2190
[i915#3555]: https://gitlab.freedesktop.org/drm/intel/issues/3555
[i915#3708]: https://gitlab.freedesktop.org/drm/intel/issues/3708
[i915#4103]: https://gitlab.freedesktop.org/drm/intel/issues/4103
[i915#4613]: https://gitlab.freedesktop.org/drm/intel/issues/4613
[i915#5591]: https://gitlab.freedesktop.org/drm/intel/issues/5591
[i915#8293]: https://gitlab.freedesktop.org/drm/intel/issues/8293
[i915#9318]: https://gitlab.freedesktop.org/drm/intel/issues/9318
[i915#9886]: https://gitlab.freedesktop.org/drm/intel/issues/9886
Build changes
-
* Linux: CI_DRM_14229 -> Patchwork_129561v1
CI-20190529: 20190529
CI_DRM_14229: 21d1e
✗ Fi.CI.CHECKPATCH: warning for linux-next: build failure after merge of the drm-misc tree
== Series Details ==
Series: linux-next: build failure after merge of the drm-misc tree
URL : https://patchwork.freedesktop.org/series/129561/
State : warning
== Summary ==
Error: dim checkpatch failed
89f56ec93511 linux-next: build failure after merge of the drm-misc tree
-:12: WARNING:COMMIT_LOG_LONG_LINE: Prefer a maximum 75 chars per line
(possible unwrapped commit description?)
#12:
inlined from 'i915_ttm_get_pages' at
drivers/gpu/drm/i915/gem/i915_gem_ttm.c:847:2:
-:23: ERROR:GIT_COMMIT_ID: Please use git commit description style 'commit <12+
chars of sha1> ("")' - ie: 'commit a78a8da51b36 ("drm/ttm: replace
busy placement with flags v6")'
#23:
a78a8da51b36 ("drm/ttm: replace busy placement with flags v6")
total: 1 errors, 1 warnings, 0 checks, 8 lines checked
linux-next: build failure after merge of the drm-misc tree
Hi all,
After merging the drm-misc tree, today's linux-next build (i386 defconfig)
failed like this:
In function 'i915_ttm_placement_from_obj',
inlined from 'i915_ttm_get_pages' at
drivers/gpu/drm/i915/gem/i915_gem_ttm.c:847:2:
drivers/gpu/drm/i915/gem/i915_gem_ttm.c:165:18: error: 'places[0].flags' is
used uninitialized [-Werror=uninitialized]
165 | places[0].flags |= TTM_PL_FLAG_DESIRED;
| ~^~
drivers/gpu/drm/i915/gem/i915_gem_ttm.c: In function 'i915_ttm_get_pages':
drivers/gpu/drm/i915/gem/i915_gem_ttm.c:837:26: note: 'places' declared here
837 | struct ttm_place places[I915_TTM_MAX_PLACEMENTS + 1];
| ^~
Caused by commit
a78a8da51b36 ("drm/ttm: replace busy placement with flags v6")
I applied the following hack for today:
From: Stephen Rothwell
Date: Tue, 6 Feb 2024 15:17:54 +1100
Subject: [PATCH] drm/ttm: initialise places
Signed-off-by: Stephen Rothwell
---
drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
index 80c6cafc8887..34e699e67c25 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
@@ -834,7 +834,7 @@ static int __i915_ttm_get_pages(struct drm_i915_gem_object
*obj,
static int i915_ttm_get_pages(struct drm_i915_gem_object *obj)
{
- struct ttm_place places[I915_TTM_MAX_PLACEMENTS + 1];
+ struct ttm_place places[I915_TTM_MAX_PLACEMENTS + 1] = {};
struct ttm_placement placement;
/* restricted by sg_alloc_table */
--
2.43.0
--
Cheers,
Stephen Rothwell
pgpOJk5_hGRBn.pgp
Description: OpenPGP digital signature
✗ Fi.CI.BUILD: failure for linux-next: build failure after merge of the drm-misc tree
== Series Details == Series: linux-next: build failure after merge of the drm-misc tree URL : https://patchwork.freedesktop.org/series/129558/ State : failure == Summary == Error: patch https://patchwork.freedesktop.org/api/1.0/series/129558/revisions/1/mbox/ not applied Applying: linux-next: build failure after merge of the drm-misc tree Using index info to reconstruct a base tree... M drivers/gpu/drm/xe/xe_bo.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/xe/xe_bo.c CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_bo.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 linux-next: build failure after merge of the drm-misc tree When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". Build failed, no error log produced
linux-next: build failure after merge of the drm-misc tree
Hi all,
After merging the drm-misc tree, today's linux-next build (x86_64
allmodconfig) failed like this:
Caused by commit
a78a8da51b36 ("drm/ttm: replace busy placement with flags v6")
interacting with commit
dd08ebf6c352 ("drm/xe: Introduce a new DRM driver for Intel GPUs")
(and maybe others) from Linus' tree (v6.8-rc1).
I have applied the following merge fix patch for today. This makes it build,
but more is likely needed ...
From: Stephen Rothwell
Date: Tue, 6 Feb 2024 12:21:07 +1100
Subject: [PATCH] fix up for "drm/ttm: replace busy placement with flags v6"
interacting with commit
dd08ebf6c352 ("drm/xe: Introduce a new DRM driver for Intel GPUs")
Signed-off-by: Stephen Rothwell
---
drivers/gpu/drm/xe/xe_bo.c | 11 ---
1 file changed, 11 deletions(-)
diff --git a/drivers/gpu/drm/xe/xe_bo.c b/drivers/gpu/drm/xe/xe_bo.c
index 0b0e262e2166..280dbda8ae5a 100644
--- a/drivers/gpu/drm/xe/xe_bo.c
+++ b/drivers/gpu/drm/xe/xe_bo.c
@@ -38,8 +38,6 @@ static const struct ttm_place sys_placement_flags = {
static struct ttm_placement sys_placement = {
.num_placement = 1,
.placement = &sys_placement_flags,
- .num_busy_placement = 1,
- .busy_placement = &sys_placement_flags,
};
static const struct ttm_place tt_placement_flags = {
@@ -52,8 +50,6 @@ static const struct ttm_place tt_placement_flags = {
static struct ttm_placement tt_placement = {
.num_placement = 1,
.placement = &tt_placement_flags,
- .num_busy_placement = 1,
- .busy_placement = &sys_placement_flags,
};
bool mem_type_is_vram(u32 mem_type)
@@ -230,8 +226,6 @@ static int __xe_bo_placement_for_flags(struct xe_device
*xe, struct xe_bo *bo,
bo->placement = (struct ttm_placement) {
.num_placement = c,
.placement = bo->placements,
- .num_busy_placement = c,
- .busy_placement = bo->placements,
};
return 0;
@@ -251,7 +245,6 @@ static void xe_evict_flags(struct ttm_buffer_object *tbo,
/* Don't handle scatter gather BOs */
if (tbo->type == ttm_bo_type_sg) {
placement->num_placement = 0;
- placement->num_busy_placement = 0;
return;
}
@@ -1353,8 +1346,6 @@ static int __xe_bo_fixed_placement(struct xe_device *xe,
bo->placement = (struct ttm_placement) {
.num_placement = 1,
.placement = place,
- .num_busy_placement = 1,
- .busy_placement = place,
};
return 0;
@@ -2112,9 +2103,7 @@ int xe_bo_migrate(struct xe_bo *bo, u32 mem_type)
xe_place_from_ttm_type(mem_type, &requested);
placement.num_placement = 1;
- placement.num_busy_placement = 1;
placement.placement = &requested;
- placement.busy_placement = &requested;
/*
* Stolen needs to be handled like below VRAM handling if we ever need
--
2.43.0
--
Cheers,
Stephen Rothwell
pgpqmiI3oriJT.pgp
Description: OpenPGP digital signature
Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree
On 2023-11-26 18:38, Stephen Rothwell wrote:
> Hi all,
>
> After merging the drm-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/gpu/drm/nouveau/nouveau_sched.c:21:41: error:
> 'DRM_SCHED_PRIORITY_MIN' undeclared here (not in a function); did you mean
> 'DRM_SCHED_PRIORITY_LOW'?
>21 | NOUVEAU_SCHED_PRIORITY_SINGLE = DRM_SCHED_PRIORITY_MIN,
> | ^~
> | DRM_SCHED_PRIORITY_LOW
>
> Caused by commit
>
> fe375c74806d ("drm/sched: Rename priority MIN to LOW")
>
> I have used the drm-misc tree from next-20231124 for today.
I posted a fix for this yesterday:
https://lore.kernel.org/r/20231125192246.87268-2-ltuiko...@gmail.com
--
Regards,
Luben
OpenPGP_0x4C15479431A334AF.asc
Description: OpenPGP public key
OpenPGP_signature.asc
Description: OpenPGP digital signature
[Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi all,
After merging the drm-misc tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/gpu/drm/nouveau/nouveau_sched.c:21:41: error: 'DRM_SCHED_PRIORITY_MIN'
undeclared here (not in a function); did you mean 'DRM_SCHED_PRIORITY_LOW'?
21 | NOUVEAU_SCHED_PRIORITY_SINGLE = DRM_SCHED_PRIORITY_MIN,
| ^~
| DRM_SCHED_PRIORITY_LOW
Caused by commit
fe375c74806d ("drm/sched: Rename priority MIN to LOW")
I have used the drm-misc tree from next-20231124 for today.
--
Cheers,
Stephen Rothwell
pgptYMmYNM7d1.pgp
Description: OpenPGP digital signature
Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi all,
On Thu, 12 Oct 2023 12:27:49 +1100 Stephen Rothwell
wrote:
>
> On Thu, 12 Oct 2023 12:22:09 +1100 Stephen Rothwell
> wrote:
> >
> > After merging the drm-misc tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
> >
> > drivers/usb/typec/altmodes/displayport.c: In function 'dp_altmode_vdm':
> > drivers/usb/typec/altmodes/displayport.c:309:33: error: too few arguments
> > to function 'drm_connector_oob_hotplug_event'
> > 309 |
> > drm_connector_oob_hotplug_event(dp->connector_fwnode);
> > | ^~~
> > In file included from drivers/usb/typec/altmodes/displayport.c:17:
> > include/drm/drm_connector.h:1984:6: note: declared here
> > 1984 | void drm_connector_oob_hotplug_event(struct fwnode_handle
> > *connector_fwnode,
> > | ^~~
> >
> > Caused by commit
> >
> > fc93835bb0d7 ("drm: Add HPD state to drm_connector_oob_hotplug_event()")
> >
> > interacting with commit
> >
> > 89434b069e46 ("usb: typec: altmodes/displayport: Signal hpd low when
> > exiting mode")
> >
> > from the usb.current tree.
> >
> > I have applied the following merge fix patch.
> >
> > From: Stephen Rothwell
> > Date: Thu, 12 Oct 2023 12:17:31 +1100
> > Subject: [PATCH] fix up for "drm: Add HPD state to
> > drm_connector_oob_hotplug_event()"
> >
> > interacting with commit
> >
> > 89434b069e46 ("usb: typec: altmodes/displayport: Signal hpd low when
> > exiting mode")
> >
> > Signed-off-by: Stephen Rothwell
> > ---
> > drivers/usb/typec/altmodes/displayport.c | 3 ++-
> > 1 file changed, 2 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/usb/typec/altmodes/displayport.c
> > b/drivers/usb/typec/altmodes/displayport.c
> > index ddfb5b6ace4f..eb0bf08fc97a 100644
> > --- a/drivers/usb/typec/altmodes/displayport.c
> > +++ b/drivers/usb/typec/altmodes/displayport.c
> > @@ -306,7 +306,8 @@ static int dp_altmode_vdm(struct typec_altmode *alt,
> > dp->data.status = 0;
> > dp->data.conf = 0;
> > if (dp->hpd) {
> > -
> > drm_connector_oob_hotplug_event(dp->connector_fwnode);
> > +
> > drm_connector_oob_hotplug_event(dp->connector_fwnode
>
> Pretend that there is a comma at the end of the above line :-)
>
> > +
> > connector_status_disconnected);
> > dp->hpd = false;
> > sysfs_notify(&dp->alt->dev.kobj, "displayport",
> > "hpd");
> > }
> > --
> > 2.40.1
This is now a conflict between the drm tree and Linus' tree.
--
Cheers,
Stephen Rothwell
pgpFVfiQsTIH1.pgp
Description: OpenPGP digital signature
[Intel-gfx] ✗ Fi.CI.BUILD: failure for linux-next: build failure after merge of the drm-misc tree (rev2)
== Series Details == Series: linux-next: build failure after merge of the drm-misc tree (rev2) URL : https://patchwork.freedesktop.org/series/125017/ State : failure == Summary == Error: patch https://patchwork.freedesktop.org/api/1.0/series/125017/revisions/2/mbox/ not applied Applying: linux-next: build failure after merge of the drm-misc tree error: sha1 information is lacking or useless (drivers/usb/typec/altmodes/displayport.c). error: could not build fake ancestor hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 linux-next: build failure after merge of the drm-misc tree When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". Build failed, no error log produced
Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree
On Thu, Oct 12, 2023 at 12:27:49PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> On Thu, 12 Oct 2023 12:22:09 +1100 Stephen Rothwell
> wrote:
> >
> > After merging the drm-misc tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
> >
> > drivers/usb/typec/altmodes/displayport.c: In function 'dp_altmode_vdm':
> > drivers/usb/typec/altmodes/displayport.c:309:33: error: too few arguments
> > to function 'drm_connector_oob_hotplug_event'
> > 309 |
> > drm_connector_oob_hotplug_event(dp->connector_fwnode);
> > | ^~~
> > In file included from drivers/usb/typec/altmodes/displayport.c:17:
> > include/drm/drm_connector.h:1984:6: note: declared here
> > 1984 | void drm_connector_oob_hotplug_event(struct fwnode_handle
> > *connector_fwnode,
> > | ^~~
> >
> > Caused by commit
> >
> > fc93835bb0d7 ("drm: Add HPD state to drm_connector_oob_hotplug_event()")
> >
> > interacting with commit
> >
> > 89434b069e46 ("usb: typec: altmodes/displayport: Signal hpd low when
> > exiting mode")
> >
> > from the usb.current tree.
> >
> > I have applied the following merge fix patch.
> >
> > From: Stephen Rothwell
> > Date: Thu, 12 Oct 2023 12:17:31 +1100
> > Subject: [PATCH] fix up for "drm: Add HPD state to
> > drm_connector_oob_hotplug_event()"
> >
> > interacting with commit
> >
> > 89434b069e46 ("usb: typec: altmodes/displayport: Signal hpd low when
> > exiting mode")
> >
> > Signed-off-by: Stephen Rothwell
> > ---
> > drivers/usb/typec/altmodes/displayport.c | 3 ++-
> > 1 file changed, 2 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/usb/typec/altmodes/displayport.c
> > b/drivers/usb/typec/altmodes/displayport.c
> > index ddfb5b6ace4f..eb0bf08fc97a 100644
> > --- a/drivers/usb/typec/altmodes/displayport.c
> > +++ b/drivers/usb/typec/altmodes/displayport.c
> > @@ -306,7 +306,8 @@ static int dp_altmode_vdm(struct typec_altmode *alt,
> > dp->data.status = 0;
> > dp->data.conf = 0;
> > if (dp->hpd) {
> > -
> > drm_connector_oob_hotplug_event(dp->connector_fwnode);
> > +
> > drm_connector_oob_hotplug_event(dp->connector_fwnode
>
> Pretend that there is a comma at the end of the above line :-)
Looks good to me, thanks!
greg k-h
Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi all,
On Thu, 12 Oct 2023 12:22:09 +1100 Stephen Rothwell
wrote:
>
> After merging the drm-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/usb/typec/altmodes/displayport.c: In function 'dp_altmode_vdm':
> drivers/usb/typec/altmodes/displayport.c:309:33: error: too few arguments to
> function 'drm_connector_oob_hotplug_event'
> 309 |
> drm_connector_oob_hotplug_event(dp->connector_fwnode);
> | ^~~
> In file included from drivers/usb/typec/altmodes/displayport.c:17:
> include/drm/drm_connector.h:1984:6: note: declared here
> 1984 | void drm_connector_oob_hotplug_event(struct fwnode_handle
> *connector_fwnode,
> | ^~~
>
> Caused by commit
>
> fc93835bb0d7 ("drm: Add HPD state to drm_connector_oob_hotplug_event()")
>
> interacting with commit
>
> 89434b069e46 ("usb: typec: altmodes/displayport: Signal hpd low when
> exiting mode")
>
> from the usb.current tree.
>
> I have applied the following merge fix patch.
>
> From: Stephen Rothwell
> Date: Thu, 12 Oct 2023 12:17:31 +1100
> Subject: [PATCH] fix up for "drm: Add HPD state to
> drm_connector_oob_hotplug_event()"
>
> interacting with commit
>
> 89434b069e46 ("usb: typec: altmodes/displayport: Signal hpd low when
> exiting mode")
>
> Signed-off-by: Stephen Rothwell
> ---
> drivers/usb/typec/altmodes/displayport.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/usb/typec/altmodes/displayport.c
> b/drivers/usb/typec/altmodes/displayport.c
> index ddfb5b6ace4f..eb0bf08fc97a 100644
> --- a/drivers/usb/typec/altmodes/displayport.c
> +++ b/drivers/usb/typec/altmodes/displayport.c
> @@ -306,7 +306,8 @@ static int dp_altmode_vdm(struct typec_altmode *alt,
> dp->data.status = 0;
> dp->data.conf = 0;
> if (dp->hpd) {
> -
> drm_connector_oob_hotplug_event(dp->connector_fwnode);
> +
> drm_connector_oob_hotplug_event(dp->connector_fwnode
Pretend that there is a comma at the end of the above line :-)
> +
> connector_status_disconnected);
> dp->hpd = false;
> sysfs_notify(&dp->alt->dev.kobj, "displayport",
> "hpd");
> }
> --
> 2.40.1
--
Cheers,
Stephen Rothwell
pgpblSslR0leq.pgp
Description: OpenPGP digital signature
[Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi all,
After merging the drm-misc tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/usb/typec/altmodes/displayport.c: In function 'dp_altmode_vdm':
drivers/usb/typec/altmodes/displayport.c:309:33: error: too few arguments to
function 'drm_connector_oob_hotplug_event'
309 |
drm_connector_oob_hotplug_event(dp->connector_fwnode);
| ^~~
In file included from drivers/usb/typec/altmodes/displayport.c:17:
include/drm/drm_connector.h:1984:6: note: declared here
1984 | void drm_connector_oob_hotplug_event(struct fwnode_handle
*connector_fwnode,
| ^~~
Caused by commit
fc93835bb0d7 ("drm: Add HPD state to drm_connector_oob_hotplug_event()")
interacting with commit
89434b069e46 ("usb: typec: altmodes/displayport: Signal hpd low when exiting
mode")
from the usb.current tree.
I have applied the following merge fix patch.
From: Stephen Rothwell
Date: Thu, 12 Oct 2023 12:17:31 +1100
Subject: [PATCH] fix up for "drm: Add HPD state to
drm_connector_oob_hotplug_event()"
interacting with commit
89434b069e46 ("usb: typec: altmodes/displayport: Signal hpd low when exiting
mode")
Signed-off-by: Stephen Rothwell
---
drivers/usb/typec/altmodes/displayport.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/usb/typec/altmodes/displayport.c
b/drivers/usb/typec/altmodes/displayport.c
index ddfb5b6ace4f..eb0bf08fc97a 100644
--- a/drivers/usb/typec/altmodes/displayport.c
+++ b/drivers/usb/typec/altmodes/displayport.c
@@ -306,7 +306,8 @@ static int dp_altmode_vdm(struct typec_altmode *alt,
dp->data.status = 0;
dp->data.conf = 0;
if (dp->hpd) {
-
drm_connector_oob_hotplug_event(dp->connector_fwnode);
+
drm_connector_oob_hotplug_event(dp->connector_fwnode
+
connector_status_disconnected);
dp->hpd = false;
sysfs_notify(&dp->alt->dev.kobj, "displayport",
"hpd");
}
--
2.40.1
--
Cheers,
Stephen Rothwell
pgpetFx2r98Vf.pgp
Description: OpenPGP digital signature
[Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi all,
After merging the drm-misc tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/gpu/drm/nouveau/nouveau_dmem.c: In function
'nouveau_dmem_migrate_chunk':
drivers/gpu/drm/nouveau/nouveau_dmem.c:681:43: error: 'chunk' undeclared (first
use in this function)
681 | nouveau_fence_emit(fence,
chunk->drm->dmem->migrate.chan);
| ^
Caused by commit
7f2a0b50b2b2 ("drm/nouveau: fence: separate fence alloc and emit")
I have used the drm-misc tree from next-20230804 for today.
--
Cheers,
Stephen Rothwell
pgpEToMq80uLP.pgp
Description: OpenPGP digital signature
Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi Qiang,
On Mon, 3 Apr 2023 16:51:27 +0800 Qiang Yu wrote:
>
> I think you can just revert the following three lima commits when merge:
> * 4a66f3da99dc ("drm/lima: add show_fdinfo for drm usage stats")
> * 87767de835ed ("drm/lima: allocate unique id per drm_file")
> * bccafec957a5 ("drm/lima: add usage counting method to ctx_mgr")
OK, I have done that from today.
--
Cheers,
Stephen Rothwell
pgpSlWdMMikT4.pgp
Description: OpenPGP digital signature
Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree
I think you can just revert the following three lima commits when merge:
* 4a66f3da99dc ("drm/lima: add show_fdinfo for drm usage stats")
* 87767de835ed ("drm/lima: allocate unique id per drm_file")
* bccafec957a5 ("drm/lima: add usage counting method to ctx_mgr")
Regards,
Qiang
On Mon, Apr 3, 2023 at 10:16 AM Stephen Rothwell wrote:
>
> Hi all,
>
> After merging the drm-misc tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
>
> drivers/gpu/drm/lima/lima_ctx.c: In function 'lima_ctx_do_release':
> drivers/gpu/drm/lima/lima_ctx.c:53:45: error: 'struct drm_sched_entity' has
> no member named 'elapsed_ns'
>53 | mgr->elapsed_ns[i] += entity->elapsed_ns;
> | ^~
> drivers/gpu/drm/lima/lima_ctx.c: In function 'lima_ctx_mgr_usage':
> drivers/gpu/drm/lima/lima_ctx.c:125:43: error: 'struct drm_sched_entity' has
> no member named 'elapsed_ns'
> 125 | usage[i] += entity->elapsed_ns;
> | ^~
>
> Caused by commit
>
> bccafec957a5 ("drm/lima: add usage counting method to ctx_mgr")
>
> interacting with commit
>
> baad10973fdb ("Revert "drm/scheduler: track GPU active time per entity"")
>
> from Linus' tree.
>
> I can't see any obvious way to fix this up, so I have used teh drm-misc
> tree from next-20230331 for today.
>
> --
> Cheers,
> Stephen Rothwell
[Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi all,
After merging the drm-misc tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:
drivers/gpu/drm/lima/lima_ctx.c: In function 'lima_ctx_do_release':
drivers/gpu/drm/lima/lima_ctx.c:53:45: error: 'struct drm_sched_entity' has no
member named 'elapsed_ns'
53 | mgr->elapsed_ns[i] += entity->elapsed_ns;
| ^~
drivers/gpu/drm/lima/lima_ctx.c: In function 'lima_ctx_mgr_usage':
drivers/gpu/drm/lima/lima_ctx.c:125:43: error: 'struct drm_sched_entity' has no
member named 'elapsed_ns'
125 | usage[i] += entity->elapsed_ns;
| ^~
Caused by commit
bccafec957a5 ("drm/lima: add usage counting method to ctx_mgr")
interacting with commit
baad10973fdb ("Revert "drm/scheduler: track GPU active time per entity"")
from Linus' tree.
I can't see any obvious way to fix this up, so I have used teh drm-misc
tree from next-20230331 for today.
--
Cheers,
Stephen Rothwell
pgpCN28W1yefr.pgp
Description: OpenPGP digital signature
Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi
Am 23.11.22 um 06:35 schrieb David Airlie:
On Wed, Nov 23, 2022 at 3:21 PM Stephen Rothwell wrote:
Hi all,
On Thu, 17 Nov 2022 18:32:14 +1100 Stephen Rothwell
wrote:
After merging the drm-misc tree, today's linux-next build (powerpc
ppc44x_defconfig) failed like this:
ld: drivers/video/fbdev/core/fbmon.o: in function `fb_modesetting_disabled':
fbmon.c:(.text+0x1e4): multiple definition of `fb_modesetting_disabled';
drivers/video/fbdev/core/fbmem.o:fbmem.c:(.text+0x1bac): first defined here
ld: drivers/video/fbdev/core/fbcmap.o: in function `fb_modesetting_disabled':
fbcmap.c:(.text+0x478): multiple definition of `fb_modesetting_disabled';
drivers/video/fbdev/core/fbmem.o:fbmem.c:(.text+0x1bac): first defined here
ld: drivers/video/fbdev/core/fbsysfs.o: in function `fb_modesetting_disabled':
fbsysfs.c:(.text+0xb64): multiple definition of `fb_modesetting_disabled';
drivers/video/fbdev/core/fbmem.o:fbmem.c:(.text+0x1bac): first defined here
ld: drivers/video/fbdev/core/modedb.o: in function `fb_modesetting_disabled':
modedb.c:(.text+0x129c): multiple definition of `fb_modesetting_disabled';
drivers/video/fbdev/core/fbmem.o:fbmem.c:(.text+0x1bac): first defined here
ld: drivers/video/fbdev/core/fbcvt.o: in function `fb_modesetting_disabled':
fbcvt.c:(.text+0x0): multiple definition of `fb_modesetting_disabled';
drivers/video/fbdev/core/fbmem.o:fbmem.c:(.text+0x1bac): first defined here
Caused by commit
0ba2fa8cbd29 ("fbdev: Add support for the nomodeset kernel parameter")
This build does not have CONFIG_VIDEO_NOMODESET set.
I applied the following patch for today.
From 63f957a050c62478ed1348c5b204bc65c68df4d7 Mon Sep 17 00:00:00 2001
From: Stephen Rothwell
Date: Thu, 17 Nov 2022 18:19:22 +1100
Subject: [PATCH] fix up for "fbdev: Add support for the nomodeset kernel
parameter"
Signed-off-by: Stephen Rothwell
---
include/linux/fb.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/linux/fb.h b/include/linux/fb.h
index 3a822e4357b1..ea421724f733 100644
--- a/include/linux/fb.h
+++ b/include/linux/fb.h
@@ -807,7 +807,7 @@ extern int fb_find_mode(struct fb_var_screeninfo *var,
#if defined(CONFIG_VIDEO_NOMODESET)
bool fb_modesetting_disabled(const char *drvname);
#else
-bool fb_modesetting_disabled(const char *drvname)
+static inline bool fb_modesetting_disabled(const char *drvname)
{
return false;
}
--
2.35.1
This commit went away for a couple of linux-next releases, but now has
reappeared in the drm tree :-( What went wrong?
Nothing gone wrong as such, just the drm-misc-next pull request was
sent on a regular weekly cadence, then I merged it a few days later.
The fix for this is still in the drm-misc-next queue for the next PR
which I will get this week.
The next PR should be drm-misc-next-fixes. FYI I forwarded the tree and
cherry-picked the patch from drm-misc-next.
Best regards
Thomas
Dave.
--
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5, 90409 Nürnberg, Germany
(HRB 36809, AG Nürnberg)
Geschäftsführer: Ivo Totev
OpenPGP_signature
Description: OpenPGP digital signature
Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi Dave, On Wed, 23 Nov 2022 15:35:50 +1000 David Airlie wrote: > > Nothing gone wrong as such, just the drm-misc-next pull request was > sent on a regular weekly cadence, then I merged it a few days later. > The fix for this is still in the drm-misc-next queue for the next PR > which I will get this week. There is nothing currently in the drm-misc tree in linux-next (relative to the drm tree). And there was never a fix in there for this problem, the commit was just removed when I reported it. If there was a fix for this in the drm-misc tree, I would not have seen the build failure. -- Cheers, Stephen Rothwell pgpak_1Q96ZCI.pgp Description: OpenPGP digital signature
Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree
On Wed, Nov 23, 2022 at 3:21 PM Stephen Rothwell wrote:
>
> Hi all,
>
> On Thu, 17 Nov 2022 18:32:14 +1100 Stephen Rothwell
> wrote:
> >
> > After merging the drm-misc tree, today's linux-next build (powerpc
> > ppc44x_defconfig) failed like this:
> >
> > ld: drivers/video/fbdev/core/fbmon.o: in function `fb_modesetting_disabled':
> > fbmon.c:(.text+0x1e4): multiple definition of `fb_modesetting_disabled';
> > drivers/video/fbdev/core/fbmem.o:fbmem.c:(.text+0x1bac): first defined here
> > ld: drivers/video/fbdev/core/fbcmap.o: in function
> > `fb_modesetting_disabled':
> > fbcmap.c:(.text+0x478): multiple definition of `fb_modesetting_disabled';
> > drivers/video/fbdev/core/fbmem.o:fbmem.c:(.text+0x1bac): first defined here
> > ld: drivers/video/fbdev/core/fbsysfs.o: in function
> > `fb_modesetting_disabled':
> > fbsysfs.c:(.text+0xb64): multiple definition of `fb_modesetting_disabled';
> > drivers/video/fbdev/core/fbmem.o:fbmem.c:(.text+0x1bac): first defined here
> > ld: drivers/video/fbdev/core/modedb.o: in function
> > `fb_modesetting_disabled':
> > modedb.c:(.text+0x129c): multiple definition of `fb_modesetting_disabled';
> > drivers/video/fbdev/core/fbmem.o:fbmem.c:(.text+0x1bac): first defined here
> > ld: drivers/video/fbdev/core/fbcvt.o: in function `fb_modesetting_disabled':
> > fbcvt.c:(.text+0x0): multiple definition of `fb_modesetting_disabled';
> > drivers/video/fbdev/core/fbmem.o:fbmem.c:(.text+0x1bac): first defined here
> >
> > Caused by commit
> >
> > 0ba2fa8cbd29 ("fbdev: Add support for the nomodeset kernel parameter")
> >
> > This build does not have CONFIG_VIDEO_NOMODESET set.
> >
> > I applied the following patch for today.
> >
> > From 63f957a050c62478ed1348c5b204bc65c68df4d7 Mon Sep 17 00:00:00 2001
> > From: Stephen Rothwell
> > Date: Thu, 17 Nov 2022 18:19:22 +1100
> > Subject: [PATCH] fix up for "fbdev: Add support for the nomodeset kernel
> > parameter"
> >
> > Signed-off-by: Stephen Rothwell
> > ---
> > include/linux/fb.h | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/include/linux/fb.h b/include/linux/fb.h
> > index 3a822e4357b1..ea421724f733 100644
> > --- a/include/linux/fb.h
> > +++ b/include/linux/fb.h
> > @@ -807,7 +807,7 @@ extern int fb_find_mode(struct fb_var_screeninfo *var,
> > #if defined(CONFIG_VIDEO_NOMODESET)
> > bool fb_modesetting_disabled(const char *drvname);
> > #else
> > -bool fb_modesetting_disabled(const char *drvname)
> > +static inline bool fb_modesetting_disabled(const char *drvname)
> > {
> > return false;
> > }
> > --
> > 2.35.1
>
> This commit went away for a couple of linux-next releases, but now has
> reappeared in the drm tree :-( What went wrong?
Nothing gone wrong as such, just the drm-misc-next pull request was
sent on a regular weekly cadence, then I merged it a few days later.
The fix for this is still in the drm-misc-next queue for the next PR
which I will get this week.
Dave.
Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi all,
On Thu, 17 Nov 2022 18:32:14 +1100 Stephen Rothwell
wrote:
>
> After merging the drm-misc tree, today's linux-next build (powerpc
> ppc44x_defconfig) failed like this:
>
> ld: drivers/video/fbdev/core/fbmon.o: in function `fb_modesetting_disabled':
> fbmon.c:(.text+0x1e4): multiple definition of `fb_modesetting_disabled';
> drivers/video/fbdev/core/fbmem.o:fbmem.c:(.text+0x1bac): first defined here
> ld: drivers/video/fbdev/core/fbcmap.o: in function `fb_modesetting_disabled':
> fbcmap.c:(.text+0x478): multiple definition of `fb_modesetting_disabled';
> drivers/video/fbdev/core/fbmem.o:fbmem.c:(.text+0x1bac): first defined here
> ld: drivers/video/fbdev/core/fbsysfs.o: in function `fb_modesetting_disabled':
> fbsysfs.c:(.text+0xb64): multiple definition of `fb_modesetting_disabled';
> drivers/video/fbdev/core/fbmem.o:fbmem.c:(.text+0x1bac): first defined here
> ld: drivers/video/fbdev/core/modedb.o: in function `fb_modesetting_disabled':
> modedb.c:(.text+0x129c): multiple definition of `fb_modesetting_disabled';
> drivers/video/fbdev/core/fbmem.o:fbmem.c:(.text+0x1bac): first defined here
> ld: drivers/video/fbdev/core/fbcvt.o: in function `fb_modesetting_disabled':
> fbcvt.c:(.text+0x0): multiple definition of `fb_modesetting_disabled';
> drivers/video/fbdev/core/fbmem.o:fbmem.c:(.text+0x1bac): first defined here
>
> Caused by commit
>
> 0ba2fa8cbd29 ("fbdev: Add support for the nomodeset kernel parameter")
>
> This build does not have CONFIG_VIDEO_NOMODESET set.
>
> I applied the following patch for today.
>
> From 63f957a050c62478ed1348c5b204bc65c68df4d7 Mon Sep 17 00:00:00 2001
> From: Stephen Rothwell
> Date: Thu, 17 Nov 2022 18:19:22 +1100
> Subject: [PATCH] fix up for "fbdev: Add support for the nomodeset kernel
> parameter"
>
> Signed-off-by: Stephen Rothwell
> ---
> include/linux/fb.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/include/linux/fb.h b/include/linux/fb.h
> index 3a822e4357b1..ea421724f733 100644
> --- a/include/linux/fb.h
> +++ b/include/linux/fb.h
> @@ -807,7 +807,7 @@ extern int fb_find_mode(struct fb_var_screeninfo *var,
> #if defined(CONFIG_VIDEO_NOMODESET)
> bool fb_modesetting_disabled(const char *drvname);
> #else
> -bool fb_modesetting_disabled(const char *drvname)
> +static inline bool fb_modesetting_disabled(const char *drvname)
> {
> return false;
> }
> --
> 2.35.1
This commit went away for a couple of linux-next releases, but now has
reappeared in the drm tree :-( What went wrong?
I have reapplied the above patch...
--
Cheers,
Stephen Rothwell
pgpm9Iwk1mS5q.pgp
Description: OpenPGP digital signature
[Intel-gfx] ✗ Fi.CI.BUILD: failure for linux-next: build failure after merge of the drm-misc tree
== Series Details == Series: linux-next: build failure after merge of the drm-misc tree URL : https://patchwork.freedesktop.org/series/111006/ State : failure == Summary == Error: patch https://patchwork.freedesktop.org/api/1.0/series/111006/revisions/1/mbox/ not applied Patch is empty. When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To record the empty patch as an empty commit, run "git am --allow-empty". To restore the original branch and stop patching, run "git am --abort".
[Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi all,
After merging the drm-misc tree, today's linux-next build (powerpc
ppc44x_defconfig) failed like this:
ld: drivers/video/fbdev/core/fbmon.o: in function `fb_modesetting_disabled':
fbmon.c:(.text+0x1e4): multiple definition of `fb_modesetting_disabled';
drivers/video/fbdev/core/fbmem.o:fbmem.c:(.text+0x1bac): first defined here
ld: drivers/video/fbdev/core/fbcmap.o: in function `fb_modesetting_disabled':
fbcmap.c:(.text+0x478): multiple definition of `fb_modesetting_disabled';
drivers/video/fbdev/core/fbmem.o:fbmem.c:(.text+0x1bac): first defined here
ld: drivers/video/fbdev/core/fbsysfs.o: in function `fb_modesetting_disabled':
fbsysfs.c:(.text+0xb64): multiple definition of `fb_modesetting_disabled';
drivers/video/fbdev/core/fbmem.o:fbmem.c:(.text+0x1bac): first defined here
ld: drivers/video/fbdev/core/modedb.o: in function `fb_modesetting_disabled':
modedb.c:(.text+0x129c): multiple definition of `fb_modesetting_disabled';
drivers/video/fbdev/core/fbmem.o:fbmem.c:(.text+0x1bac): first defined here
ld: drivers/video/fbdev/core/fbcvt.o: in function `fb_modesetting_disabled':
fbcvt.c:(.text+0x0): multiple definition of `fb_modesetting_disabled';
drivers/video/fbdev/core/fbmem.o:fbmem.c:(.text+0x1bac): first defined here
Caused by commit
0ba2fa8cbd29 ("fbdev: Add support for the nomodeset kernel parameter")
This build does not have CONFIG_VIDEO_NOMODESET set.
I applied the following patch for today.
From 63f957a050c62478ed1348c5b204bc65c68df4d7 Mon Sep 17 00:00:00 2001
From: Stephen Rothwell
Date: Thu, 17 Nov 2022 18:19:22 +1100
Subject: [PATCH] fix up for "fbdev: Add support for the nomodeset kernel
parameter"
Signed-off-by: Stephen Rothwell
---
include/linux/fb.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/linux/fb.h b/include/linux/fb.h
index 3a822e4357b1..ea421724f733 100644
--- a/include/linux/fb.h
+++ b/include/linux/fb.h
@@ -807,7 +807,7 @@ extern int fb_find_mode(struct fb_var_screeninfo *var,
#if defined(CONFIG_VIDEO_NOMODESET)
bool fb_modesetting_disabled(const char *drvname);
#else
-bool fb_modesetting_disabled(const char *drvname)
+static inline bool fb_modesetting_disabled(const char *drvname)
{
return false;
}
--
2.35.1
--
Cheers,
Stephen Rothwell
pgpXVU0mipOSU.pgp
Description: OpenPGP digital signature
[Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi all,
After merging the drm-misc tree, today's linux-next build (x86_64
allmodconfig) failed like this:
ERROR: modpost: missing MODULE_LICENSE() in
drivers/gpu/drm/tests/drm_kunit_helpers.o
Caused by commit
44a3928324e9 ("drm/tests: Add Kunit Helpers")
I have used the drm-misc tree from next-20221115 for today.
--
Cheers,
Stephen Rothwell
pgpysbHsfqCz6.pgp
Description: OpenPGP digital signature
[Intel-gfx] ✗ Fi.CI.IGT: failure for linux-next: build failure after merge of the drm-misc tree
== Series Details == Series: linux-next: build failure after merge of the drm-misc tree URL : https://patchwork.freedesktop.org/series/110730/ State : failure == Summary == CI Bug Log - changes from CI_DRM_12365_full -> Patchwork_110730v1_full Summary --- **FAILURE** Serious unknown changes coming with Patchwork_110730v1_full absolutely need to be verified manually. If you think the reported changes have nothing to do with the changes introduced in Patchwork_110730v1_full, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI. Participating hosts (11 -> 11) -- No changes in participating hosts Possible new issues --- Here are the unknown changes that may have been introduced in Patchwork_110730v1_full: ### IGT changes ### Possible regressions * igt@kms_atomic_transition@plane-all-modeset-transition-fencing@pipe-b-hdmi-a-1: - shard-glk: [PASS][1] -> [INCOMPLETE][2] [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12365/shard-glk8/igt@kms_atomic_transition@plane-all-modeset-transition-fenc...@pipe-b-hdmi-a-1.html [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110730v1/shard-glk3/igt@kms_atomic_transition@plane-all-modeset-transition-fenc...@pipe-b-hdmi-a-1.html * igt@kms_cursor_legacy@flip-vs-cursor-busy-crc-legacy: - shard-glk: [PASS][3] -> [FAIL][4] [3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12365/shard-glk2/igt@kms_cursor_leg...@flip-vs-cursor-busy-crc-legacy.html [4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110730v1/shard-glk1/igt@kms_cursor_leg...@flip-vs-cursor-busy-crc-legacy.html Warnings * igt@kms_plane_alpha_blend@alpha-basic@pipe-c-dp-1: - shard-apl: [FAIL][5] ([i915#4573]) -> [DMESG-FAIL][6] +1 similar issue [5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12365/shard-apl1/igt@kms_plane_alpha_blend@alpha-ba...@pipe-c-dp-1.html [6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110730v1/shard-apl3/igt@kms_plane_alpha_blend@alpha-ba...@pipe-c-dp-1.html Known issues Here are the changes found in Patchwork_110730v1_full that come from known issues: ### IGT changes ### Issues hit * igt@drm_read@fault-buffer: - shard-snb: [PASS][7] -> [SKIP][8] ([fdo#109271]) +1 similar issue [7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12365/shard-snb5/igt@drm_r...@fault-buffer.html [8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110730v1/shard-snb5/igt@drm_r...@fault-buffer.html * igt@gem_exec_balancer@parallel-out-fence: - shard-iclb: [PASS][9] -> [SKIP][10] ([i915#4525]) [9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12365/shard-iclb2/igt@gem_exec_balan...@parallel-out-fence.html [10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110730v1/shard-iclb5/igt@gem_exec_balan...@parallel-out-fence.html * igt@gem_exec_fair@basic-none@vcs0: - shard-glk: [PASS][11] -> [FAIL][12] ([i915#2842]) [11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12365/shard-glk8/igt@gem_exec_fair@basic-n...@vcs0.html [12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110730v1/shard-glk3/igt@gem_exec_fair@basic-n...@vcs0.html * igt@gem_exec_fair@basic-none@vcs1: - shard-iclb: NOTRUN -> [FAIL][13] ([i915#2842]) [13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110730v1/shard-iclb1/igt@gem_exec_fair@basic-n...@vcs1.html * igt@gem_softpin@evict-single-offset: - shard-tglb: [PASS][14] -> [FAIL][15] ([i915#4171]) [14]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12365/shard-tglb2/igt@gem_soft...@evict-single-offset.html [15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110730v1/shard-tglb8/igt@gem_soft...@evict-single-offset.html * igt@i915_pm_dc@dc6-psr: - shard-iclb: [PASS][16] -> [FAIL][17] ([i915#3989] / [i915#454]) [16]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12365/shard-iclb1/igt@i915_pm...@dc6-psr.html [17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110730v1/shard-iclb2/igt@i915_pm...@dc6-psr.html * igt@kms_ccs@pipe-c-bad-rotation-90-y_tiled_gen12_rc_ccs_cc: - shard-skl: NOTRUN -> [SKIP][18] ([fdo#109271] / [i915#3886]) +2 similar issues [18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110730v1/shard-skl9/igt@kms_ccs@pipe-c-bad-rotation-90-y_tiled_gen12_rc_ccs_cc.html * igt@kms_chamelium@hdmi-audio-edid: - shard-skl: NOTRUN -> [SKIP][19] ([fdo#109271] / [fdo#111827]) +3 similar issues [19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110730v1/shard-skl9/igt@kms_chamel...@hdmi-audio-edid.html * igt@kms_cursor_crc@cursor-suspend@pipe-a-edp-1: - shard-skl: [PA
[Intel-gfx] ✓ Fi.CI.BAT: success for linux-next: build failure after merge of the drm-misc tree
== Series Details ==
Series: linux-next: build failure after merge of the drm-misc tree
URL : https://patchwork.freedesktop.org/series/110730/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_12365 -> Patchwork_110730v1
Summary
---
**SUCCESS**
No regressions found.
External URL:
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110730v1/index.html
Participating hosts (41 -> 38)
--
Missing(3): fi-ctg-p8600 fi-bdw-samus fi-kbl-8809g
Known issues
Here are the changes found in Patchwork_110730v1 that come from known issues:
### CI changes ###
Issues hit
* boot:
- fi-bxt-dsi: [PASS][1] -> [FAIL][2] ([i915#7362])
[1]:
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12365/fi-bxt-dsi/boot.html
[2]:
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110730v1/fi-bxt-dsi/boot.html
### IGT changes ###
Issues hit
* igt@gem_exec_parallel@engines@contexts:
- fi-bdw-gvtdvm: [PASS][3] -> [INCOMPLETE][4] ([i915#7506])
[3]:
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12365/fi-bdw-gvtdvm/igt@gem_exec_parallel@engi...@contexts.html
[4]:
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110730v1/fi-bdw-gvtdvm/igt@gem_exec_parallel@engi...@contexts.html
* igt@gem_lmem_swapping@basic:
- fi-apl-guc: NOTRUN -> [SKIP][5] ([fdo#109271] / [i915#4613]) +3
similar issues
[5]:
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110730v1/fi-apl-guc/igt@gem_lmem_swapp...@basic.html
* igt@i915_selftest@live@migrate:
- bat-adlp-4: [PASS][6] -> [INCOMPLETE][7] ([i915#7308] /
[i915#7348])
[6]:
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12365/bat-adlp-4/igt@i915_selftest@l...@migrate.html
[7]:
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110730v1/bat-adlp-4/igt@i915_selftest@l...@migrate.html
* igt@kms_chamelium@hdmi-crc-fast:
- fi-apl-guc: NOTRUN -> [SKIP][8] ([fdo#109271] / [fdo#111827]) +8
similar issues
[8]:
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110730v1/fi-apl-guc/igt@kms_chamel...@hdmi-crc-fast.html
* igt@kms_psr@sprite_plane_onoff:
- fi-apl-guc: NOTRUN -> [SKIP][9] ([fdo#109271]) +11 similar issues
[9]:
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110730v1/fi-apl-guc/igt@kms_psr@sprite_plane_onoff.html
* igt@runner@aborted:
- bat-adlp-4: NOTRUN -> [FAIL][10] ([i915#4312])
[10]:
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110730v1/bat-adlp-4/igt@run...@aborted.html
- fi-bdw-gvtdvm: NOTRUN -> [FAIL][11] ([i915#4312])
[11]:
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110730v1/fi-bdw-gvtdvm/igt@run...@aborted.html
Possible fixes
* igt@gem_exec_suspend@basic-s0@smem:
- {bat-rplp-1}: [DMESG-WARN][12] ([i915#2867]) -> [PASS][13]
[12]:
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12365/bat-rplp-1/igt@gem_exec_suspend@basic...@smem.html
[13]:
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110730v1/bat-rplp-1/igt@gem_exec_suspend@basic...@smem.html
* igt@gem_render_tiled_blits@basic:
- fi-apl-guc: [INCOMPLETE][14] ([i915#7056]) -> [PASS][15]
[14]:
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12365/fi-apl-guc/igt@gem_render_tiled_bl...@basic.html
[15]:
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110730v1/fi-apl-guc/igt@gem_render_tiled_bl...@basic.html
* igt@gem_tiled_blits@basic:
- fi-pnv-d510:[SKIP][16] ([fdo#109271]) -> [PASS][17] +2 similar
issues
[16]:
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12365/fi-pnv-d510/igt@gem_tiled_bl...@basic.html
[17]:
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110730v1/fi-pnv-d510/igt@gem_tiled_bl...@basic.html
* igt@i915_selftest@live@gt_heartbeat:
- fi-skl-guc: [DMESG-FAIL][18] ([i915#5334]) -> [PASS][19]
[18]:
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12365/fi-skl-guc/igt@i915_selftest@live@gt_heartbeat.html
[19]:
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110730v1/fi-skl-guc/igt@i915_selftest@live@gt_heartbeat.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827
[i915#2867]: https://gitlab.freedesktop.org/drm/intel/issues/2867
[i915#4258]: https://gitlab.freedesktop.org/drm/intel/issues/4258
[i915#4312]: https://gitlab.freedesktop.org/drm/intel/issues/4312
[i915#4613]: https://gitlab.freedesktop.org/drm/intel/issues/4613
[i915#4983]: https://gitlab.freedesktop.org/drm/intel/issues/4983
[i915#5334]: https://gitlab.freedesktop.org/drm/intel/issues/5334
[i915#6434]: https://gitlab.freedesktop.org/
[Intel-gfx] ✗ Fi.CI.SPARSE: warning for linux-next: build failure after merge of the drm-misc tree
== Series Details == Series: linux-next: build failure after merge of the drm-misc tree URL : https://patchwork.freedesktop.org/series/110730/ State : warning == Summary == Error: dim sparse failed Sparse version: v0.6.2
[Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi all,
After merging the drm-misc tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:
drivers/gpu/drm/nouveau/nouveau_drm.c: In function 'nouveau_drm_probe':
drivers/gpu/drm/nouveau/nouveau_drm.c:797:17: error: implicit declaration of
function 'drm_fbdev_generic_setup' [-Werror=implicit-function-declaration]
797 | drm_fbdev_generic_setup(drm_dev, 8);
| ^~~
Caused by commit
8ab59da26bc0 ("drm/fb-helper: Move generic fbdev emulation into separate
source file")
interacting with commit
4a16dd9d18a0 ("drm/nouveau/kms: switch to drm fbdev helpers")
from the drm tree.
I have applied the following merge fix patch for today.
From: Stephen Rothwell
Date: Thu, 10 Nov 2022 11:05:52 +1100
Subject: [PATCH] drm-misc: fix up for "drm/fb-helper: Move generic fbdev
emulation into separate source file"
Signed-off-by: Stephen Rothwell
---
drivers/gpu/drm/nouveau/nouveau_drm.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c
b/drivers/gpu/drm/nouveau/nouveau_drm.c
index a19f18b251f3..80f154b6adab 100644
--- a/drivers/gpu/drm/nouveau/nouveau_drm.c
+++ b/drivers/gpu/drm/nouveau/nouveau_drm.c
@@ -34,6 +34,7 @@
#include
#include
#include
+#include
#include
#include
#include
--
2.35.1
--
Cheers,
Stephen Rothwell
pgpToRxZptixi.pgp
Description: OpenPGP digital signature
Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree
On Fri, 2022-10-21 at 11:02 +1100, Stephen Rothwell wrote:
> Hi all,
>
> After merging the drm-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/gpu/drm/nouveau/nouveau_display.c: In function
> 'nouveau_display_create':
> drivers/gpu/drm/nouveau/nouveau_display.c:662:29: error: unused variable
> 'device' [-Werror=unused-variable]
> 662 | struct nvkm_device *device = nvxx_device(&drm->client.device);
> | ^~
> cc1: all warnings being treated as errors
>
> Introduced by commit
>
> 7c99616e3fe7 ("drm: Remove drm_mode_config::fb_base")
>
> I have used the drm-misc tree from next-20221020 for today.
>
Hi, Stephen.
I've just sent out a trivial fix for this. I'm not sure how the bots and I
missed
it. Thanks for letting me know!
z
[Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi all,
After merging the drm-misc tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/gpu/drm/nouveau/nouveau_display.c: In function 'nouveau_display_create':
drivers/gpu/drm/nouveau/nouveau_display.c:662:29: error: unused variable
'device' [-Werror=unused-variable]
662 | struct nvkm_device *device = nvxx_device(&drm->client.device);
| ^~
cc1: all warnings being treated as errors
Introduced by commit
7c99616e3fe7 ("drm: Remove drm_mode_config::fb_base")
I have used the drm-misc tree from next-20221020 for today.
--
Cheers,
Stephen Rothwell
pgp2BrAsd5Mir.pgp
Description: OpenPGP digital signature
Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree
On Wed, Jun 22, 2022 at 11:04:51AM +1000, Stephen Rothwell wrote: > Hi all, > > On Tue, 21 Jun 2022 10:48:17 +0300 Ville Syrjälä > wrote: > > > > On Tue, Jun 21, 2022 at 12:36:56PM +1000, Stephen Rothwell wrote: > > > > > > After merging the drm-misc tree, today's linux-next build (x86_64 > > > allmodconfig) failed like this: > > > > > > drivers/gpu/drm/xlnx/zynqmp_disp.c: In function > > > 'zynqmp_disp_create_planes': > > > drivers/gpu/drm/xlnx/zynqmp_disp.c:1260:17: error: implicit declaration > > > of function 'drm_plane_create_zpos_immutable_property'; did you mean > > > 'drm_plane_create_scaling_filter_property'? > > > [-Werror=implicit-function-declaration] > > > 1260 | > > > drm_plane_create_zpos_immutable_property(&layer->plane, i); > > > | ^~~~ > > > | drm_plane_create_scaling_filter_property > > > drivers/gpu/drm/xlnx/zynqmp_disp.c:1262:25: error: implicit declaration > > > of function 'drm_plane_create_alpha_property'; did you mean > > > 'drm_plane_create_color_properties'? > > > [-Werror=implicit-function-declaration] > > > 1262 | > > > drm_plane_create_alpha_property(&layer->plane); > > > | ^~~ > > > | drm_plane_create_color_properties > > > cc1: all warnings being treated as errors > > > > > > Presumably caused by one of the commits that dropped includes from > > > drm-ctrc.h. > > > > > > I have used the drm-misc tree from next-20220620 for today. > > > > Sorry about that. Looks like my .config was missing some > > dependencies of the zynqmp driver so it wasn't getting built. > > I'll cook up a fix. > > And today, I get these: > > In file included from include/linux/list.h:5, > from include/linux/preempt.h:11, > from include/linux/spinlock.h:55, > from include/linux/mmzone.h:8, > from include/linux/gfp.h:6, > from include/linux/mm.h:7, > from include/linux/hyperv.h:17, > from drivers/gpu/drm/hyperv/hyperv_drm_modeset.c:6: > drivers/gpu/drm/hyperv/hyperv_drm_modeset.c: In function > 'hyperv_blit_to_vram_rect': > drivers/gpu/drm/hyperv/hyperv_drm_modeset.c:25:48: error: invalid use of > undefined type 'struct drm_framebuffer' > cc1: all warnings being treated as errors > > Please do some allmodconfig builds. Ugh, I really wish kconfig had a reasonable way to enable exactly the things I want rather than having to build absolutely everything... Anyways, someone else beat me to a fix: https://lists.freedesktop.org/archives/dri-devel/2022-June/360608.html Sorry for the continued woes. -- Ville Syrjälä Intel
Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi all, On Tue, 21 Jun 2022 10:48:17 +0300 Ville Syrjälä wrote: > > On Tue, Jun 21, 2022 at 12:36:56PM +1000, Stephen Rothwell wrote: > > > > After merging the drm-misc tree, today's linux-next build (x86_64 > > allmodconfig) failed like this: > > > > drivers/gpu/drm/xlnx/zynqmp_disp.c: In function 'zynqmp_disp_create_planes': > > drivers/gpu/drm/xlnx/zynqmp_disp.c:1260:17: error: implicit declaration of > > function 'drm_plane_create_zpos_immutable_property'; did you mean > > 'drm_plane_create_scaling_filter_property'? > > [-Werror=implicit-function-declaration] > > 1260 | > > drm_plane_create_zpos_immutable_property(&layer->plane, i); > > | ^~~~ > > | drm_plane_create_scaling_filter_property > > drivers/gpu/drm/xlnx/zynqmp_disp.c:1262:25: error: implicit declaration of > > function 'drm_plane_create_alpha_property'; did you mean > > 'drm_plane_create_color_properties'? [-Werror=implicit-function-declaration] > > 1262 | > > drm_plane_create_alpha_property(&layer->plane); > > | ^~~ > > | drm_plane_create_color_properties > > cc1: all warnings being treated as errors > > > > Presumably caused by one of the commits that dropped includes from > > drm-ctrc.h. > > > > I have used the drm-misc tree from next-20220620 for today. > > Sorry about that. Looks like my .config was missing some > dependencies of the zynqmp driver so it wasn't getting built. > I'll cook up a fix. And today, I get these: In file included from include/linux/list.h:5, from include/linux/preempt.h:11, from include/linux/spinlock.h:55, from include/linux/mmzone.h:8, from include/linux/gfp.h:6, from include/linux/mm.h:7, from include/linux/hyperv.h:17, from drivers/gpu/drm/hyperv/hyperv_drm_modeset.c:6: drivers/gpu/drm/hyperv/hyperv_drm_modeset.c: In function 'hyperv_blit_to_vram_rect': drivers/gpu/drm/hyperv/hyperv_drm_modeset.c:25:48: error: invalid use of undefined type 'struct drm_framebuffer' 25 | struct hyperv_drm_device *hv = to_hv(fb->dev); |^~ include/linux/container_of.h:18:33: note: in definition of macro 'container_of' 18 | void *__mptr = (void *)(ptr); \ | ^~~ drivers/gpu/drm/hyperv/hyperv_drm_modeset.c:25:40: note: in expansion of macro 'to_hv' 25 | struct hyperv_drm_device *hv = to_hv(fb->dev); |^ In file included from include/linux/bits.h:22, from include/linux/ratelimit_types.h:5, from include/linux/printk.h:9, from include/asm-generic/bug.h:22, from arch/x86/include/asm/bug.h:87, from include/linux/bug.h:5, from include/linux/mmdebug.h:5, from include/linux/mm.h:6, from include/linux/hyperv.h:17, from drivers/gpu/drm/hyperv/hyperv_drm_modeset.c:6: drivers/gpu/drm/hyperv/hyperv_drm_modeset.c:25:48: error: invalid use of undefined type 'struct drm_framebuffer' 25 | struct hyperv_drm_device *hv = to_hv(fb->dev); |^~ include/linux/build_bug.h:78:56: note: in definition of macro '__static_assert' 78 | #define __static_assert(expr, msg, ...) _Static_assert(expr, msg) |^~~~ include/linux/container_of.h:19:9: note: in expansion of macro 'static_assert' 19 | static_assert(__same_type(*(ptr), ((type *)0)->member) || \ | ^ include/linux/container_of.h:19:23: note: in expansion of macro '__same_type' 19 | static_assert(__same_type(*(ptr), ((type *)0)->member) || \ | ^~~ drivers/gpu/drm/hyperv/hyperv_drm.h:40:21: note: in expansion of macro 'container_of' 40 | #define to_hv(_dev) container_of(_dev, struct hyperv_drm_device, dev) | ^~~~ drivers/gpu/drm/hyperv/hyperv_drm_modeset.c:25:40: note: in expansion of macro 'to_hv' 25 | struct hyperv_drm_device *hv = to_hv(fb->dev); |^ drivers/gpu/drm/hyperv/hyperv_drm_modeset.c:25:48: error: invalid use of undefined type 'struct drm_framebuffer' 25 | struct hyperv_drm_device *hv = to_hv(fb->dev); |^~ include/linux/build_bug.h:78:56: note: in definition of macro '__static_assert' 78 | #define __static_assert(expr, msg, ...) _Static_assert(expr, msg) |
Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree
On Tue, Jun 21, 2022 at 12:36:56PM +1000, Stephen Rothwell wrote: > Hi all, > > After merging the drm-misc tree, today's linux-next build (x86_64 > allmodconfig) failed like this: > > drivers/gpu/drm/xlnx/zynqmp_disp.c: In function 'zynqmp_disp_create_planes': > drivers/gpu/drm/xlnx/zynqmp_disp.c:1260:17: error: implicit declaration of > function 'drm_plane_create_zpos_immutable_property'; did you mean > 'drm_plane_create_scaling_filter_property'? > [-Werror=implicit-function-declaration] > 1260 | > drm_plane_create_zpos_immutable_property(&layer->plane, i); > | ^~~~ > | drm_plane_create_scaling_filter_property > drivers/gpu/drm/xlnx/zynqmp_disp.c:1262:25: error: implicit declaration of > function 'drm_plane_create_alpha_property'; did you mean > 'drm_plane_create_color_properties'? [-Werror=implicit-function-declaration] > 1262 | > drm_plane_create_alpha_property(&layer->plane); > | ^~~ > | drm_plane_create_color_properties > cc1: all warnings being treated as errors > > Presumably caused by one of the commits that dropped includes from > drm-ctrc.h. > > I have used the drm-misc tree from next-20220620 for today. Sorry about that. Looks like my .config was missing some dependencies of the zynqmp driver so it wasn't getting built. I'll cook up a fix. -- Ville Syrjälä Intel
[Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi all, After merging the drm-misc tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/gpu/drm/xlnx/zynqmp_disp.c: In function 'zynqmp_disp_create_planes': drivers/gpu/drm/xlnx/zynqmp_disp.c:1260:17: error: implicit declaration of function 'drm_plane_create_zpos_immutable_property'; did you mean 'drm_plane_create_scaling_filter_property'? [-Werror=implicit-function-declaration] 1260 | drm_plane_create_zpos_immutable_property(&layer->plane, i); | ^~~~ | drm_plane_create_scaling_filter_property drivers/gpu/drm/xlnx/zynqmp_disp.c:1262:25: error: implicit declaration of function 'drm_plane_create_alpha_property'; did you mean 'drm_plane_create_color_properties'? [-Werror=implicit-function-declaration] 1262 | drm_plane_create_alpha_property(&layer->plane); | ^~~ | drm_plane_create_color_properties cc1: all warnings being treated as errors Presumably caused by one of the commits that dropped includes from drm-ctrc.h. I have used the drm-misc tree from next-20220620 for today. -- Cheers, Stephen Rothwell pgpONB8A38WPS.pgp Description: OpenPGP digital signature
Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hello Stephen,
On 6/10/22 06:49, Stephen Rothwell wrote:
> Hi all,
>
> After merging the drm-misc tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
>
> drivers/firmware/efi/sysfb_efi.c:29:10: fatal error: asm/efi.h: No such file
> or directory
>29 | #include
> | ^~~
>
I noticed that this header include is not necessary so I posted [0] to
just drop it, and mentioned the build error too with your Reported-by.
> Caused by commit
>
> fa0e256450f2 ("fbdev: vesafb: Allow to be built if COMPILE_TEST is enabled")
>
I posted a revert [1] for this but for a different reason (since after
[0] I believe the issue in powerpc should be fixed), which is that the
patch led to linking errors on arches that don't define a screen_info.
[0]: https://lkml.org/lkml/2022/6/10/323
[1]: https://lkml.org/lkml/2022/6/10/316
--
Best regards,
Javier Martinez Canillas
Linux Engineering
Red Hat
[Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi all,
After merging the drm-misc tree, today's linux-next build (powerpc
allyesconfig) failed like this:
drivers/firmware/efi/sysfb_efi.c:29:10: fatal error: asm/efi.h: No such file or
directory
29 | #include
| ^~~
Caused by commit
fa0e256450f2 ("fbdev: vesafb: Allow to be built if COMPILE_TEST is enabled")
$ find arch -name efi.h
arch/arm/include/asm/efi.h
arch/arm64/include/asm/efi.h
arch/ia64/include/asm/efi.h
arch/loongarch/include/asm/efi.h
arch/riscv/include/asm/efi.h
arch/x86/boot/compressed/efi.h
arch/x86/include/asm/efi.h
I have reverted that commit for today.
--
Cheers,
Stephen Rothwell
pgp78zogS7qSZ.pgp
Description: OpenPGP digital signature
[Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi all,
After merging the drm-misc tree, today's linux-next build (x86_64
allmodconfig) failed like this:
In file included from include/drm/drm_gem.h:38,
from include/drm/ttm/ttm_bo_api.h:34,
from drivers/gpu/drm/i915/i915_deps.c:9:
drivers/gpu/drm/i915/i915_deps.c: In function 'i915_deps_add_resv':
drivers/gpu/drm/i915/i915_deps.c:229:46: error: implicit conversion from 'enum
' to 'enum dma_resv_usage' [-Werror=enum-conversion]
229 | dma_resv_for_each_fence(&iter, resv, true, fence) {
| ^~~~
include/linux/dma-resv.h:297:47: note: in definition of macro
'dma_resv_for_each_fence'
297 | for (dma_resv_iter_begin(cursor, obj, usage), \
| ^
cc1: all warnings being treated as errors
Caused by commit
7bc80a5462c3 ("dma-buf: add enum dma_resv_usage v4")
I have used the drm-misc tree from next-20220407 for today.
--
Cheers,
Stephen Rothwell
pgpFnCCmHSzOz.pgp
Description: OpenPGP digital signature
[Intel-gfx] ✗ Fi.CI.IGT: failure for linux-next: build failure after merge of the drm-misc tree
== Series Details == Series: linux-next: build failure after merge of the drm-misc tree URL : https://patchwork.freedesktop.org/series/102234/ State : failure == Summary == CI Bug Log - changes from CI_DRM_11459_full -> Patchwork_22795_full Summary --- **FAILURE** Serious unknown changes coming with Patchwork_22795_full absolutely need to be verified manually. If you think the reported changes have nothing to do with the changes introduced in Patchwork_22795_full, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI. Participating hosts (10 -> 10) -- No changes in participating hosts Possible new issues --- Here are the unknown changes that may have been introduced in Patchwork_22795_full: ### IGT changes ### Possible regressions * igt@kms_psr2_su@frontbuffer-xrgb: - shard-iclb: NOTRUN -> [FAIL][1] [1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22795/shard-iclb2/igt@kms_psr2...@frontbuffer-xrgb.html Warnings * igt@i915_pm_dc@dc6-dpms: - shard-skl: [FAIL][2] ([i915#454]) -> [INCOMPLETE][3] [2]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11459/shard-skl10/igt@i915_pm...@dc6-dpms.html [3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22795/shard-skl7/igt@i915_pm...@dc6-dpms.html Known issues Here are the changes found in Patchwork_22795_full that come from known issues: ### CI changes ### Possible fixes * boot: - shard-skl: ([PASS][4], [PASS][5], [PASS][6], [PASS][7], [PASS][8], [PASS][9], [PASS][10], [PASS][11], [PASS][12], [PASS][13], [FAIL][14], [FAIL][15], [FAIL][16], [FAIL][17], [FAIL][18], [PASS][19], [PASS][20], [PASS][21], [PASS][22], [PASS][23], [PASS][24], [PASS][25]) ([i915#5032]) -> ([PASS][26], [PASS][27], [PASS][28], [PASS][29], [PASS][30], [PASS][31], [PASS][32], [PASS][33], [PASS][34], [PASS][35], [PASS][36], [PASS][37], [PASS][38], [PASS][39], [PASS][40], [PASS][41], [PASS][42], [PASS][43], [PASS][44]) [4]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11459/shard-skl10/boot.html [5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11459/shard-skl10/boot.html [6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11459/shard-skl1/boot.html [7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11459/shard-skl1/boot.html [8]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11459/shard-skl2/boot.html [9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11459/shard-skl2/boot.html [10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11459/shard-skl3/boot.html [11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11459/shard-skl4/boot.html [12]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11459/shard-skl4/boot.html [13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11459/shard-skl5/boot.html [14]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11459/shard-skl6/boot.html [15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11459/shard-skl6/boot.html [16]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11459/shard-skl6/boot.html [17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11459/shard-skl6/boot.html [18]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11459/shard-skl6/boot.html [19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11459/shard-skl7/boot.html [20]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11459/shard-skl7/boot.html [21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11459/shard-skl8/boot.html [22]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11459/shard-skl8/boot.html [23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11459/shard-skl8/boot.html [24]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11459/shard-skl9/boot.html [25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11459/shard-skl9/boot.html [26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22795/shard-skl4/boot.html [27]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22795/shard-skl10/boot.html [28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22795/shard-skl10/boot.html [29]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22795/shard-skl1/boot.html [30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22795/shard-skl2/boot.html [31]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22795/shard-skl2/boot.html [32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22795/shard-skl9/boot.html [33]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22795/shard-skl9/boot.html [34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22795/shard-skl8/boot.html [35]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22795/shard-skl8/boot.html [36]: https://intel-gfx-ci.
[Intel-gfx] ✓ Fi.CI.BAT: success for linux-next: build failure after merge of the drm-misc tree
== Series Details == Series: linux-next: build failure after merge of the drm-misc tree URL : https://patchwork.freedesktop.org/series/102234/ State : success == Summary == CI Bug Log - changes from CI_DRM_11459 -> Patchwork_22795 Summary --- **SUCCESS** No regressions found. External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22795/index.html Participating hosts (35 -> 34) -- Additional (2): fi-hsw-4770 fi-pnv-d510 Missing(3): fi-kbl-soraka fi-bsw-cyan fi-bdw-samus Known issues Here are the changes found in Patchwork_22795 that come from known issues: ### IGT changes ### Issues hit * igt@gem_huc_copy@huc-copy: - fi-hsw-4770:NOTRUN -> [SKIP][1] ([fdo#109271]) +9 similar issues [1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22795/fi-hsw-4770/igt@gem_huc_c...@huc-copy.html * igt@i915_pm_backlight@basic-brightness: - fi-hsw-4770:NOTRUN -> [SKIP][2] ([fdo#109271] / [i915#3012]) [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22795/fi-hsw-4770/igt@i915_pm_backli...@basic-brightness.html * igt@i915_selftest@live@hangcheck: - fi-hsw-4770:NOTRUN -> [INCOMPLETE][3] ([i915#4785]) [3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22795/fi-hsw-4770/igt@i915_selftest@l...@hangcheck.html * igt@kms_busy@basic@flip: - fi-tgl-u2: [PASS][4] -> [DMESG-WARN][5] ([i915#402]) [4]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11459/fi-tgl-u2/igt@kms_busy@ba...@flip.html [5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22795/fi-tgl-u2/igt@kms_busy@ba...@flip.html * igt@kms_chamelium@common-hpd-after-suspend: - fi-hsw-4770:NOTRUN -> [SKIP][6] ([fdo#109271] / [fdo#111827]) +8 similar issues [6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22795/fi-hsw-4770/igt@kms_chamel...@common-hpd-after-suspend.html * igt@kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-c: - fi-pnv-d510:NOTRUN -> [SKIP][7] ([fdo#109271] / [i915#5341]) [7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22795/fi-pnv-d510/igt@kms_pipe_crc_ba...@compare-crc-sanitycheck-pipe-c.html * igt@kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-d: - fi-hsw-4770:NOTRUN -> [SKIP][8] ([fdo#109271] / [i915#533]) [8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22795/fi-hsw-4770/igt@kms_pipe_crc_ba...@compare-crc-sanitycheck-pipe-d.html * igt@kms_psr@primary_mmap_gtt: - fi-hsw-4770:NOTRUN -> [SKIP][9] ([fdo#109271] / [i915#1072]) +3 similar issues [9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22795/fi-hsw-4770/igt@kms_psr@primary_mmap_gtt.html * igt@prime_vgem@basic-userptr: - fi-pnv-d510:NOTRUN -> [SKIP][10] ([fdo#109271]) +57 similar issues [10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22795/fi-pnv-d510/igt@prime_v...@basic-userptr.html * igt@runner@aborted: - fi-hsw-4770:NOTRUN -> [FAIL][11] ([fdo#109271] / [i915#2722] / [i915#4312]) [11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22795/fi-hsw-4770/igt@run...@aborted.html Possible fixes * igt@kms_flip@basic-plain-flip@a-edp1: - fi-tgl-u2: [DMESG-WARN][12] ([i915#402]) -> [PASS][13] +2 similar issues [12]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11459/fi-tgl-u2/igt@kms_flip@basic-plain-f...@a-edp1.html [13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22795/fi-tgl-u2/igt@kms_flip@basic-plain-f...@a-edp1.html [fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271 [fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827 [i915#1072]: https://gitlab.freedesktop.org/drm/intel/issues/1072 [i915#2722]: https://gitlab.freedesktop.org/drm/intel/issues/2722 [i915#3012]: https://gitlab.freedesktop.org/drm/intel/issues/3012 [i915#402]: https://gitlab.freedesktop.org/drm/intel/issues/402 [i915#4312]: https://gitlab.freedesktop.org/drm/intel/issues/4312 [i915#4785]: https://gitlab.freedesktop.org/drm/intel/issues/4785 [i915#533]: https://gitlab.freedesktop.org/drm/intel/issues/533 [i915#5341]: https://gitlab.freedesktop.org/drm/intel/issues/5341 Build changes - * Linux: CI_DRM_11459 -> Patchwork_22795 CI-20190529: 20190529 CI_DRM_11459: b9b1e96b1d762651d6a2e60b26ddf058e9789942 @ git://anongit.freedesktop.org/gfx-ci/linux IGT_6411: 987678ecf2d6930981af93f719e4575c91886959 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git Patchwork_22795: e9f5f04870a7d1089d116372c0fefbe16877fc95 @ git://anongit.freedesktop.org/gfx-ci/linux == Linux commits == e9f5f04870a7 linux-next: build failure after merge of the drm-misc tree == Logs == For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22795/index.html
[Intel-gfx] ✗ Fi.CI.DOCS: warning for linux-next: build failure after merge of the drm-misc tree
== Series Details == Series: linux-next: build failure after merge of the drm-misc tree URL : https://patchwork.freedesktop.org/series/102234/ State : warning == Summary == $ make htmldocs 2>&1 > /dev/null | grep i915 ./drivers/gpu/drm/i915/gem/i915_gem_context_types.h:417: warning: Function parameter or member 'client_link' not described in 'i915_gem_context'
[Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for linux-next: build failure after merge of the drm-misc tree
== Series Details ==
Series: linux-next: build failure after merge of the drm-misc tree
URL : https://patchwork.freedesktop.org/series/102234/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip
e9f5f04870a7 linux-next: build failure after merge of the drm-misc tree
-:18: WARNING:COMMIT_LOG_LONG_LINE: Possible unwrapped commit description
(prefer a maximum 75 chars per line)
#18:
49956b505c53 ("drm/panel: Add panel driver for NewVision NV3052C based LCDs")
-:18: ERROR:GIT_COMMIT_ID: Please use git commit description style 'commit <12+
chars of sha1> ("")' - ie: 'commit 49956b505c53 ("drm/panel: Add
panel driver for NewVision NV3052C based LCDs")'
#18:
49956b505c53 ("drm/panel: Add panel driver for NewVision NV3052C based LCDs")
-:22: ERROR:GIT_COMMIT_ID: Please use git commit description style 'commit <12+
chars of sha1> ("")' - ie: 'commit 2cbfa2128662 ("spi: make remove
callback a void function")'
#22:
2cbfa2128662 ("spi: make remove callback a void function")
total: 2 errors, 1 warnings, 0 checks, 16 lines checked
[Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi all,
After merging the drm-misc tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/gpu/drm/panel/panel-newvision-nv3052c.c:478:19: error: initialization
of 'void (*)(struct spi_device *)' from incompatible pointer type 'int
(*)(struct spi_device *)' [-Werror=incompatible-pointer-types]
478 | .remove = nv3052c_remove,
| ^~
drivers/gpu/drm/panel/panel-newvision-nv3052c.c:478:19: note: (near
initialization for 'nv3052c_driver.remove')
Caused by commit
49956b505c53 ("drm/panel: Add panel driver for NewVision NV3052C based LCDs")
interacting with commit
2cbfa2128662 ("spi: make remove callback a void function")
from Linus' tree (merged in v5.18-rc1).
I applied the following merge resolution patch for today.
From: Stephen Rothwell
Date: Wed, 6 Apr 2022 10:46:57 +1000
Subject: [PATCH] fixup for "spi: make remove callback a void function"
Signed-off-by: Stephen Rothwell
---
drivers/gpu/drm/panel/panel-newvision-nv3052c.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/panel/panel-newvision-nv3052c.c
b/drivers/gpu/drm/panel/panel-newvision-nv3052c.c
index 127bcfdb59df..cf078f0d3cd3 100644
--- a/drivers/gpu/drm/panel/panel-newvision-nv3052c.c
+++ b/drivers/gpu/drm/panel/panel-newvision-nv3052c.c
@@ -416,15 +416,13 @@ static int nv3052c_probe(struct spi_device *spi)
return 0;
}
-static int nv3052c_remove(struct spi_device *spi)
+static void nv3052c_remove(struct spi_device *spi)
{
struct nv3052c *priv = spi_get_drvdata(spi);
drm_panel_remove(&priv->panel);
drm_panel_disable(&priv->panel);
drm_panel_unprepare(&priv->panel);
-
- return 0;
}
static const struct drm_display_mode ltk035c5444t_modes[] = {
--
2.35.1
--
Cheers,
Stephen Rothwell
pgppVOVeCHoZt.pgp
Description: OpenPGP digital signature
Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree
On Tue, 09 Nov 2021, Daniel Vetter wrote:
> On Tue, Nov 09, 2021 at 09:40:08AM +0200, Jani Nikula wrote:
>> On Sat, 06 Nov 2021, Stephen Rothwell wrote:
>> > Hi Jani,
>> >
>> > On Fri, 05 Nov 2021 13:03:43 +0200 Jani Nikula
>> > wrote:
>> >>
>> >> I probably should have pushed c4f08d7246a5 ("drm/locking: fix
>> >> __stack_depot_* name conflict") to drm-misc-next-fixes.
>> >
>> > Please do so as builds will start failing otherwise :-(
>>
>> Thomas/Maxime/Maarten, okay to cherry-pick that to drm-misc-next-fixes?
>
> Yeah just do, for drm-misc this is considered in committer purview. I
> think we should add a section to the docs about "What if a patch is in the
> wrong branch" which tells you to just cherry-pick -x or whatever.
Done.
BR,
Jani.
--
Jani Nikula, Intel Open Source Graphics Center
Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree
On Tue, Nov 09, 2021 at 09:40:08AM +0200, Jani Nikula wrote:
> On Sat, 06 Nov 2021, Stephen Rothwell wrote:
> > Hi Jani,
> >
> > On Fri, 05 Nov 2021 13:03:43 +0200 Jani Nikula
> > wrote:
> >>
> >> I probably should have pushed c4f08d7246a5 ("drm/locking: fix
> >> __stack_depot_* name conflict") to drm-misc-next-fixes.
> >
> > Please do so as builds will start failing otherwise :-(
>
> Thomas/Maxime/Maarten, okay to cherry-pick that to drm-misc-next-fixes?
Yeah just do, for drm-misc this is considered in committer purview. I
think we should add a section to the docs about "What if a patch is in the
wrong branch" which tells you to just cherry-pick -x or whatever.
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree
On Sat, 06 Nov 2021, Stephen Rothwell wrote:
> Hi Jani,
>
> On Fri, 05 Nov 2021 13:03:43 +0200 Jani Nikula wrote:
>>
>> I probably should have pushed c4f08d7246a5 ("drm/locking: fix
>> __stack_depot_* name conflict") to drm-misc-next-fixes.
>
> Please do so as builds will start failing otherwise :-(
Thomas/Maxime/Maarten, okay to cherry-pick that to drm-misc-next-fixes?
BR,
Jani.
--
Jani Nikula, Intel Open Source Graphics Center
Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi Jani,
On Fri, 05 Nov 2021 13:03:43 +0200 Jani Nikula wrote:
>
> I probably should have pushed c4f08d7246a5 ("drm/locking: fix
> __stack_depot_* name conflict") to drm-misc-next-fixes.
Please do so as builds will start failing otherwise :-(
--
Cheers,
Stephen Rothwell
pgpa2iVfhrIzA.pgp
Description: OpenPGP digital signature
Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi,
On Fri, Nov 05, 2021 at 01:03:43PM +0200, Jani Nikula wrote:
> On Fri, 05 Nov 2021, Stephen Rothwell wrote:
> > Hi all,
> >
> > On Mon, 1 Nov 2021 19:42:23 +1100 Stephen Rothwell
> > wrote:
> >>
> >> On Fri, 15 Oct 2021 20:26:48 +1100 Stephen Rothwell
> >> wrote:
> >> >
> >> > After merging the drm-misc tree, today's linux-next build (arm
> >> > multi_v7_defconfig) failed like this:
> >> >
> >> > drivers/gpu/drm/drm_modeset_lock.c:111:29: error: conflicting types for
> >> > '__stack_depot_save'
> >> > 111 | static depot_stack_handle_t __stack_depot_save(void)
> >> > | ^~
> >> > In file included from include/linux/page_ext.h:7,
> >> > from include/linux/mm.h:25,
> >> > from include/linux/kallsyms.h:13,
> >> > from include/linux/bpf.h:20,
> >> > from include/linux/bpf-cgroup.h:5,
> >> > from include/linux/cgroup-defs.h:22,
> >> > from include/linux/cgroup.h:28,
> >> > from include/linux/memcontrol.h:13,
> >> > from include/linux/swap.h:9,
> >> > from include/linux/suspend.h:5,
> >> > from include/linux/regulator/consumer.h:35,
> >> > from include/linux/i2c.h:18,
> >> > from include/drm/drm_crtc.h:28,
> >> > from include/drm/drm_atomic.h:31,
> >> > from drivers/gpu/drm/drm_modeset_lock.c:24:
> >> > include/linux/stackdepot.h:18:22: note: previous declaration of
> >> > '__stack_depot_save' was here
> >> >18 | depot_stack_handle_t __stack_depot_save(unsigned long *entries,
> >> > | ^~
> >> >
> >> > Caused by commit
> >> >
> >> > cd06ab2fd48f ("drm/locking: add backtrace for locking contended locks
> >> > without backoff")
> >> >
> >> > This may only have been revealed because of another fix I have had to
> >> > apply today.
> >> >
> >> > I have applied the following patch for today.
> >> >
> >> > From: Stephen Rothwell
> >> > Date: Fri, 15 Oct 2021 20:17:52 +1100
> >> > Subject: [PATCH] drm/locking: fix for name conflict
> >> >
> >> > Fixes: cd06ab2fd48f ("drm/locking: add backtrace for locking contended
> >> > locks without backoff")
> >> > Signed-off-by: Stephen Rothwell
> >> > ---
> >> > drivers/gpu/drm/drm_modeset_lock.c | 6 +++---
> >> > 1 file changed, 3 insertions(+), 3 deletions(-)
> >> >
> >> > diff --git a/drivers/gpu/drm/drm_modeset_lock.c
> >> > b/drivers/gpu/drm/drm_modeset_lock.c
> >> > index 4d32b61fa1fd..ee36dd20900d 100644
> >> > --- a/drivers/gpu/drm/drm_modeset_lock.c
> >> > +++ b/drivers/gpu/drm/drm_modeset_lock.c
> >> > @@ -79,7 +79,7 @@
> >> > static DEFINE_WW_CLASS(crtc_ww_class);
> >> >
> >> > #if IS_ENABLED(CONFIG_DRM_DEBUG_MODESET_LOCK)
> >> > -static noinline depot_stack_handle_t __stack_depot_save(void)
> >> > +static noinline depot_stack_handle_t __drm_stack_depot_save(void)
> >> > {
> >> > unsigned long entries[8];
> >> > unsigned int n;
> >> > @@ -108,7 +108,7 @@ static void __stack_depot_print(depot_stack_handle_t
> >> > stack_depot)
> >> > kfree(buf);
> >> > }
> >> > #else /* CONFIG_DRM_DEBUG_MODESET_LOCK */
> >> > -static depot_stack_handle_t __stack_depot_save(void)
> >> > +static depot_stack_handle_t __drm_stack_depot_save(void)
> >> > {
> >> > return 0;
> >> > }
> >> > @@ -317,7 +317,7 @@ static inline int modeset_lock(struct
> >> > drm_modeset_lock *lock,
> >> > ret = 0;
> >> > } else if (ret == -EDEADLK) {
> >> > ctx->contended = lock;
> >> > -ctx->stack_depot = __stack_depot_save();
> >> > +ctx->stack_depot = __drm_stack_depot_save();
> >> > }
> >> >
> >> > return ret;
> >>
> >> This has reappeared today. I don't know what happened to the drm-misc
> >> tree over the weeked :-(
> >>
> >> I have reapplied the above fix.
> >
> > So the above drm-misc commit is now in the drm tree, but its fix up
> > commit vanished from the drm-misc tree over the past weekend :-(
>
> Cc: drm-misc maintainers.
>
> We normally point drm-misc/for-linux-next at drm-misc-next, *except* to
> drm-misc-next-fixes during the merge window. This is because
> drm-misc-next already starts accumulating stuff that's headed to one
> release later, e.g. currently v5.17. I think that's part of the reason.
Indeed
> I probably should have pushed c4f08d7246a5 ("drm/locking: fix
> __stack_depot_* name conflict") to drm-misc-next-fixes.
>
> There's still something funny going on, because the drm-misc-next pull
> request [1] isn't part of the drm pull request for v5.16 [2]. Is there
> going to be another drm pull?
The last drm-misc-next PR for some reason didn't got logged into
patchwork, and Dave missed it.
We found out yesterday, and he pulled it today so I assume there will be
a second PR with that last
Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree
On Fri, 05 Nov 2021, Stephen Rothwell wrote:
> Hi all,
>
> On Mon, 1 Nov 2021 19:42:23 +1100 Stephen Rothwell
> wrote:
>>
>> On Fri, 15 Oct 2021 20:26:48 +1100 Stephen Rothwell
>> wrote:
>> >
>> > After merging the drm-misc tree, today's linux-next build (arm
>> > multi_v7_defconfig) failed like this:
>> >
>> > drivers/gpu/drm/drm_modeset_lock.c:111:29: error: conflicting types for
>> > '__stack_depot_save'
>> > 111 | static depot_stack_handle_t __stack_depot_save(void)
>> > | ^~
>> > In file included from include/linux/page_ext.h:7,
>> > from include/linux/mm.h:25,
>> > from include/linux/kallsyms.h:13,
>> > from include/linux/bpf.h:20,
>> > from include/linux/bpf-cgroup.h:5,
>> > from include/linux/cgroup-defs.h:22,
>> > from include/linux/cgroup.h:28,
>> > from include/linux/memcontrol.h:13,
>> > from include/linux/swap.h:9,
>> > from include/linux/suspend.h:5,
>> > from include/linux/regulator/consumer.h:35,
>> > from include/linux/i2c.h:18,
>> > from include/drm/drm_crtc.h:28,
>> > from include/drm/drm_atomic.h:31,
>> > from drivers/gpu/drm/drm_modeset_lock.c:24:
>> > include/linux/stackdepot.h:18:22: note: previous declaration of
>> > '__stack_depot_save' was here
>> >18 | depot_stack_handle_t __stack_depot_save(unsigned long *entries,
>> > | ^~
>> >
>> > Caused by commit
>> >
>> > cd06ab2fd48f ("drm/locking: add backtrace for locking contended locks
>> > without backoff")
>> >
>> > This may only have been revealed because of another fix I have had to
>> > apply today.
>> >
>> > I have applied the following patch for today.
>> >
>> > From: Stephen Rothwell
>> > Date: Fri, 15 Oct 2021 20:17:52 +1100
>> > Subject: [PATCH] drm/locking: fix for name conflict
>> >
>> > Fixes: cd06ab2fd48f ("drm/locking: add backtrace for locking contended
>> > locks without backoff")
>> > Signed-off-by: Stephen Rothwell
>> > ---
>> > drivers/gpu/drm/drm_modeset_lock.c | 6 +++---
>> > 1 file changed, 3 insertions(+), 3 deletions(-)
>> >
>> > diff --git a/drivers/gpu/drm/drm_modeset_lock.c
>> > b/drivers/gpu/drm/drm_modeset_lock.c
>> > index 4d32b61fa1fd..ee36dd20900d 100644
>> > --- a/drivers/gpu/drm/drm_modeset_lock.c
>> > +++ b/drivers/gpu/drm/drm_modeset_lock.c
>> > @@ -79,7 +79,7 @@
>> > static DEFINE_WW_CLASS(crtc_ww_class);
>> >
>> > #if IS_ENABLED(CONFIG_DRM_DEBUG_MODESET_LOCK)
>> > -static noinline depot_stack_handle_t __stack_depot_save(void)
>> > +static noinline depot_stack_handle_t __drm_stack_depot_save(void)
>> > {
>> >unsigned long entries[8];
>> >unsigned int n;
>> > @@ -108,7 +108,7 @@ static void __stack_depot_print(depot_stack_handle_t
>> > stack_depot)
>> >kfree(buf);
>> > }
>> > #else /* CONFIG_DRM_DEBUG_MODESET_LOCK */
>> > -static depot_stack_handle_t __stack_depot_save(void)
>> > +static depot_stack_handle_t __drm_stack_depot_save(void)
>> > {
>> >return 0;
>> > }
>> > @@ -317,7 +317,7 @@ static inline int modeset_lock(struct drm_modeset_lock
>> > *lock,
>> >ret = 0;
>> >} else if (ret == -EDEADLK) {
>> >ctx->contended = lock;
>> > - ctx->stack_depot = __stack_depot_save();
>> > + ctx->stack_depot = __drm_stack_depot_save();
>> >}
>> >
>> >return ret;
>>
>> This has reappeared today. I don't know what happened to the drm-misc
>> tree over the weeked :-(
>>
>> I have reapplied the above fix.
>
> So the above drm-misc commit is now in the drm tree, but its fix up
> commit vanished from the drm-misc tree over the past weekend :-(
Cc: drm-misc maintainers.
We normally point drm-misc/for-linux-next at drm-misc-next, *except* to
drm-misc-next-fixes during the merge window. This is because
drm-misc-next already starts accumulating stuff that's headed to one
release later, e.g. currently v5.17. I think that's part of the reason.
I probably should have pushed c4f08d7246a5 ("drm/locking: fix
__stack_depot_* name conflict") to drm-misc-next-fixes.
There's still something funny going on, because the drm-misc-next pull
request [1] isn't part of the drm pull request for v5.16 [2]. Is there
going to be another drm pull?
BR,
Jani.
[1] https://lore.kernel.org/r/20211014120452.2wicnt6hobu3kbwb@gilmour
[2]
https://lore.kernel.org/r/CAPM=9tyOyz4_-OdjDduFkponSXycO6maBDFsWGTLv+j=_vp...@mail.gmail.com
--
Jani Nikula, Intel Open Source Graphics Center
Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi all,
On Mon, 1 Nov 2021 19:42:23 +1100 Stephen Rothwell
wrote:
>
> On Fri, 15 Oct 2021 20:26:48 +1100 Stephen Rothwell
> wrote:
> >
> > After merging the drm-misc tree, today's linux-next build (arm
> > multi_v7_defconfig) failed like this:
> >
> > drivers/gpu/drm/drm_modeset_lock.c:111:29: error: conflicting types for
> > '__stack_depot_save'
> > 111 | static depot_stack_handle_t __stack_depot_save(void)
> > | ^~
> > In file included from include/linux/page_ext.h:7,
> > from include/linux/mm.h:25,
> > from include/linux/kallsyms.h:13,
> > from include/linux/bpf.h:20,
> > from include/linux/bpf-cgroup.h:5,
> > from include/linux/cgroup-defs.h:22,
> > from include/linux/cgroup.h:28,
> > from include/linux/memcontrol.h:13,
> > from include/linux/swap.h:9,
> > from include/linux/suspend.h:5,
> > from include/linux/regulator/consumer.h:35,
> > from include/linux/i2c.h:18,
> > from include/drm/drm_crtc.h:28,
> > from include/drm/drm_atomic.h:31,
> > from drivers/gpu/drm/drm_modeset_lock.c:24:
> > include/linux/stackdepot.h:18:22: note: previous declaration of
> > '__stack_depot_save' was here
> >18 | depot_stack_handle_t __stack_depot_save(unsigned long *entries,
> > | ^~
> >
> > Caused by commit
> >
> > cd06ab2fd48f ("drm/locking: add backtrace for locking contended locks
> > without backoff")
> >
> > This may only have been revealed because of another fix I have had to
> > apply today.
> >
> > I have applied the following patch for today.
> >
> > From: Stephen Rothwell
> > Date: Fri, 15 Oct 2021 20:17:52 +1100
> > Subject: [PATCH] drm/locking: fix for name conflict
> >
> > Fixes: cd06ab2fd48f ("drm/locking: add backtrace for locking contended
> > locks without backoff")
> > Signed-off-by: Stephen Rothwell
> > ---
> > drivers/gpu/drm/drm_modeset_lock.c | 6 +++---
> > 1 file changed, 3 insertions(+), 3 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/drm_modeset_lock.c
> > b/drivers/gpu/drm/drm_modeset_lock.c
> > index 4d32b61fa1fd..ee36dd20900d 100644
> > --- a/drivers/gpu/drm/drm_modeset_lock.c
> > +++ b/drivers/gpu/drm/drm_modeset_lock.c
> > @@ -79,7 +79,7 @@
> > static DEFINE_WW_CLASS(crtc_ww_class);
> >
> > #if IS_ENABLED(CONFIG_DRM_DEBUG_MODESET_LOCK)
> > -static noinline depot_stack_handle_t __stack_depot_save(void)
> > +static noinline depot_stack_handle_t __drm_stack_depot_save(void)
> > {
> > unsigned long entries[8];
> > unsigned int n;
> > @@ -108,7 +108,7 @@ static void __stack_depot_print(depot_stack_handle_t
> > stack_depot)
> > kfree(buf);
> > }
> > #else /* CONFIG_DRM_DEBUG_MODESET_LOCK */
> > -static depot_stack_handle_t __stack_depot_save(void)
> > +static depot_stack_handle_t __drm_stack_depot_save(void)
> > {
> > return 0;
> > }
> > @@ -317,7 +317,7 @@ static inline int modeset_lock(struct drm_modeset_lock
> > *lock,
> > ret = 0;
> > } else if (ret == -EDEADLK) {
> > ctx->contended = lock;
> > - ctx->stack_depot = __stack_depot_save();
> > + ctx->stack_depot = __drm_stack_depot_save();
> > }
> >
> > return ret;
>
> This has reappeared today. I don't know what happened to the drm-misc
> tree over the weeked :-(
>
> I have reapplied the above fix.
So the above drm-misc commit is now in the drm tree, but its fix up
commit vanished from the drm-misc tree over the past weekend :-(
--
Cheers,
Stephen Rothwell
pgpMPG5tnwhBT.pgp
Description: OpenPGP digital signature
Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi all,
On Fri, 15 Oct 2021 20:26:48 +1100 Stephen Rothwell
wrote:
>
> After merging the drm-misc tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
>
> drivers/gpu/drm/drm_modeset_lock.c:111:29: error: conflicting types for
> '__stack_depot_save'
> 111 | static depot_stack_handle_t __stack_depot_save(void)
> | ^~
> In file included from include/linux/page_ext.h:7,
> from include/linux/mm.h:25,
> from include/linux/kallsyms.h:13,
> from include/linux/bpf.h:20,
> from include/linux/bpf-cgroup.h:5,
> from include/linux/cgroup-defs.h:22,
> from include/linux/cgroup.h:28,
> from include/linux/memcontrol.h:13,
> from include/linux/swap.h:9,
> from include/linux/suspend.h:5,
> from include/linux/regulator/consumer.h:35,
> from include/linux/i2c.h:18,
> from include/drm/drm_crtc.h:28,
> from include/drm/drm_atomic.h:31,
> from drivers/gpu/drm/drm_modeset_lock.c:24:
> include/linux/stackdepot.h:18:22: note: previous declaration of
> '__stack_depot_save' was here
>18 | depot_stack_handle_t __stack_depot_save(unsigned long *entries,
> | ^~
>
> Caused by commit
>
> cd06ab2fd48f ("drm/locking: add backtrace for locking contended locks
> without backoff")
>
> This may only have been revealed because of another fix I have had to
> apply today.
>
> I have applied the following patch for today.
>
> From: Stephen Rothwell
> Date: Fri, 15 Oct 2021 20:17:52 +1100
> Subject: [PATCH] drm/locking: fix for name conflict
>
> Fixes: cd06ab2fd48f ("drm/locking: add backtrace for locking contended locks
> without backoff")
> Signed-off-by: Stephen Rothwell
> ---
> drivers/gpu/drm/drm_modeset_lock.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_modeset_lock.c
> b/drivers/gpu/drm/drm_modeset_lock.c
> index 4d32b61fa1fd..ee36dd20900d 100644
> --- a/drivers/gpu/drm/drm_modeset_lock.c
> +++ b/drivers/gpu/drm/drm_modeset_lock.c
> @@ -79,7 +79,7 @@
> static DEFINE_WW_CLASS(crtc_ww_class);
>
> #if IS_ENABLED(CONFIG_DRM_DEBUG_MODESET_LOCK)
> -static noinline depot_stack_handle_t __stack_depot_save(void)
> +static noinline depot_stack_handle_t __drm_stack_depot_save(void)
> {
> unsigned long entries[8];
> unsigned int n;
> @@ -108,7 +108,7 @@ static void __stack_depot_print(depot_stack_handle_t
> stack_depot)
> kfree(buf);
> }
> #else /* CONFIG_DRM_DEBUG_MODESET_LOCK */
> -static depot_stack_handle_t __stack_depot_save(void)
> +static depot_stack_handle_t __drm_stack_depot_save(void)
> {
> return 0;
> }
> @@ -317,7 +317,7 @@ static inline int modeset_lock(struct drm_modeset_lock
> *lock,
> ret = 0;
> } else if (ret == -EDEADLK) {
> ctx->contended = lock;
> - ctx->stack_depot = __stack_depot_save();
> + ctx->stack_depot = __drm_stack_depot_save();
> }
>
> return ret;
> --
> 2.33.0
This has reappeared today. I don't know what happened to the drm-misc
tree over the weeked :-(
I have reapplied the above fix.
--
Cheers,
Stephen Rothwell
pgpEVbJac_cxP.pgp
Description: OpenPGP digital signature
Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi Jani, On Fri, 15 Oct 2021 12:56:58 +0300 Jani Nikula wrote: > > The fix looks good, but I'd rename __stack_depot_print too added in the > same commit. Do you want to respin or shall I take it from here? If you are happy to take it on, then thanks. -- Cheers, Stephen Rothwell pgpMOSQCTIEFb.pgp Description: OpenPGP digital signature
[Intel-gfx] ✗ Fi.CI.IGT: failure for linux-next: build failure after merge of the drm-misc tree
== Series Details == Series: linux-next: build failure after merge of the drm-misc tree URL : https://patchwork.freedesktop.org/series/95874/ State : failure == Summary == CI Bug Log - changes from CI_DRM_10743_full -> Patchwork_21351_full Summary --- **FAILURE** Serious unknown changes coming with Patchwork_21351_full absolutely need to be verified manually. If you think the reported changes have nothing to do with the changes introduced in Patchwork_21351_full, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI. Possible new issues --- Here are the unknown changes that may have been introduced in Patchwork_21351_full: ### IGT changes ### Possible regressions * igt@kms_bw@linear-tiling-3-displays-2560x1440p: - shard-skl: NOTRUN -> [FAIL][1] [1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-skl1/igt@kms...@linear-tiling-3-displays-2560x1440p.html Known issues Here are the changes found in Patchwork_21351_full that come from known issues: ### IGT changes ### Issues hit * igt@device_reset@unbind-reset-rebind: - shard-tglb: [PASS][2] -> [INCOMPLETE][3] ([i915#750]) [2]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10743/shard-tglb7/igt@device_re...@unbind-reset-rebind.html [3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-tglb8/igt@device_re...@unbind-reset-rebind.html * igt@gem_ctx_persistence@idempotent: - shard-snb: NOTRUN -> [SKIP][4] ([fdo#109271] / [i915#1099]) +4 similar issues [4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-snb7/igt@gem_ctx_persiste...@idempotent.html * igt@gem_eio@unwedge-stress: - shard-tglb: [PASS][5] -> [TIMEOUT][6] ([i915#2369] / [i915#3063] / [i915#3648]) [5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10743/shard-tglb6/igt@gem_...@unwedge-stress.html [6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-tglb3/igt@gem_...@unwedge-stress.html - shard-snb: NOTRUN -> [FAIL][7] ([i915#3354]) [7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-snb6/igt@gem_...@unwedge-stress.html * igt@gem_exec_fair@basic-pace@bcs0: - shard-tglb: [PASS][8] -> [FAIL][9] ([i915#2842]) [8]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10743/shard-tglb6/igt@gem_exec_fair@basic-p...@bcs0.html [9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-tglb8/igt@gem_exec_fair@basic-p...@bcs0.html * igt@gem_exec_reloc@basic-active@all: - shard-glk: [PASS][10] -> [DMESG-WARN][11] ([i915#118]) [10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10743/shard-glk4/igt@gem_exec_reloc@basic-act...@all.html [11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-glk8/igt@gem_exec_reloc@basic-act...@all.html * igt@gem_huc_copy@huc-copy: - shard-tglb: [PASS][12] -> [SKIP][13] ([i915#2190]) [12]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10743/shard-tglb1/igt@gem_huc_c...@huc-copy.html [13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-tglb6/igt@gem_huc_c...@huc-copy.html - shard-kbl: NOTRUN -> [SKIP][14] ([fdo#109271] / [i915#2190]) [14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-kbl7/igt@gem_huc_c...@huc-copy.html * igt@gem_pread@exhaustion: - shard-snb: NOTRUN -> [WARN][15] ([i915#2658]) [15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-snb5/igt@gem_pr...@exhaustion.html * igt@gem_pwrite@basic-exhaustion: - shard-glk: NOTRUN -> [WARN][16] ([i915#2658]) [16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-glk5/igt@gem_pwr...@basic-exhaustion.html * igt@gem_pxp@regular-baseline-src-copy-readible: - shard-tglb: NOTRUN -> [SKIP][17] ([i915#4270]) [17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-tglb3/igt@gem_...@regular-baseline-src-copy-readible.html * igt@gem_userptr_blits@invalid-mmap-offset-unsync: - shard-tglb: NOTRUN -> [SKIP][18] ([i915#3297]) [18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-tglb3/igt@gem_userptr_bl...@invalid-mmap-offset-unsync.html * igt@gem_userptr_blits@vma-merge: - shard-skl: NOTRUN -> [FAIL][19] ([i915#3318]) [19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-skl1/igt@gem_userptr_bl...@vma-merge.html * igt@gen3_mixed_blits: - shard-tglb: NOTRUN -> [SKIP][20] ([fdo#109289]) [20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-tglb3/igt@gen3_mixed_blits.html * igt@gen9_exec_parse@shadow-peek: - shard-tglb: NOTRUN -> [SKIP][21] ([i915#2856])
[Intel-gfx] ✓ Fi.CI.BAT: success for linux-next: build failure after merge of the drm-misc tree
== Series Details == Series: linux-next: build failure after merge of the drm-misc tree URL : https://patchwork.freedesktop.org/series/95874/ State : success == Summary == CI Bug Log - changes from CI_DRM_10743 -> Patchwork_21351 Summary --- **SUCCESS** No regressions found. External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/index.html Known issues Here are the changes found in Patchwork_21351 that come from known issues: ### IGT changes ### Issues hit * igt@amdgpu/amd_basic@semaphore: - fi-bdw-5557u: NOTRUN -> [SKIP][1] ([fdo#109271]) +27 similar issues [1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/fi-bdw-5557u/igt@amdgpu/amd_ba...@semaphore.html * igt@i915_selftest@live@hangcheck: - fi-snb-2600:[PASS][2] -> [INCOMPLETE][3] ([i915#3921]) [2]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10743/fi-snb-2600/igt@i915_selftest@l...@hangcheck.html [3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/fi-snb-2600/igt@i915_selftest@l...@hangcheck.html * igt@kms_chamelium@dp-crc-fast: - fi-bdw-5557u: NOTRUN -> [SKIP][4] ([fdo#109271] / [fdo#111827]) +8 similar issues [4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/fi-bdw-5557u/igt@kms_chamel...@dp-crc-fast.html * igt@prime_vgem@basic-userptr: - fi-pnv-d510:NOTRUN -> [SKIP][5] ([fdo#109271]) +48 similar issues [5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/fi-pnv-d510/igt@prime_v...@basic-userptr.html Possible fixes * igt@gem_exec_parallel@engines@userptr: - fi-pnv-d510:[INCOMPLETE][6] ([i915#299]) -> [PASS][7] [6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10743/fi-pnv-d510/igt@gem_exec_parallel@engi...@userptr.html [7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/fi-pnv-d510/igt@gem_exec_parallel@engi...@userptr.html * igt@kms_flip@basic-flip-vs-modeset@c-dp1: - fi-cfl-8109u: [FAIL][8] ([i915#4165]) -> [PASS][9] +1 similar issue [8]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10743/fi-cfl-8109u/igt@kms_flip@basic-flip-vs-mode...@c-dp1.html [9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/fi-cfl-8109u/igt@kms_flip@basic-flip-vs-mode...@c-dp1.html * igt@kms_flip@basic-plain-flip@c-dp2: - fi-cfl-8109u: [DMESG-WARN][10] ([i915#295]) -> [PASS][11] +2 similar issues [10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10743/fi-cfl-8109u/igt@kms_flip@basic-plain-f...@c-dp2.html [11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/fi-cfl-8109u/igt@kms_flip@basic-plain-f...@c-dp2.html * igt@kms_frontbuffer_tracking@basic: - fi-cml-u2: [DMESG-WARN][12] ([i915#4269]) -> [PASS][13] [12]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10743/fi-cml-u2/igt@kms_frontbuffer_track...@basic.html [13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/fi-cml-u2/igt@kms_frontbuffer_track...@basic.html Warnings * igt@kms_flip@basic-plain-flip@c-dp1: - fi-cfl-8109u: [DMESG-WARN][14] ([i915#295]) -> [FAIL][15] ([i915#4165]) [14]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10743/fi-cfl-8109u/igt@kms_flip@basic-plain-f...@c-dp1.html [15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/fi-cfl-8109u/igt@kms_flip@basic-plain-f...@c-dp1.html [fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271 [fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827 [i915#295]: https://gitlab.freedesktop.org/drm/intel/issues/295 [i915#299]: https://gitlab.freedesktop.org/drm/intel/issues/299 [i915#3921]: https://gitlab.freedesktop.org/drm/intel/issues/3921 [i915#4165]: https://gitlab.freedesktop.org/drm/intel/issues/4165 [i915#4269]: https://gitlab.freedesktop.org/drm/intel/issues/4269 Participating hosts (39 -> 35) -- Missing(4): fi-bsw-cyan fi-hsw-4200u bat-dg1-6 fi-elk-e7500 Build changes - * Linux: CI_DRM_10743 -> Patchwork_21351 CI-20190529: 20190529 CI_DRM_10743: 12c88a23f431212268d7d4d16d313f1d8661c7e5 @ git://anongit.freedesktop.org/gfx-ci/linux IGT_6250: 3c2ac88757f0d0ac9450487d314fcaceebc8bc26 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git Patchwork_21351: de0f37d0d3e13692d14c0e1c61bc6637237993bc @ git://anongit.freedesktop.org/gfx-ci/linux == Linux commits == de0f37d0d3e1 linux-next: build failure after merge of the drm-misc tree == Logs == For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/index.html
[Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for linux-next: build failure after merge of the drm-misc tree
== Series Details ==
Series: linux-next: build failure after merge of the drm-misc tree
URL : https://patchwork.freedesktop.org/series/95874/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip
de0f37d0d3e1 linux-next: build failure after merge of the drm-misc tree
-:35: WARNING:COMMIT_LOG_LONG_LINE: Possible unwrapped commit description
(prefer a maximum 75 chars per line)
#35:
cd06ab2fd48f ("drm/locking: add backtrace for locking contended locks without
backoff")
-:35: ERROR:GIT_COMMIT_ID: Please use git commit description style 'commit <12+
chars of sha1> ("")' - ie: 'commit cd06ab2fd48f ("drm/locking: add
backtrace for locking contended locks without backoff")'
#35:
cd06ab2fd48f ("drm/locking: add backtrace for locking contended locks without
backoff")
total: 1 errors, 1 warnings, 0 checks, 24 lines checked
Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree
On Fri, 15 Oct 2021, Stephen Rothwell wrote:
> Hi all,
>
> After merging the drm-misc tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
>
> drivers/gpu/drm/drm_modeset_lock.c:111:29: error: conflicting types for
> '__stack_depot_save'
> 111 | static depot_stack_handle_t __stack_depot_save(void)
> | ^~
> In file included from include/linux/page_ext.h:7,
> from include/linux/mm.h:25,
> from include/linux/kallsyms.h:13,
> from include/linux/bpf.h:20,
> from include/linux/bpf-cgroup.h:5,
> from include/linux/cgroup-defs.h:22,
> from include/linux/cgroup.h:28,
> from include/linux/memcontrol.h:13,
> from include/linux/swap.h:9,
> from include/linux/suspend.h:5,
> from include/linux/regulator/consumer.h:35,
> from include/linux/i2c.h:18,
> from include/drm/drm_crtc.h:28,
> from include/drm/drm_atomic.h:31,
> from drivers/gpu/drm/drm_modeset_lock.c:24:
> include/linux/stackdepot.h:18:22: note: previous declaration of
> '__stack_depot_save' was here
>18 | depot_stack_handle_t __stack_depot_save(unsigned long *entries,
> | ^~
>
> Caused by commit
>
> cd06ab2fd48f ("drm/locking: add backtrace for locking contended locks
> without backoff")
>
> This may only have been revealed because of another fix I have had to
> apply today.
>
> I have applied the following patch for today.
>
> From: Stephen Rothwell
> Date: Fri, 15 Oct 2021 20:17:52 +1100
> Subject: [PATCH] drm/locking: fix for name conflict
>
> Fixes: cd06ab2fd48f ("drm/locking: add backtrace for locking contended locks
> without backoff")
> Signed-off-by: Stephen Rothwell
My bad, what was I thinking using stack depot's "namespace".
The fix looks good, but I'd rename __stack_depot_print too added in the
same commit. Do you want to respin or shall I take it from here?
Thanks,
Jani.
> ---
> drivers/gpu/drm/drm_modeset_lock.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_modeset_lock.c
> b/drivers/gpu/drm/drm_modeset_lock.c
> index 4d32b61fa1fd..ee36dd20900d 100644
> --- a/drivers/gpu/drm/drm_modeset_lock.c
> +++ b/drivers/gpu/drm/drm_modeset_lock.c
> @@ -79,7 +79,7 @@
> static DEFINE_WW_CLASS(crtc_ww_class);
>
> #if IS_ENABLED(CONFIG_DRM_DEBUG_MODESET_LOCK)
> -static noinline depot_stack_handle_t __stack_depot_save(void)
> +static noinline depot_stack_handle_t __drm_stack_depot_save(void)
> {
> unsigned long entries[8];
> unsigned int n;
> @@ -108,7 +108,7 @@ static void __stack_depot_print(depot_stack_handle_t
> stack_depot)
> kfree(buf);
> }
> #else /* CONFIG_DRM_DEBUG_MODESET_LOCK */
> -static depot_stack_handle_t __stack_depot_save(void)
> +static depot_stack_handle_t __drm_stack_depot_save(void)
> {
> return 0;
> }
> @@ -317,7 +317,7 @@ static inline int modeset_lock(struct drm_modeset_lock
> *lock,
> ret = 0;
> } else if (ret == -EDEADLK) {
> ctx->contended = lock;
> - ctx->stack_depot = __stack_depot_save();
> + ctx->stack_depot = __drm_stack_depot_save();
> }
>
> return ret;
> --
> 2.33.0
--
Jani Nikula, Intel Open Source Graphics Center
[Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi all,
After merging the drm-misc tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:
drivers/gpu/drm/drm_modeset_lock.c:111:29: error: conflicting types for
'__stack_depot_save'
111 | static depot_stack_handle_t __stack_depot_save(void)
| ^~
In file included from include/linux/page_ext.h:7,
from include/linux/mm.h:25,
from include/linux/kallsyms.h:13,
from include/linux/bpf.h:20,
from include/linux/bpf-cgroup.h:5,
from include/linux/cgroup-defs.h:22,
from include/linux/cgroup.h:28,
from include/linux/memcontrol.h:13,
from include/linux/swap.h:9,
from include/linux/suspend.h:5,
from include/linux/regulator/consumer.h:35,
from include/linux/i2c.h:18,
from include/drm/drm_crtc.h:28,
from include/drm/drm_atomic.h:31,
from drivers/gpu/drm/drm_modeset_lock.c:24:
include/linux/stackdepot.h:18:22: note: previous declaration of
'__stack_depot_save' was here
18 | depot_stack_handle_t __stack_depot_save(unsigned long *entries,
| ^~
Caused by commit
cd06ab2fd48f ("drm/locking: add backtrace for locking contended locks without
backoff")
This may only have been revealed because of another fix I have had to
apply today.
I have applied the following patch for today.
From: Stephen Rothwell
Date: Fri, 15 Oct 2021 20:17:52 +1100
Subject: [PATCH] drm/locking: fix for name conflict
Fixes: cd06ab2fd48f ("drm/locking: add backtrace for locking contended locks
without backoff")
Signed-off-by: Stephen Rothwell
---
drivers/gpu/drm/drm_modeset_lock.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/drm_modeset_lock.c
b/drivers/gpu/drm/drm_modeset_lock.c
index 4d32b61fa1fd..ee36dd20900d 100644
--- a/drivers/gpu/drm/drm_modeset_lock.c
+++ b/drivers/gpu/drm/drm_modeset_lock.c
@@ -79,7 +79,7 @@
static DEFINE_WW_CLASS(crtc_ww_class);
#if IS_ENABLED(CONFIG_DRM_DEBUG_MODESET_LOCK)
-static noinline depot_stack_handle_t __stack_depot_save(void)
+static noinline depot_stack_handle_t __drm_stack_depot_save(void)
{
unsigned long entries[8];
unsigned int n;
@@ -108,7 +108,7 @@ static void __stack_depot_print(depot_stack_handle_t
stack_depot)
kfree(buf);
}
#else /* CONFIG_DRM_DEBUG_MODESET_LOCK */
-static depot_stack_handle_t __stack_depot_save(void)
+static depot_stack_handle_t __drm_stack_depot_save(void)
{
return 0;
}
@@ -317,7 +317,7 @@ static inline int modeset_lock(struct drm_modeset_lock
*lock,
ret = 0;
} else if (ret == -EDEADLK) {
ctx->contended = lock;
- ctx->stack_depot = __stack_depot_save();
+ ctx->stack_depot = __drm_stack_depot_save();
}
return ret;
--
2.33.0
--
Cheers,
Stephen Rothwell
pgpOxMX6q2a_n.pgp
Description: OpenPGP digital signature
Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi,
I review the code.
It seems I forget to delete the definition of the variable "inst",I'm sry for
that.: (
I'll submit another patch soon.
> Hi all,> > After merging the drm-misc tree, today's linux-next build (x86_64>
> allmodconfig) failed like this:> >
> drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmgp100.c: In function
> 'gp100_vmm_fault_cancel':>
> drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmgp100.c:491:6: error: unused
> variable 'inst' [-Werror=unused-variable]> 491 | u32 inst, aper;> |
> ^~~~> cc1: all warnings being treated as errors> > Caused by commit> >
> 404046cf4805 ("drm/nouveau/mmu/gp100-: drop unneeded assignment in the if
> condition.")>> I have used the drm-misc tree from next-20211011 for today.> >
> -- > Cheers,> Stephen Rothwell
Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree
On Thu, Oct 14, 2021 at 5:02 AM wrote:
>
> Hi,
>
> I review the code.
>
> It seems I forget to delete the definition of the variable "inst",I'm sry for
> that.: (
>
> I'll submit another patch soon.
>
I already wrote the patch and pushed it:
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit?id=381ba6a6baf104b572379c6b2deab884555104d4
>
> > Hi all,
> >
> > After merging the drm-misc tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
> >
> > drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmgp100.c: In function
> > 'gp100_vmm_fault_cancel':
> > drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmgp100.c:491:6: error: unused
> > variable 'inst' [-Werror=unused-variable]
> > 491 | u32 inst, aper;
> > | ^~~~
> > cc1: all warnings being treated as errors
> >
> > Caused by commit
> >
> > 404046cf4805 ("drm/nouveau/mmu/gp100-: drop unneeded assignment in the if
> > condition.")
> >
> > I have used the drm-misc tree from next-20211011 for today.
> >
> > --
> > Cheers,
> > Stephen Rothwell
Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree
uhh, that's on me. I will send out a patch today. I just noticed that
the config file I used for testing had WERROR disabled.
On Tue, Oct 12, 2021 at 4:18 AM Stephen Rothwell wrote:
>
> Hi all,
>
> After merging the drm-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmgp100.c: In function
> 'gp100_vmm_fault_cancel':
> drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmgp100.c:491:6: error: unused
> variable 'inst' [-Werror=unused-variable]
> 491 | u32 inst, aper;
> | ^~~~
> cc1: all warnings being treated as errors
>
> Caused by commit
>
> 404046cf4805 ("drm/nouveau/mmu/gp100-: drop unneeded assignment in the if
> condition.")
>
> I have used the drm-misc tree from next-20211011 for today.
>
> --
> Cheers,
> Stephen Rothwell
[Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi all,
After merging the drm-misc tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmgp100.c: In function
'gp100_vmm_fault_cancel':
drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmgp100.c:491:6: error: unused
variable 'inst' [-Werror=unused-variable]
491 | u32 inst, aper;
| ^~~~
cc1: all warnings being treated as errors
Caused by commit
404046cf4805 ("drm/nouveau/mmu/gp100-: drop unneeded assignment in the if
condition.")
I have used the drm-misc tree from next-20211011 for today.
--
Cheers,
Stephen Rothwell
pgp3qvYxBDGsl.pgp
Description: OpenPGP digital signature
[Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi all,
After merging the drm-misc tree, today's linux-next build (x86_64
modules_install) failed like this:
depmod: ERROR: Cycle detected: drm_kms_helper -> drm -> drm_kms_helper
depmod: ERROR: Cycle detected: cec
depmod: ERROR: Found 2 modules in dependency cycles!
Caused by commit
87ea95808d53 ("drm/bridge: Add a function to abstract away panels")
I have reverted these commits for today:
a43dd76bacd0 ("drm/vc4: dsi: Switch to devm_drm_of_get_bridge")
0caddbbfdfa2 ("drm/vc4: dpi: Switch to devm_drm_of_get_bridge")
87ea95808d53 ("drm/bridge: Add a function to abstract away panels")
--
Cheers,
Stephen Rothwell
pgpENuuMeVPxn.pgp
Description: OpenPGP digital signature
Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree
On Tue, Jun 08, 2021 at 09:11:57AM +0200, Christian König wrote:
> Am 08.06.21 um 09:06 schrieb Felix Kuehling:
> > Am 2021-06-08 um 2:55 a.m. schrieb Christian König:
> > > Hi Felix,
> > >
> > > that should already be fixed in drm-tip as part of the merge of the
> > > TTM changes.
> > No, the preempt_mgr doesn't exist in drm-misc-next. It does exist in
> > drm-next, but that doesn't seem to have the TTM changes yet.
> >
> > Is there another DRM branch or repository that you're referring to with
> > drm-tip?
>
> drm-tip is an integration branch for conflict resolution.
>
> E.g. when we have changes in drm-misc-next which break when we merge with
> drm-next I'm informed and need to provide a conflict resolution patch.
>
> This is automatically applied when drm-next and drm-misc-next are merged
> together again.
>
> It just looks like that drm-next and drm-misc-next are merged manually into
> linux-next and then the conflict resolution doesn't apply and everything
> breaks into pieces.
>
> Adding Daniel as well. How should that be handled? Should we merge
> drm-misc-next into drm-next now?
Yeah I'm expecting there will be a pull request this week. I've given Dave
Airlie a headsup that the conflict is "interesting" and that maybe he
needs to push out a test branch for you and Thomas Hellstrom to
review/test first.
-Daniel
>
> Thanks,
> Christian.
>
> >
> > Regards,
> > Fel
> >
> > > Regards,
> > > Christian.
> > >
> > > Am 08.06.21 um 07:37 schrieb Felix Kuehling:
> > > > Hi Christian,
> > > >
> > > > I based amdgpu_preempt_mgr on amdgpu_gtt_mgr and now I'm looking at what
> > > > changed there. Looks like I'll need to create a dummy node in
> > > > amdgpu_preempt_mgr_new to satisfy TTM, and free it in
> > > > amdgpu_preempt_mgr_del.
> > > >
> > > > Thanks,
> > > > Felix
> > > >
> > > >
> > > > Am 2021-06-07 um 10:50 p.m. schrieb Stephen Rothwell:
> > > > > Hi all,
> > > > >
> > > > > After merging the drm-misc tree, today's linux-next build (x86_64
> > > > > allmodconfig) failed like this:
> > > > >
> > > > > drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c: In function
> > > > > 'amdgpu_preempt_mgr_new':
> > > > > drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c:75:5: error: 'struct
> > > > > ttm_resource' has no member named 'mm_node'
> > > > > 75 | mem->mm_node = NULL;
> > > > > | ^~
> > > > > drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c: At top level:
> > > > > drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c:129:11: error:
> > > > > initialization of 'int (*)(struct ttm_resource_manager *, struct
> > > > > ttm_buffer_object *, const struct ttm_place *, struct ttm_resource
> > > > > **)' from incompatible pointer type 'int (*)(struct
> > > > > ttm_resource_manager *, struct ttm_buffer_object *, const struct
> > > > > ttm_place *, struct ttm_resource *)'
> > > > > [-Werror=incompatible-pointer-types]
> > > > > 129 | .alloc = amdgpu_preempt_mgr_new,
> > > > > | ^~
> > > > > drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c:129:11: note: (near
> > > > > initialization for 'amdgpu_preempt_mgr_func.alloc')
> > > > >
> > > > > Caused by commit
> > > > >
> > > > > cb1c81467af3 ("drm/ttm: flip the switch for driver allocated
> > > > > resources v2")
> > > > >
> > > > > from the drm-misc tree interacting with commit
> > > > >
> > > > > b453e42a6e8b ("drm/amdgpu: Add new placement for preemptible SG
> > > > > BOs")
> > > > >
> > > > > from the drm tree.
> > > > >
> > > > > I don't know how to fix this, so I added the following hack (a better
> > > > > fix would be nice):
> > > > >
> > > > > From: Stephen Rothwell
> > > > > Date: Tue, 8 Jun 2021 12:41:16 +1000
> > > > > Subject: [PATCH] hack fix up for needed amdgpu_preempt_mgr_new() fix
> > > > > up
> > > > >
> > > > > Signed-off-by: Stephen Rothwell
> > > > > ---
> > > > > drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c | 4 +++-
> > > > > 1 file changed, 3 insertions(+), 1 deletion(-)
> > > > >
> > > > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c
> > > > > b/drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c
> > > > > index d607f314cc1b..e1a7b3e967b9 100644
> > > > > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c
> > > > > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c
> > > > > @@ -66,14 +66,16 @@ static DEVICE_ATTR_RO(mem_info_preempt_used);
> > > > > static int amdgpu_preempt_mgr_new(struct ttm_resource_manager *man,
> > > > > struct ttm_buffer_object *tbo,
> > > > > const struct ttm_place *place,
> > > > > - struct ttm_resource *mem)
> > > > > + struct ttm_resource **res)
> > > > > {
> > > > > +#if 0
> > > > > struct amdgpu_preempt_mgr *mgr = to_preempt_mgr(man);
> > > > > atomic64_add(mem->num_pages, &mgr->used);
> > > > > mem->mm_node = NULL;
> > > > > mem->start = AMDGPU_BO_INVALID_OFFSET;
> > > > > +#endi
Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Am 08.06.21 um 09:06 schrieb Felix Kuehling:
Am 2021-06-08 um 2:55 a.m. schrieb Christian König:
Hi Felix,
that should already be fixed in drm-tip as part of the merge of the
TTM changes.
No, the preempt_mgr doesn't exist in drm-misc-next. It does exist in
drm-next, but that doesn't seem to have the TTM changes yet.
Is there another DRM branch or repository that you're referring to with
drm-tip?
drm-tip is an integration branch for conflict resolution.
E.g. when we have changes in drm-misc-next which break when we merge
with drm-next I'm informed and need to provide a conflict resolution patch.
This is automatically applied when drm-next and drm-misc-next are merged
together again.
It just looks like that drm-next and drm-misc-next are merged manually
into linux-next and then the conflict resolution doesn't apply and
everything breaks into pieces.
Adding Daniel as well. How should that be handled? Should we merge
drm-misc-next into drm-next now?
Thanks,
Christian.
Regards,
Fel
Regards,
Christian.
Am 08.06.21 um 07:37 schrieb Felix Kuehling:
Hi Christian,
I based amdgpu_preempt_mgr on amdgpu_gtt_mgr and now I'm looking at what
changed there. Looks like I'll need to create a dummy node in
amdgpu_preempt_mgr_new to satisfy TTM, and free it in
amdgpu_preempt_mgr_del.
Thanks,
Felix
Am 2021-06-07 um 10:50 p.m. schrieb Stephen Rothwell:
Hi all,
After merging the drm-misc tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c: In function
'amdgpu_preempt_mgr_new':
drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c:75:5: error: 'struct
ttm_resource' has no member named 'mm_node'
75 | mem->mm_node = NULL;
| ^~
drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c: At top level:
drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c:129:11: error:
initialization of 'int (*)(struct ttm_resource_manager *, struct
ttm_buffer_object *, const struct ttm_place *, struct ttm_resource
**)' from incompatible pointer type 'int (*)(struct
ttm_resource_manager *, struct ttm_buffer_object *, const struct
ttm_place *, struct ttm_resource *)'
[-Werror=incompatible-pointer-types]
129 | .alloc = amdgpu_preempt_mgr_new,
| ^~
drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c:129:11: note: (near
initialization for 'amdgpu_preempt_mgr_func.alloc')
Caused by commit
cb1c81467af3 ("drm/ttm: flip the switch for driver allocated
resources v2")
from the drm-misc tree interacting with commit
b453e42a6e8b ("drm/amdgpu: Add new placement for preemptible SG
BOs")
from the drm tree.
I don't know how to fix this, so I added the following hack (a better
fix would be nice):
From: Stephen Rothwell
Date: Tue, 8 Jun 2021 12:41:16 +1000
Subject: [PATCH] hack fix up for needed amdgpu_preempt_mgr_new() fix up
Signed-off-by: Stephen Rothwell
---
drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c
b/drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c
index d607f314cc1b..e1a7b3e967b9 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c
@@ -66,14 +66,16 @@ static DEVICE_ATTR_RO(mem_info_preempt_used);
static int amdgpu_preempt_mgr_new(struct ttm_resource_manager *man,
struct ttm_buffer_object *tbo,
const struct ttm_place *place,
- struct ttm_resource *mem)
+ struct ttm_resource **res)
{
+#if 0
struct amdgpu_preempt_mgr *mgr = to_preempt_mgr(man);
atomic64_add(mem->num_pages, &mgr->used);
mem->mm_node = NULL;
mem->start = AMDGPU_BO_INVALID_OFFSET;
+#endif
return 0;
}
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Am 2021-06-08 um 2:55 a.m. schrieb Christian König:
> Hi Felix,
>
> that should already be fixed in drm-tip as part of the merge of the
> TTM changes.
No, the preempt_mgr doesn't exist in drm-misc-next. It does exist in
drm-next, but that doesn't seem to have the TTM changes yet.
Is there another DRM branch or repository that you're referring to with
drm-tip?
Regards,
Felix
>
> Regards,
> Christian.
>
> Am 08.06.21 um 07:37 schrieb Felix Kuehling:
>> Hi Christian,
>>
>> I based amdgpu_preempt_mgr on amdgpu_gtt_mgr and now I'm looking at what
>> changed there. Looks like I'll need to create a dummy node in
>> amdgpu_preempt_mgr_new to satisfy TTM, and free it in
>> amdgpu_preempt_mgr_del.
>>
>> Thanks,
>> Felix
>>
>>
>> Am 2021-06-07 um 10:50 p.m. schrieb Stephen Rothwell:
>>> Hi all,
>>>
>>> After merging the drm-misc tree, today's linux-next build (x86_64
>>> allmodconfig) failed like this:
>>>
>>> drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c: In function
>>> 'amdgpu_preempt_mgr_new':
>>> drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c:75:5: error: 'struct
>>> ttm_resource' has no member named 'mm_node'
>>> 75 | mem->mm_node = NULL;
>>> | ^~
>>> drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c: At top level:
>>> drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c:129:11: error:
>>> initialization of 'int (*)(struct ttm_resource_manager *, struct
>>> ttm_buffer_object *, const struct ttm_place *, struct ttm_resource
>>> **)' from incompatible pointer type 'int (*)(struct
>>> ttm_resource_manager *, struct ttm_buffer_object *, const struct
>>> ttm_place *, struct ttm_resource *)'
>>> [-Werror=incompatible-pointer-types]
>>> 129 | .alloc = amdgpu_preempt_mgr_new,
>>> | ^~
>>> drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c:129:11: note: (near
>>> initialization for 'amdgpu_preempt_mgr_func.alloc')
>>>
>>> Caused by commit
>>>
>>> cb1c81467af3 ("drm/ttm: flip the switch for driver allocated
>>> resources v2")
>>>
>>> from the drm-misc tree interacting with commit
>>>
>>> b453e42a6e8b ("drm/amdgpu: Add new placement for preemptible SG
>>> BOs")
>>>
>>> from the drm tree.
>>>
>>> I don't know how to fix this, so I added the following hack (a better
>>> fix would be nice):
>>>
>>> From: Stephen Rothwell
>>> Date: Tue, 8 Jun 2021 12:41:16 +1000
>>> Subject: [PATCH] hack fix up for needed amdgpu_preempt_mgr_new() fix up
>>>
>>> Signed-off-by: Stephen Rothwell
>>> ---
>>> drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c | 4 +++-
>>> 1 file changed, 3 insertions(+), 1 deletion(-)
>>>
>>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c
>>> b/drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c
>>> index d607f314cc1b..e1a7b3e967b9 100644
>>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c
>>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c
>>> @@ -66,14 +66,16 @@ static DEVICE_ATTR_RO(mem_info_preempt_used);
>>> static int amdgpu_preempt_mgr_new(struct ttm_resource_manager *man,
>>> struct ttm_buffer_object *tbo,
>>> const struct ttm_place *place,
>>> - struct ttm_resource *mem)
>>> + struct ttm_resource **res)
>>> {
>>> +#if 0
>>> struct amdgpu_preempt_mgr *mgr = to_preempt_mgr(man);
>>> atomic64_add(mem->num_pages, &mgr->used);
>>> mem->mm_node = NULL;
>>> mem->start = AMDGPU_BO_INVALID_OFFSET;
>>> +#endif
>>> return 0;
>>> }
>>>
>
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi Felix,
that should already be fixed in drm-tip as part of the merge of the TTM
changes.
Regards,
Christian.
Am 08.06.21 um 07:37 schrieb Felix Kuehling:
Hi Christian,
I based amdgpu_preempt_mgr on amdgpu_gtt_mgr and now I'm looking at what
changed there. Looks like I'll need to create a dummy node in
amdgpu_preempt_mgr_new to satisfy TTM, and free it in
amdgpu_preempt_mgr_del.
Thanks,
Felix
Am 2021-06-07 um 10:50 p.m. schrieb Stephen Rothwell:
Hi all,
After merging the drm-misc tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c: In function
'amdgpu_preempt_mgr_new':
drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c:75:5: error: 'struct
ttm_resource' has no member named 'mm_node'
75 | mem->mm_node = NULL;
| ^~
drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c: At top level:
drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c:129:11: error: initialization
of 'int (*)(struct ttm_resource_manager *, struct ttm_buffer_object *, const
struct ttm_place *, struct ttm_resource **)' from incompatible pointer type
'int (*)(struct ttm_resource_manager *, struct ttm_buffer_object *, const
struct ttm_place *, struct ttm_resource *)' [-Werror=incompatible-pointer-types]
129 | .alloc = amdgpu_preempt_mgr_new,
| ^~
drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c:129:11: note: (near
initialization for 'amdgpu_preempt_mgr_func.alloc')
Caused by commit
cb1c81467af3 ("drm/ttm: flip the switch for driver allocated resources v2")
from the drm-misc tree interacting with commit
b453e42a6e8b ("drm/amdgpu: Add new placement for preemptible SG BOs")
from the drm tree.
I don't know how to fix this, so I added the following hack (a better
fix would be nice):
From: Stephen Rothwell
Date: Tue, 8 Jun 2021 12:41:16 +1000
Subject: [PATCH] hack fix up for needed amdgpu_preempt_mgr_new() fix up
Signed-off-by: Stephen Rothwell
---
drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c
b/drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c
index d607f314cc1b..e1a7b3e967b9 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c
@@ -66,14 +66,16 @@ static DEVICE_ATTR_RO(mem_info_preempt_used);
static int amdgpu_preempt_mgr_new(struct ttm_resource_manager *man,
struct ttm_buffer_object *tbo,
const struct ttm_place *place,
- struct ttm_resource *mem)
+ struct ttm_resource **res)
{
+#if 0
struct amdgpu_preempt_mgr *mgr = to_preempt_mgr(man);
atomic64_add(mem->num_pages, &mgr->used);
mem->mm_node = NULL;
mem->start = AMDGPU_BO_INVALID_OFFSET;
+#endif
return 0;
}
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi Christian,
I based amdgpu_preempt_mgr on amdgpu_gtt_mgr and now I'm looking at what
changed there. Looks like I'll need to create a dummy node in
amdgpu_preempt_mgr_new to satisfy TTM, and free it in
amdgpu_preempt_mgr_del.
Thanks,
Felix
Am 2021-06-07 um 10:50 p.m. schrieb Stephen Rothwell:
> Hi all,
>
> After merging the drm-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c: In function
> 'amdgpu_preempt_mgr_new':
> drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c:75:5: error: 'struct
> ttm_resource' has no member named 'mm_node'
>75 | mem->mm_node = NULL;
> | ^~
> drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c: At top level:
> drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c:129:11: error: initialization
> of 'int (*)(struct ttm_resource_manager *, struct ttm_buffer_object *, const
> struct ttm_place *, struct ttm_resource **)' from incompatible pointer type
> 'int (*)(struct ttm_resource_manager *, struct ttm_buffer_object *, const
> struct ttm_place *, struct ttm_resource *)'
> [-Werror=incompatible-pointer-types]
> 129 | .alloc = amdgpu_preempt_mgr_new,
> | ^~
> drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c:129:11: note: (near
> initialization for 'amdgpu_preempt_mgr_func.alloc')
>
> Caused by commit
>
> cb1c81467af3 ("drm/ttm: flip the switch for driver allocated resources v2")
>
> from the drm-misc tree interacting with commit
>
> b453e42a6e8b ("drm/amdgpu: Add new placement for preemptible SG BOs")
>
> from the drm tree.
>
> I don't know how to fix this, so I added the following hack (a better
> fix would be nice):
>
> From: Stephen Rothwell
> Date: Tue, 8 Jun 2021 12:41:16 +1000
> Subject: [PATCH] hack fix up for needed amdgpu_preempt_mgr_new() fix up
>
> Signed-off-by: Stephen Rothwell
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c
> b/drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c
> index d607f314cc1b..e1a7b3e967b9 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c
> @@ -66,14 +66,16 @@ static DEVICE_ATTR_RO(mem_info_preempt_used);
> static int amdgpu_preempt_mgr_new(struct ttm_resource_manager *man,
> struct ttm_buffer_object *tbo,
> const struct ttm_place *place,
> - struct ttm_resource *mem)
> + struct ttm_resource **res)
> {
> +#if 0
> struct amdgpu_preempt_mgr *mgr = to_preempt_mgr(man);
>
> atomic64_add(mem->num_pages, &mgr->used);
>
> mem->mm_node = NULL;
> mem->start = AMDGPU_BO_INVALID_OFFSET;
> +#endif
> return 0;
> }
>
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
[Intel-gfx] ✗ Fi.CI.BUILD: failure for linux-next: build failure after merge of the drm-misc tree
== Series Details == Series: linux-next: build failure after merge of the drm-misc tree URL : https://patchwork.freedesktop.org/series/91132/ State : failure == Summary == Applying: linux-next: build failure after merge of the drm-misc tree Using index info to reconstruct a base tree... M drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 linux-next: build failure after merge of the drm-misc tree When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
[Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi all,
After merging the drm-misc tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c: In function
'amdgpu_preempt_mgr_new':
drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c:75:5: error: 'struct
ttm_resource' has no member named 'mm_node'
75 | mem->mm_node = NULL;
| ^~
drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c: At top level:
drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c:129:11: error: initialization
of 'int (*)(struct ttm_resource_manager *, struct ttm_buffer_object *, const
struct ttm_place *, struct ttm_resource **)' from incompatible pointer type
'int (*)(struct ttm_resource_manager *, struct ttm_buffer_object *, const
struct ttm_place *, struct ttm_resource *)' [-Werror=incompatible-pointer-types]
129 | .alloc = amdgpu_preempt_mgr_new,
| ^~
drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c:129:11: note: (near
initialization for 'amdgpu_preempt_mgr_func.alloc')
Caused by commit
cb1c81467af3 ("drm/ttm: flip the switch for driver allocated resources v2")
from the drm-misc tree interacting with commit
b453e42a6e8b ("drm/amdgpu: Add new placement for preemptible SG BOs")
from the drm tree.
I don't know how to fix this, so I added the following hack (a better
fix would be nice):
From: Stephen Rothwell
Date: Tue, 8 Jun 2021 12:41:16 +1000
Subject: [PATCH] hack fix up for needed amdgpu_preempt_mgr_new() fix up
Signed-off-by: Stephen Rothwell
---
drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c
b/drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c
index d607f314cc1b..e1a7b3e967b9 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c
@@ -66,14 +66,16 @@ static DEVICE_ATTR_RO(mem_info_preempt_used);
static int amdgpu_preempt_mgr_new(struct ttm_resource_manager *man,
struct ttm_buffer_object *tbo,
const struct ttm_place *place,
- struct ttm_resource *mem)
+ struct ttm_resource **res)
{
+#if 0
struct amdgpu_preempt_mgr *mgr = to_preempt_mgr(man);
atomic64_add(mem->num_pages, &mgr->used);
mem->mm_node = NULL;
mem->start = AMDGPU_BO_INVALID_OFFSET;
+#endif
return 0;
}
--
2.30.2
--
Cheers,
Stephen Rothwell
pgpS0X9ihg7Bl.pgp
Description: OpenPGP digital signature
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Ah, yes. I've forgot to include the infiniband subdir in the automated
rename. I should have done that treewide.
Going to provide a fix in a minute, sorry for the noise.
Christian.
Am 07.06.21 um 04:33 schrieb Stephen Rothwell:
Hi all,
After merging the drm-misc tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:
drivers/infiniband/core/umem_dmabuf.c: In function 'ib_umem_dmabuf_map_pages':
drivers/infiniband/core/umem_dmabuf.c:69:10: error: implicit declaration of
function 'dma_resv_get_excl'; did you mean 'dma_resv_get_fences'?
[-Werror=implicit-function-declaration]
69 | fence = dma_resv_get_excl(umem_dmabuf->attach->dmabuf->resv);
| ^
| dma_resv_get_fences
drivers/infiniband/core/umem_dmabuf.c:69:8: warning: assignment to 'struct
dma_fence *' from 'int' makes pointer from integer without a cast
[-Wint-conversion]
69 | fence = dma_resv_get_excl(umem_dmabuf->attach->dmabuf->resv);
|^
Caused by commit
6edbd6abb783 ("dma-buf: rename and cleanup dma_resv_get_excl v3")
I have used the drm-misc tree from next-20210604 for today.
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
[Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi all,
After merging the drm-misc tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:
drivers/infiniband/core/umem_dmabuf.c: In function 'ib_umem_dmabuf_map_pages':
drivers/infiniband/core/umem_dmabuf.c:69:10: error: implicit declaration of
function 'dma_resv_get_excl'; did you mean 'dma_resv_get_fences'?
[-Werror=implicit-function-declaration]
69 | fence = dma_resv_get_excl(umem_dmabuf->attach->dmabuf->resv);
| ^
| dma_resv_get_fences
drivers/infiniband/core/umem_dmabuf.c:69:8: warning: assignment to 'struct
dma_fence *' from 'int' makes pointer from integer without a cast
[-Wint-conversion]
69 | fence = dma_resv_get_excl(umem_dmabuf->attach->dmabuf->resv);
|^
Caused by commit
6edbd6abb783 ("dma-buf: rename and cleanup dma_resv_get_excl v3")
I have used the drm-misc tree from next-20210604 for today.
--
Cheers,
Stephen Rothwell
pgpHTxpsI2967.pgp
Description: OpenPGP digital signature
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi
Am 12.05.21 um 07:00 schrieb Stephen Rothwell:
Hi all,
After merging the drm-misc tree, today's linux-next build (powerpc
allyesconfig) failed like this:
drivers/gpu/drm/nouveau/nouveau_connector.c: In function
'nouveau_connector_of_detect':
drivers/gpu/drm/nouveau/nouveau_connector.c:463:59: error: 'struct drm_device'
has no member named 'pdev'; did you mean 'dev'?
463 | struct device_node *cn, *dn = pci_device_to_OF_node(dev->pdev);
| ^~~~
| dev
Caused by commit
b347e04452ff ("drm: Remove pdev field from struct drm_device")
I have reverted that commit for today.
Thanks for reporting. pdev is gone, but the references are sometimes
hard to find. You may want to undo the revert and try the fix at [1].
The patch should hit drm-misc-next ASAP.
Best regards
Thomas
[1]
https://lore.kernel.org/dri-devel/20210512185527.26050-1-tzimmerm...@suse.de/T/#u
--
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5, 90409 Nürnberg, Germany
(HRB 36809, AG Nürnberg)
Geschäftsführer: Felix Imendörffer
OpenPGP_signature
Description: OpenPGP digital signature
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
[Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi all,
After merging the drm-misc tree, today's linux-next build (powerpc
allyesconfig) failed like this:
drivers/gpu/drm/nouveau/nouveau_connector.c: In function
'nouveau_connector_of_detect':
drivers/gpu/drm/nouveau/nouveau_connector.c:463:59: error: 'struct drm_device'
has no member named 'pdev'; did you mean 'dev'?
463 | struct device_node *cn, *dn = pci_device_to_OF_node(dev->pdev);
| ^~~~
| dev
Caused by commit
b347e04452ff ("drm: Remove pdev field from struct drm_device")
I have reverted that commit for today.
--
Cheers,
Stephen Rothwell
pgpXJh22Xbh4M.pgp
Description: OpenPGP digital signature
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
