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(>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
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(>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(>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] 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] 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(>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(>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(>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(>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(>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(>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(>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(>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(>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(>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(, 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] 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(>panel);
drm_panel_disable(>panel);
drm_panel_unprepare(>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
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, >used);
> > > > > mem->mm_node = NULL;
> > > > > mem->start = AMDGPU_BO_INVALID_OFFSET;
> > > > > +#endif
>
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, >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, >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, >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, >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] 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, >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
Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Op 2021-02-10 om 04:11 schreef Stephen Rothwell: > Hi all, > > After merging the drm-misc tree, today's linux-next build (x86_64 > allmodconfig) failed like this: > > drivers/gpu/drm/v3d/v3d_sched.c:263:1: error: return type is an incomplete > type > 263 | v3d_gpu_reset_for_timeout(struct v3d_dev *v3d, struct drm_sched_job > *sched_job) > | ^ > drivers/gpu/drm/v3d/v3d_sched.c: In function 'v3d_gpu_reset_for_timeout': > drivers/gpu/drm/v3d/v3d_sched.c:289:9: error: 'return' with a value, in > function returning void [-Werror=return-type] > 289 | return DRM_GPU_SCHED_STAT_NOMINAL; > | ^~ > drivers/gpu/drm/v3d/v3d_sched.c:263:1: note: declared here > 263 | v3d_gpu_reset_for_timeout(struct v3d_dev *v3d, struct drm_sched_job > *sched_job) > | ^ > drivers/gpu/drm/v3d/v3d_sched.c: At top level: > drivers/gpu/drm/v3d/v3d_sched.c:298:1: error: return type is an incomplete > type > 298 | v3d_cl_job_timedout(struct drm_sched_job *sched_job, enum v3d_queue q, > | ^~~ > drivers/gpu/drm/v3d/v3d_sched.c: In function 'v3d_cl_job_timedout': > drivers/gpu/drm/v3d/v3d_sched.c:309:10: error: 'return' with a value, in > function returning void [-Werror=return-type] > 309 | return DRM_GPU_SCHED_STAT_NOMINAL; > | ^~ > drivers/gpu/drm/v3d/v3d_sched.c:298:1: note: declared here > 298 | v3d_cl_job_timedout(struct drm_sched_job *sched_job, enum v3d_queue q, > | ^~~ > drivers/gpu/drm/v3d/v3d_sched.c: At top level: > drivers/gpu/drm/v3d/v3d_sched.c:316:1: error: return type is an incomplete > type > 316 | v3d_bin_job_timedout(struct drm_sched_job *sched_job) > | ^~~~ > drivers/gpu/drm/v3d/v3d_sched.c:325:1: error: return type is an incomplete > type > 325 | v3d_render_job_timedout(struct drm_sched_job *sched_job) > | ^~~ > drivers/gpu/drm/v3d/v3d_sched.c:334:1: error: return type is an incomplete > type > 334 | v3d_generic_job_timedout(struct drm_sched_job *sched_job) > | ^~~~ > drivers/gpu/drm/v3d/v3d_sched.c:342:1: error: return type is an incomplete > type > 342 | v3d_csd_job_timedout(struct drm_sched_job *sched_job) > | ^~~~ > drivers/gpu/drm/v3d/v3d_sched.c: In function 'v3d_csd_job_timedout': > drivers/gpu/drm/v3d/v3d_sched.c:353:10: error: 'return' with a value, in > function returning void [-Werror=return-type] > 353 | return DRM_GPU_SCHED_STAT_NOMINAL; > | ^~ > drivers/gpu/drm/v3d/v3d_sched.c:342:1: note: declared here > 342 | v3d_csd_job_timedout(struct drm_sched_job *sched_job) > | ^~~~ > drivers/gpu/drm/v3d/v3d_sched.c: At top level: > drivers/gpu/drm/v3d/v3d_sched.c:362:18: error: initialization of 'enum > drm_gpu_sched_stat (*)(struct drm_sched_job *)' from incompatible pointer > type 'void (*)(struct drm_sched_job *)' [-Werror=incompatible-pointer-types] > 362 | .timedout_job = v3d_bin_job_timedout, > | ^~~~ > drivers/gpu/drm/v3d/v3d_sched.c:362:18: note: (near initialization for > 'v3d_bin_sched_ops.timedout_job') > drivers/gpu/drm/v3d/v3d_sched.c:369:18: error: initialization of 'enum > drm_gpu_sched_stat (*)(struct drm_sched_job *)' from incompatible pointer > type 'void (*)(struct drm_sched_job *)' [-Werror=incompatible-pointer-types] > 369 | .timedout_job = v3d_render_job_timedout, > | ^~~ > drivers/gpu/drm/v3d/v3d_sched.c:369:18: note: (near initialization for > 'v3d_render_sched_ops.timedout_job') > drivers/gpu/drm/v3d/v3d_sched.c:376:18: error: initialization of 'enum > drm_gpu_sched_stat (*)(struct drm_sched_job *)' from incompatible pointer > type 'void (*)(struct drm_sched_job *)' [-Werror=incompatible-pointer-types] > 376 | .timedout_job = v3d_generic_job_timedout, > | ^~~~ > drivers/gpu/drm/v3d/v3d_sched.c:376:18: note: (near initialization for > 'v3d_tfu_sched_ops.timedout_job') > drivers/gpu/drm/v3d/v3d_sched.c:383:18: error: initialization of 'enum > drm_gpu_sched_stat (*)(struct drm_sched_job *)' from incompatible pointer > type 'void (*)(struct drm_sched_job *)' [-Werror=incompatible-pointer-types] > 383 | .timedout_job = v3d_csd_job_timedout, > | ^~~~ > drivers/gpu/drm/v3d/v3d_sched.c:383:18: note: (near initialization for > 'v3d_csd_sched_ops.timedout_job') > drivers/gpu/drm/v3d/v3d_sched.c:390:18: error: initialization of 'enum > drm_gpu_sched_stat (*)(struct drm_sched_job *)' from incompatible pointer > type 'void (*)(struct drm_sched_job *)' [-Werror=incompatible-pointer-types] > 390 | .timedout_job = v3d_generic_job_timedout, > | ^~~~ > drivers/gpu/drm/v3d/v3d_sched.c:390:18: note: (near
[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/v3d/v3d_sched.c:263:1: error: return type is an incomplete type
263 | v3d_gpu_reset_for_timeout(struct v3d_dev *v3d, struct drm_sched_job
*sched_job)
| ^
drivers/gpu/drm/v3d/v3d_sched.c: In function 'v3d_gpu_reset_for_timeout':
drivers/gpu/drm/v3d/v3d_sched.c:289:9: error: 'return' with a value, in
function returning void [-Werror=return-type]
289 | return DRM_GPU_SCHED_STAT_NOMINAL;
| ^~
drivers/gpu/drm/v3d/v3d_sched.c:263:1: note: declared here
263 | v3d_gpu_reset_for_timeout(struct v3d_dev *v3d, struct drm_sched_job
*sched_job)
| ^
drivers/gpu/drm/v3d/v3d_sched.c: At top level:
drivers/gpu/drm/v3d/v3d_sched.c:298:1: error: return type is an incomplete type
298 | v3d_cl_job_timedout(struct drm_sched_job *sched_job, enum v3d_queue q,
| ^~~
drivers/gpu/drm/v3d/v3d_sched.c: In function 'v3d_cl_job_timedout':
drivers/gpu/drm/v3d/v3d_sched.c:309:10: error: 'return' with a value, in
function returning void [-Werror=return-type]
309 | return DRM_GPU_SCHED_STAT_NOMINAL;
| ^~
drivers/gpu/drm/v3d/v3d_sched.c:298:1: note: declared here
298 | v3d_cl_job_timedout(struct drm_sched_job *sched_job, enum v3d_queue q,
| ^~~
drivers/gpu/drm/v3d/v3d_sched.c: At top level:
drivers/gpu/drm/v3d/v3d_sched.c:316:1: error: return type is an incomplete type
316 | v3d_bin_job_timedout(struct drm_sched_job *sched_job)
| ^~~~
drivers/gpu/drm/v3d/v3d_sched.c:325:1: error: return type is an incomplete type
325 | v3d_render_job_timedout(struct drm_sched_job *sched_job)
| ^~~
drivers/gpu/drm/v3d/v3d_sched.c:334:1: error: return type is an incomplete type
334 | v3d_generic_job_timedout(struct drm_sched_job *sched_job)
| ^~~~
drivers/gpu/drm/v3d/v3d_sched.c:342:1: error: return type is an incomplete type
342 | v3d_csd_job_timedout(struct drm_sched_job *sched_job)
| ^~~~
drivers/gpu/drm/v3d/v3d_sched.c: In function 'v3d_csd_job_timedout':
drivers/gpu/drm/v3d/v3d_sched.c:353:10: error: 'return' with a value, in
function returning void [-Werror=return-type]
353 | return DRM_GPU_SCHED_STAT_NOMINAL;
| ^~
drivers/gpu/drm/v3d/v3d_sched.c:342:1: note: declared here
342 | v3d_csd_job_timedout(struct drm_sched_job *sched_job)
| ^~~~
drivers/gpu/drm/v3d/v3d_sched.c: At top level:
drivers/gpu/drm/v3d/v3d_sched.c:362:18: error: initialization of 'enum
drm_gpu_sched_stat (*)(struct drm_sched_job *)' from incompatible pointer type
'void (*)(struct drm_sched_job *)' [-Werror=incompatible-pointer-types]
362 | .timedout_job = v3d_bin_job_timedout,
| ^~~~
drivers/gpu/drm/v3d/v3d_sched.c:362:18: note: (near initialization for
'v3d_bin_sched_ops.timedout_job')
drivers/gpu/drm/v3d/v3d_sched.c:369:18: error: initialization of 'enum
drm_gpu_sched_stat (*)(struct drm_sched_job *)' from incompatible pointer type
'void (*)(struct drm_sched_job *)' [-Werror=incompatible-pointer-types]
369 | .timedout_job = v3d_render_job_timedout,
| ^~~
drivers/gpu/drm/v3d/v3d_sched.c:369:18: note: (near initialization for
'v3d_render_sched_ops.timedout_job')
drivers/gpu/drm/v3d/v3d_sched.c:376:18: error: initialization of 'enum
drm_gpu_sched_stat (*)(struct drm_sched_job *)' from incompatible pointer type
'void (*)(struct drm_sched_job *)' [-Werror=incompatible-pointer-types]
376 | .timedout_job = v3d_generic_job_timedout,
| ^~~~
drivers/gpu/drm/v3d/v3d_sched.c:376:18: note: (near initialization for
'v3d_tfu_sched_ops.timedout_job')
drivers/gpu/drm/v3d/v3d_sched.c:383:18: error: initialization of 'enum
drm_gpu_sched_stat (*)(struct drm_sched_job *)' from incompatible pointer type
'void (*)(struct drm_sched_job *)' [-Werror=incompatible-pointer-types]
383 | .timedout_job = v3d_csd_job_timedout,
| ^~~~
drivers/gpu/drm/v3d/v3d_sched.c:383:18: note: (near initialization for
'v3d_csd_sched_ops.timedout_job')
drivers/gpu/drm/v3d/v3d_sched.c:390:18: error: initialization of 'enum
drm_gpu_sched_stat (*)(struct drm_sched_job *)' from incompatible pointer type
'void (*)(struct drm_sched_job *)' [-Werror=incompatible-pointer-types]
390 | .timedout_job = v3d_generic_job_timedout,
| ^~~~
drivers/gpu/drm/v3d/v3d_sched.c:390:18: note: (near initialization for
'v3d_cache_clean_sched_ops.timedout_job')
Caused by commit
c10983e14e8f ("drm/scheduler: Job timeout handler returns status (v3)")
I have used the drm-misc tree from next-20210209 for today.
--
Cheers,
Stephen
[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/v3d/v3d_sched.c:263:1: error: return type is an incomplete type
263 | v3d_gpu_reset_for_timeout(struct v3d_dev *v3d, struct drm_sched_job
*sched_job)
| ^
drivers/gpu/drm/v3d/v3d_sched.c: In function 'v3d_gpu_reset_for_timeout':
drivers/gpu/drm/v3d/v3d_sched.c:289:9: error: 'return' with a value, in
function returning void [-Werror=return-type]
289 | return DRM_GPU_SCHED_STAT_NOMINAL;
| ^~
drivers/gpu/drm/v3d/v3d_sched.c:263:1: note: declared here
263 | v3d_gpu_reset_for_timeout(struct v3d_dev *v3d, struct drm_sched_job
*sched_job)
| ^
drivers/gpu/drm/v3d/v3d_sched.c: At top level:
drivers/gpu/drm/v3d/v3d_sched.c:298:1: error: return type is an incomplete type
298 | v3d_cl_job_timedout(struct drm_sched_job *sched_job, enum v3d_queue q,
| ^~~
drivers/gpu/drm/v3d/v3d_sched.c: In function 'v3d_cl_job_timedout':
drivers/gpu/drm/v3d/v3d_sched.c:309:10: error: 'return' with a value, in
function returning void [-Werror=return-type]
309 | return DRM_GPU_SCHED_STAT_NOMINAL;
| ^~
drivers/gpu/drm/v3d/v3d_sched.c:298:1: note: declared here
298 | v3d_cl_job_timedout(struct drm_sched_job *sched_job, enum v3d_queue q,
| ^~~
drivers/gpu/drm/v3d/v3d_sched.c: At top level:
drivers/gpu/drm/v3d/v3d_sched.c:316:1: error: return type is an incomplete type
316 | v3d_bin_job_timedout(struct drm_sched_job *sched_job)
| ^~~~
drivers/gpu/drm/v3d/v3d_sched.c:325:1: error: return type is an incomplete type
325 | v3d_render_job_timedout(struct drm_sched_job *sched_job)
| ^~~
drivers/gpu/drm/v3d/v3d_sched.c:334:1: error: return type is an incomplete type
334 | v3d_generic_job_timedout(struct drm_sched_job *sched_job)
| ^~~~
drivers/gpu/drm/v3d/v3d_sched.c:342:1: error: return type is an incomplete type
342 | v3d_csd_job_timedout(struct drm_sched_job *sched_job)
| ^~~~
drivers/gpu/drm/v3d/v3d_sched.c: In function 'v3d_csd_job_timedout':
drivers/gpu/drm/v3d/v3d_sched.c:353:10: error: 'return' with a value, in
function returning void [-Werror=return-type]
353 | return DRM_GPU_SCHED_STAT_NOMINAL;
| ^~
drivers/gpu/drm/v3d/v3d_sched.c:342:1: note: declared here
342 | v3d_csd_job_timedout(struct drm_sched_job *sched_job)
| ^~~~
drivers/gpu/drm/v3d/v3d_sched.c: At top level:
drivers/gpu/drm/v3d/v3d_sched.c:362:18: error: initialization of 'enum
drm_gpu_sched_stat (*)(struct drm_sched_job *)' from incompatible pointer type
'void (*)(struct drm_sched_job *)' [-Werror=incompatible-pointer-types]
362 | .timedout_job = v3d_bin_job_timedout,
| ^~~~
drivers/gpu/drm/v3d/v3d_sched.c:362:18: note: (near initialization for
'v3d_bin_sched_ops.timedout_job')
drivers/gpu/drm/v3d/v3d_sched.c:369:18: error: initialization of 'enum
drm_gpu_sched_stat (*)(struct drm_sched_job *)' from incompatible pointer type
'void (*)(struct drm_sched_job *)' [-Werror=incompatible-pointer-types]
369 | .timedout_job = v3d_render_job_timedout,
| ^~~
drivers/gpu/drm/v3d/v3d_sched.c:369:18: note: (near initialization for
'v3d_render_sched_ops.timedout_job')
drivers/gpu/drm/v3d/v3d_sched.c:376:18: error: initialization of 'enum
drm_gpu_sched_stat (*)(struct drm_sched_job *)' from incompatible pointer type
'void (*)(struct drm_sched_job *)' [-Werror=incompatible-pointer-types]
376 | .timedout_job = v3d_generic_job_timedout,
| ^~~~
drivers/gpu/drm/v3d/v3d_sched.c:376:18: note: (near initialization for
'v3d_tfu_sched_ops.timedout_job')
drivers/gpu/drm/v3d/v3d_sched.c:383:18: error: initialization of 'enum
drm_gpu_sched_stat (*)(struct drm_sched_job *)' from incompatible pointer type
'void (*)(struct drm_sched_job *)' [-Werror=incompatible-pointer-types]
383 | .timedout_job = v3d_csd_job_timedout,
| ^~~~
drivers/gpu/drm/v3d/v3d_sched.c:383:18: note: (near initialization for
'v3d_csd_sched_ops.timedout_job')
drivers/gpu/drm/v3d/v3d_sched.c:390:18: error: initialization of 'enum
drm_gpu_sched_stat (*)(struct drm_sched_job *)' from incompatible pointer type
'void (*)(struct drm_sched_job *)' [-Werror=incompatible-pointer-types]
390 | .timedout_job = v3d_generic_job_timedout,
| ^~~~
drivers/gpu/drm/v3d/v3d_sched.c:390:18: note: (near initialization for
'v3d_cache_clean_sched_ops.timedout_job')
Caused by commit
a6a1f036c74e ("drm/scheduler: Job timeout handler returns status (v3)")
I have used the drm-misc tree from next-20210129 for today.
--
Cheers,
Stephen
Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi
Am 14.01.21 um 01:31 schrieb Stephen Rothwell:
Hi all,
After merging the drm-misc tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:
drivers/gpu/drm/drm_cache.c: In function 'drm_need_swiotlb':
drivers/gpu/drm/drm_cache.c:202:6: error: implicit declaration of function
'mem_encrypt_active' [-Werror=implicit-function-declaration]
202 | if (mem_encrypt_active())
| ^~
Caused by commit
3abc66706385 ("drm: Implement drm_need_swiotlb() in drm_cache.c")
I have used the drm-misc tree from next-20210107 again for today.
Sorry for the breakage. Fixed in drm-misc-next.
Best regards
Thomas
--
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 (arm
multi_v7_defconfig) failed like this:
drivers/gpu/drm/drm_cache.c: In function 'drm_need_swiotlb':
drivers/gpu/drm/drm_cache.c:202:6: error: implicit declaration of function
'mem_encrypt_active' [-Werror=implicit-function-declaration]
202 | if (mem_encrypt_active())
| ^~
Caused by commit
3abc66706385 ("drm: Implement drm_need_swiotlb() in drm_cache.c")
I have used the drm-misc tree from next-20210107 again for today.
--
Cheers,
Stephen Rothwell
pgphiXabzo_aR.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
On Wed, Nov 11, 2020 at 05:10:15PM +1100, Stephen Rothwell wrote:
> Hi Michael,
>
> On Mon, 2 Nov 2020 05:19:06 -0500 "Michael S. Tsirkin"
> wrote:
> >
> > On Mon, Nov 02, 2020 at 12:43:27PM +1100, Stephen Rothwell wrote:
> > >
> > > 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/nouveau/nouveau_ttm.c:26:
> > > include/linux/swiotlb.h: In function 'swiotlb_max_mapping_size':
> > > include/linux/swiotlb.h:99:9: error: 'SIZE_MAX' undeclared (first use in
> > > this function)
> > >99 | return SIZE_MAX;
> > > | ^~~~
> > > include/linux/swiotlb.h:7:1: note: 'SIZE_MAX' is defined in header
> > > ''; did you forget to '#include '?
> > > 6 | #include
> > > +++ |+#include
> > > 7 | #include
> > > include/linux/swiotlb.h:99:9: note: each undeclared identifier is
> > > reported only once for each function it appears in
> > >99 | return SIZE_MAX;
> > > | ^~~~
> > >
> > > Caused by commit
> > >
> > > abe420bfae52 ("swiotlb: Introduce swiotlb_max_mapping_size()")
> > >
> > > but only exposed by commit
> > >
> > > 4dbafbd30aef ("drm/nouveu: fix swiotlb include")
> > >
> > > I applied the following fix for today:
> > >
> > > From: Stephen Rothwell
> > > Date: Mon, 2 Nov 2020 12:34:57 +1100
> > > Subject: [PATCH] swiotlb: using SIZE_MAX needs limits.h included
> > >
> > > Fixes: abe420bfae52 ("swiotlb: Introduce swiotlb_max_mapping_size()")
> > > Signed-off-by: Stephen Rothwell
> >
> > Acked-by: Michael S. Tsirkin
> >
> > I guess it makes sense to pick this up for this release directly.
> > I'll merge this unless there are any objections.
>
> Christoph is right that the include should not be conditional. But I
> have not tested that that does not introduce some other problems.
If there's a problem it will be a build failure - I'll put
it in next for a while, this way we'll find out.
> --
> Cheers,
> Stephen Rothwell
___
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 Michael,
On Mon, 2 Nov 2020 05:19:06 -0500 "Michael S. Tsirkin" wrote:
>
> On Mon, Nov 02, 2020 at 12:43:27PM +1100, Stephen Rothwell wrote:
> >
> > 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/nouveau/nouveau_ttm.c:26:
> > include/linux/swiotlb.h: In function 'swiotlb_max_mapping_size':
> > include/linux/swiotlb.h:99:9: error: 'SIZE_MAX' undeclared (first use in
> > this function)
> >99 | return SIZE_MAX;
> > | ^~~~
> > include/linux/swiotlb.h:7:1: note: 'SIZE_MAX' is defined in header
> > ''; did you forget to '#include '?
> > 6 | #include
> > +++ |+#include
> > 7 | #include
> > include/linux/swiotlb.h:99:9: note: each undeclared identifier is reported
> > only once for each function it appears in
> >99 | return SIZE_MAX;
> > | ^~~~
> >
> > Caused by commit
> >
> > abe420bfae52 ("swiotlb: Introduce swiotlb_max_mapping_size()")
> >
> > but only exposed by commit
> >
> > 4dbafbd30aef ("drm/nouveu: fix swiotlb include")
> >
> > I applied the following fix for today:
> >
> > From: Stephen Rothwell
> > Date: Mon, 2 Nov 2020 12:34:57 +1100
> > Subject: [PATCH] swiotlb: using SIZE_MAX needs limits.h included
> >
> > Fixes: abe420bfae52 ("swiotlb: Introduce swiotlb_max_mapping_size()")
> > Signed-off-by: Stephen Rothwell
>
> Acked-by: Michael S. Tsirkin
>
> I guess it makes sense to pick this up for this release directly.
> I'll merge this unless there are any objections.
Christoph is right that the include should not be conditional. But I
have not tested that that does not introduce some other problems.
--
Cheers,
Stephen Rothwell
pgpbjg_hHsm0p.pgp
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 (arm
multi_v7_defconfig) failed like this:
drivers/gpu/drm/msm/msm_gem.c:1014:10: error: initialization of 'int (*)(struct
drm_gem_object *, struct dma_buf_map *)' from incompatible pointer type 'void *
(*)(struct drm_gem_object *)' [-Werror=incompatible-pointer-types]
1014 | .vmap = msm_gem_prime_vmap,
| ^~
drivers/gpu/drm/msm/msm_gem.c:1014:10: note: (near initialization for
'msm_gem_object_funcs.vmap')
drivers/gpu/drm/msm/msm_gem.c:1015:12: error: initialization of 'void
(*)(struct drm_gem_object *, struct dma_buf_map *)' from incompatible pointer
type 'void (*)(struct drm_gem_object *, void *)'
[-Werror=incompatible-pointer-types]
1015 | .vunmap = msm_gem_prime_vunmap,
|^~~~
Caused by commit
49a3f51dfeee ("drm/gem: Use struct dma_buf_map in GEM vmap ops and convert
GEM backends")
interacting with commit
3c9edd9c85f5 ("drm/msm: Introduce GEM object funcs")
from the drm tree.
I tried reverting commit 3c9edd9c85f5 (as 49a3f51dfeee does not revert
cleanly) but that just produced more errors, so I have disabled
CONFIG_DRM_MSM for now.
--
Cheers,
Stephen Rothwell
pgpKF9QObojh9.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
On Mon, Nov 02, 2020 at 10:28:34AM +0100, Daniel Vetter wrote: > > --- a/include/linux/swiotlb.h > > +++ b/include/linux/swiotlb.h > > @@ -5,6 +5,9 @@ > > #include > > #include > > #include > > +#ifndef CONFIG_SWIOTLB > > +#include > > +#endif No conditional includes please. And the proper fix for the reported issue is to stop poking into swiotlb internals in random drivers.. ___ 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
On Mon, Nov 02, 2020 at 10:27:11AM +, Christoph Hellwig wrote: > On Mon, Nov 02, 2020 at 10:28:34AM +0100, Daniel Vetter wrote: > > > --- a/include/linux/swiotlb.h > > > +++ b/include/linux/swiotlb.h > > > @@ -5,6 +5,9 @@ > > > #include > > > #include > > > #include > > > +#ifndef CONFIG_SWIOTLB > > > +#include > > > +#endif > > No conditional includes please. And the proper fix for the reported > issue is to stop poking into swiotlb internals in random drivers.. Meaning? ___ 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
On Mon, Nov 2, 2020 at 11:23 AM Michael S. Tsirkin wrote:
>
> On Mon, Nov 02, 2020 at 10:28:34AM +0100, Daniel Vetter wrote:
> > On Mon, Nov 2, 2020 at 2:43 AM Stephen Rothwell
> > wrote:
> > >
> > > 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/nouveau/nouveau_ttm.c:26:
> > > include/linux/swiotlb.h: In function 'swiotlb_max_mapping_size':
> > > include/linux/swiotlb.h:99:9: error: 'SIZE_MAX' undeclared (first use in
> > > this function)
> > >99 | return SIZE_MAX;
> > > | ^~~~
> > > include/linux/swiotlb.h:7:1: note: 'SIZE_MAX' is defined in header
> > > ''; did you forget to '#include '?
> > > 6 | #include
> > > +++ |+#include
> > > 7 | #include
> > > include/linux/swiotlb.h:99:9: note: each undeclared identifier is
> > > reported only once for each function it appears in
> > >99 | return SIZE_MAX;
> > > | ^~~~
> > >
> > > Caused by commit
> > >
> > > abe420bfae52 ("swiotlb: Introduce swiotlb_max_mapping_size()")
> > >
> > > but only exposed by commit
> > >
> > > 4dbafbd30aef ("drm/nouveu: fix swiotlb include")
> > >
> > > I applied the following fix for today:
> > >
> > > From: Stephen Rothwell
> > > Date: Mon, 2 Nov 2020 12:34:57 +1100
> > > Subject: [PATCH] swiotlb: using SIZE_MAX needs limits.h included
> > >
> > > Fixes: abe420bfae52 ("swiotlb: Introduce swiotlb_max_mapping_size()")
> > > Signed-off-by: Stephen Rothwell
> >
> > I think simplest if this lands through dma-api tree into current -rc
> > kernels. Or should we just put this into drm-misc-next since that's
> > where the problem shows up? Christoph, any preference from dma-api
> > side?
> > -Daniel
>
>
> Or I can merge it since I merged the original patch causing the
> issue ...
Works for me too.
-Daniel
>
> > > ---
> > > include/linux/swiotlb.h | 3 +++
> > > 1 file changed, 3 insertions(+)
> > >
> > > diff --git a/include/linux/swiotlb.h b/include/linux/swiotlb.h
> > > index 513913ff7486..ed9de7855d3b 100644
> > > --- a/include/linux/swiotlb.h
> > > +++ b/include/linux/swiotlb.h
> > > @@ -5,6 +5,9 @@
> > > #include
> > > #include
> > > #include
> > > +#ifndef CONFIG_SWIOTLB
> > > +#include
> > > +#endif
> > >
> > > struct device;
> > > struct page;
> > > --
> > > 2.28.0
> > >
> > > --
> > > Cheers,
> > > Stephen Rothwell
> >
> >
> >
> > --
> > Daniel Vetter
> > Software Engineer, Intel Corporation
> > http://blog.ffwll.ch
>
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
___
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
On Mon, Nov 02, 2020 at 10:28:34AM +0100, Daniel Vetter wrote:
> On Mon, Nov 2, 2020 at 2:43 AM Stephen Rothwell wrote:
> >
> > 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/nouveau/nouveau_ttm.c:26:
> > include/linux/swiotlb.h: In function 'swiotlb_max_mapping_size':
> > include/linux/swiotlb.h:99:9: error: 'SIZE_MAX' undeclared (first use in
> > this function)
> >99 | return SIZE_MAX;
> > | ^~~~
> > include/linux/swiotlb.h:7:1: note: 'SIZE_MAX' is defined in header
> > ''; did you forget to '#include '?
> > 6 | #include
> > +++ |+#include
> > 7 | #include
> > include/linux/swiotlb.h:99:9: note: each undeclared identifier is reported
> > only once for each function it appears in
> >99 | return SIZE_MAX;
> > | ^~~~
> >
> > Caused by commit
> >
> > abe420bfae52 ("swiotlb: Introduce swiotlb_max_mapping_size()")
> >
> > but only exposed by commit
> >
> > 4dbafbd30aef ("drm/nouveu: fix swiotlb include")
> >
> > I applied the following fix for today:
> >
> > From: Stephen Rothwell
> > Date: Mon, 2 Nov 2020 12:34:57 +1100
> > Subject: [PATCH] swiotlb: using SIZE_MAX needs limits.h included
> >
> > Fixes: abe420bfae52 ("swiotlb: Introduce swiotlb_max_mapping_size()")
> > Signed-off-by: Stephen Rothwell
>
> I think simplest if this lands through dma-api tree into current -rc
> kernels. Or should we just put this into drm-misc-next since that's
> where the problem shows up? Christoph, any preference from dma-api
> side?
> -Daniel
Or I can merge it since I merged the original patch causing the
issue ...
> > ---
> > include/linux/swiotlb.h | 3 +++
> > 1 file changed, 3 insertions(+)
> >
> > diff --git a/include/linux/swiotlb.h b/include/linux/swiotlb.h
> > index 513913ff7486..ed9de7855d3b 100644
> > --- a/include/linux/swiotlb.h
> > +++ b/include/linux/swiotlb.h
> > @@ -5,6 +5,9 @@
> > #include
> > #include
> > #include
> > +#ifndef CONFIG_SWIOTLB
> > +#include
> > +#endif
> >
> > struct device;
> > struct page;
> > --
> > 2.28.0
> >
> > --
> > Cheers,
> > Stephen Rothwell
>
>
>
> --
> Daniel Vetter
> Software Engineer, Intel Corporation
> http://blog.ffwll.ch
___
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
On Mon, Nov 02, 2020 at 12:43:27PM +1100, Stephen Rothwell wrote:
> 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/nouveau/nouveau_ttm.c:26:
> include/linux/swiotlb.h: In function 'swiotlb_max_mapping_size':
> include/linux/swiotlb.h:99:9: error: 'SIZE_MAX' undeclared (first use in this
> function)
>99 | return SIZE_MAX;
> | ^~~~
> include/linux/swiotlb.h:7:1: note: 'SIZE_MAX' is defined in header
> ''; did you forget to '#include '?
> 6 | #include
> +++ |+#include
> 7 | #include
> include/linux/swiotlb.h:99:9: note: each undeclared identifier is reported
> only once for each function it appears in
>99 | return SIZE_MAX;
> | ^~~~
>
> Caused by commit
>
> abe420bfae52 ("swiotlb: Introduce swiotlb_max_mapping_size()")
>
> but only exposed by commit
>
> 4dbafbd30aef ("drm/nouveu: fix swiotlb include")
>
> I applied the following fix for today:
>
> From: Stephen Rothwell
> Date: Mon, 2 Nov 2020 12:34:57 +1100
> Subject: [PATCH] swiotlb: using SIZE_MAX needs limits.h included
>
> Fixes: abe420bfae52 ("swiotlb: Introduce swiotlb_max_mapping_size()")
> Signed-off-by: Stephen Rothwell
Acked-by: Michael S. Tsirkin
I guess it makes sense to pick this up for this release directly.
I'll merge this unless there are any objections.
> ---
> include/linux/swiotlb.h | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/include/linux/swiotlb.h b/include/linux/swiotlb.h
> index 513913ff7486..ed9de7855d3b 100644
> --- a/include/linux/swiotlb.h
> +++ b/include/linux/swiotlb.h
> @@ -5,6 +5,9 @@
> #include
> #include
> #include
> +#ifndef CONFIG_SWIOTLB
> +#include
> +#endif
>
> struct device;
> struct page;
> --
> 2.28.0
>
> --
> Cheers,
> Stephen Rothwell
___
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
On Mon, Nov 2, 2020 at 2:43 AM Stephen Rothwell wrote:
>
> 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/nouveau/nouveau_ttm.c:26:
> include/linux/swiotlb.h: In function 'swiotlb_max_mapping_size':
> include/linux/swiotlb.h:99:9: error: 'SIZE_MAX' undeclared (first use in this
> function)
>99 | return SIZE_MAX;
> | ^~~~
> include/linux/swiotlb.h:7:1: note: 'SIZE_MAX' is defined in header
> ''; did you forget to '#include '?
> 6 | #include
> +++ |+#include
> 7 | #include
> include/linux/swiotlb.h:99:9: note: each undeclared identifier is reported
> only once for each function it appears in
>99 | return SIZE_MAX;
> | ^~~~
>
> Caused by commit
>
> abe420bfae52 ("swiotlb: Introduce swiotlb_max_mapping_size()")
>
> but only exposed by commit
>
> 4dbafbd30aef ("drm/nouveu: fix swiotlb include")
>
> I applied the following fix for today:
>
> From: Stephen Rothwell
> Date: Mon, 2 Nov 2020 12:34:57 +1100
> Subject: [PATCH] swiotlb: using SIZE_MAX needs limits.h included
>
> Fixes: abe420bfae52 ("swiotlb: Introduce swiotlb_max_mapping_size()")
> Signed-off-by: Stephen Rothwell
I think simplest if this lands through dma-api tree into current -rc
kernels. Or should we just put this into drm-misc-next since that's
where the problem shows up? Christoph, any preference from dma-api
side?
-Daniel
> ---
> include/linux/swiotlb.h | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/include/linux/swiotlb.h b/include/linux/swiotlb.h
> index 513913ff7486..ed9de7855d3b 100644
> --- a/include/linux/swiotlb.h
> +++ b/include/linux/swiotlb.h
> @@ -5,6 +5,9 @@
> #include
> #include
> #include
> +#ifndef CONFIG_SWIOTLB
> +#include
> +#endif
>
> struct device;
> struct page;
> --
> 2.28.0
>
> --
> Cheers,
> Stephen Rothwell
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
___
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 (arm
multi_v7_defconfig) failed like this:
In file included from drivers/gpu/drm/nouveau/nouveau_ttm.c:26:
include/linux/swiotlb.h: In function 'swiotlb_max_mapping_size':
include/linux/swiotlb.h:99:9: error: 'SIZE_MAX' undeclared (first use in this
function)
99 | return SIZE_MAX;
| ^~~~
include/linux/swiotlb.h:7:1: note: 'SIZE_MAX' is defined in header
''; did you forget to '#include '?
6 | #include
+++ |+#include
7 | #include
include/linux/swiotlb.h:99:9: note: each undeclared identifier is reported only
once for each function it appears in
99 | return SIZE_MAX;
| ^~~~
Caused by commit
abe420bfae52 ("swiotlb: Introduce swiotlb_max_mapping_size()")
but only exposed by commit
4dbafbd30aef ("drm/nouveu: fix swiotlb include")
I applied the following fix for today:
From: Stephen Rothwell
Date: Mon, 2 Nov 2020 12:34:57 +1100
Subject: [PATCH] swiotlb: using SIZE_MAX needs limits.h included
Fixes: abe420bfae52 ("swiotlb: Introduce swiotlb_max_mapping_size()")
Signed-off-by: Stephen Rothwell
---
include/linux/swiotlb.h | 3 +++
1 file changed, 3 insertions(+)
diff --git a/include/linux/swiotlb.h b/include/linux/swiotlb.h
index 513913ff7486..ed9de7855d3b 100644
--- a/include/linux/swiotlb.h
+++ b/include/linux/swiotlb.h
@@ -5,6 +5,9 @@
#include
#include
#include
+#ifndef CONFIG_SWIOTLB
+#include
+#endif
struct device;
struct page;
--
2.28.0
--
Cheers,
Stephen Rothwell
pgpHheJznw0cF.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
Am 30.10.20 um 01:07 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/nouveau/nouveau_ttm.c: In function 'nouveau_ttm_init':
drivers/gpu/drm/nouveau/nouveau_ttm.c:320:19: error: implicit declaration of
function 'swiotlb_nr_tbl' [-Werror=implicit-function-declaration]
320 | need_swiotlb = !!swiotlb_nr_tbl();
| ^~
Mhm, thanks for the note. Looks like there is some merge conflict to me.
In my tree there is an "#if IS_ENABLED(CONFIG_SWIOTLB) &&
IS_ENABLED(CONFIG_X86)" around that line making sure the function is
available.
Going to take a look later today.
Christian.
Caused by commit
ee5d2a8e549e ("drm/ttm: wire up the new pool as default one v2")
I have used the drm-misc tree from next-20201029 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 (x86_64
allmodconfig) failed like this:
drivers/gpu/drm/nouveau/nouveau_ttm.c: In function 'nouveau_ttm_init':
drivers/gpu/drm/nouveau/nouveau_ttm.c:320:19: error: implicit declaration of
function 'swiotlb_nr_tbl' [-Werror=implicit-function-declaration]
320 | need_swiotlb = !!swiotlb_nr_tbl();
| ^~
Caused by commit
ee5d2a8e549e ("drm/ttm: wire up the new pool as default one v2")
I have used the drm-misc tree from next-20201029 for today.
--
Cheers,
Stephen Rothwell
pgphBefRSHmHF.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 Stephen,
Le lun. 12 oct. 2020 à 15:24, Stephen Rothwell
a écrit :
Hi all,
On Thu, 8 Oct 2020 15:42:02 +1100 Stephen Rothwell
wrote:
On Thu, 8 Oct 2020 14:09:03 +1100 Stephen Rothwell
wrote:
>
> After merging the drm-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
In file included from include/linux/clk.h:13,
from drivers/gpu/drm/ingenic/ingenic-drm-drv.c:10:
drivers/gpu/drm/ingenic/ingenic-drm-drv.c: In function
'ingenic_drm_update_palette':
drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:35: error: 'struct
ingenic_drm' has no member named 'dma_hwdescs'; did you mean
'dma_hwdesc_f0'?
448 | for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette);
i++) {
| ^~~
include/linux/kernel.h:47:33: note: in definition of macro
'ARRAY_SIZE'
47 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) +
__must_be_array(arr))
| ^~~
drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:35: error: 'struct
ingenic_drm' has no member named 'dma_hwdescs'; did you mean
'dma_hwdesc_f0'?
448 | for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette);
i++) {
| ^~~
include/linux/kernel.h:47:48: note: in definition of macro
'ARRAY_SIZE'
47 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) +
__must_be_array(arr))
|^~~
In file included from include/linux/bits.h:22,
from include/linux/bitops.h:5,
from drivers/gpu/drm/ingenic/ingenic-drm.h:10,
from drivers/gpu/drm/ingenic/ingenic-drm-drv.c:7:
drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:35: error: 'struct
ingenic_drm' has no member named 'dma_hwdescs'; did you mean
'dma_hwdesc_f0'?
448 | for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette);
i++) {
| ^~~
include/linux/build_bug.h:16:62: note: in definition of macro
'BUILD_BUG_ON_ZERO'
16 | #define BUILD_BUG_ON_ZERO(e) ((int)(sizeof(struct {
int:(-!!(e)); })))
|
^
include/linux/compiler.h:224:46: note: in expansion of macro
'__same_type'
224 | #define __must_be_array(a)
BUILD_BUG_ON_ZERO(__same_type((a), &(a)[0]))
| ^~~
include/linux/kernel.h:47:59: note: in expansion of macro
'__must_be_array'
47 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) +
__must_be_array(arr))
|
^~~
drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:18: note: in
expansion of macro 'ARRAY_SIZE'
448 | for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette);
i++) {
| ^~
drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:35: error: 'struct
ingenic_drm' has no member named 'dma_hwdescs'; did you mean
'dma_hwdesc_f0'?
448 | for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette);
i++) {
| ^~~
include/linux/build_bug.h:16:62: note: in definition of macro
'BUILD_BUG_ON_ZERO'
16 | #define BUILD_BUG_ON_ZERO(e) ((int)(sizeof(struct {
int:(-!!(e)); })))
|
^
include/linux/compiler.h:224:46: note: in expansion of macro
'__same_type'
224 | #define __must_be_array(a)
BUILD_BUG_ON_ZERO(__same_type((a), &(a)[0]))
| ^~~
include/linux/kernel.h:47:59: note: in expansion of macro
'__must_be_array'
47 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) +
__must_be_array(arr))
|
^~~
drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:18: note: in
expansion of macro 'ARRAY_SIZE'
448 | for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette);
i++) {
| ^~
include/linux/build_bug.h:16:51: error: bit-field ''
width not an integer constant
16 | #define BUILD_BUG_ON_ZERO(e) ((int)(sizeof(struct {
int:(-!!(e)); })))
| ^
include/linux/compiler.h:224:28: note: in expansion of macro
'BUILD_BUG_ON_ZERO'
224 | #define __must_be_array(a)
BUILD_BUG_ON_ZERO(__same_type((a), &(a)[0]))
|^
include/linux/kernel.h:47:59: note: in expansion of macro
'__must_be_array'
47 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) +
__must_be_array(arr))
|
^~~
drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:18: note: in
expansion of macro 'ARRAY_SIZE'
448 | for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette);
i++) {
Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi Stephen,
Le lun. 12 oct. 2020 à 15:24, Stephen Rothwell
a écrit :
Hi all,
On Thu, 8 Oct 2020 15:42:02 +1100 Stephen Rothwell
wrote:
On Thu, 8 Oct 2020 14:09:03 +1100 Stephen Rothwell
wrote:
>
> After merging the drm-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
In file included from include/linux/clk.h:13,
from drivers/gpu/drm/ingenic/ingenic-drm-drv.c:10:
drivers/gpu/drm/ingenic/ingenic-drm-drv.c: In function
'ingenic_drm_update_palette':
drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:35: error: 'struct
ingenic_drm' has no member named 'dma_hwdescs'; did you mean
'dma_hwdesc_f0'?
448 | for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette);
i++) {
| ^~~
include/linux/kernel.h:47:33: note: in definition of macro
'ARRAY_SIZE'
47 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) +
__must_be_array(arr))
| ^~~
drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:35: error: 'struct
ingenic_drm' has no member named 'dma_hwdescs'; did you mean
'dma_hwdesc_f0'?
448 | for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette);
i++) {
| ^~~
include/linux/kernel.h:47:48: note: in definition of macro
'ARRAY_SIZE'
47 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) +
__must_be_array(arr))
|^~~
In file included from include/linux/bits.h:22,
from include/linux/bitops.h:5,
from drivers/gpu/drm/ingenic/ingenic-drm.h:10,
from drivers/gpu/drm/ingenic/ingenic-drm-drv.c:7:
drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:35: error: 'struct
ingenic_drm' has no member named 'dma_hwdescs'; did you mean
'dma_hwdesc_f0'?
448 | for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette);
i++) {
| ^~~
include/linux/build_bug.h:16:62: note: in definition of macro
'BUILD_BUG_ON_ZERO'
16 | #define BUILD_BUG_ON_ZERO(e) ((int)(sizeof(struct {
int:(-!!(e)); })))
|
^
include/linux/compiler.h:224:46: note: in expansion of macro
'__same_type'
224 | #define __must_be_array(a)
BUILD_BUG_ON_ZERO(__same_type((a), &(a)[0]))
| ^~~
include/linux/kernel.h:47:59: note: in expansion of macro
'__must_be_array'
47 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) +
__must_be_array(arr))
|
^~~
drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:18: note: in
expansion of macro 'ARRAY_SIZE'
448 | for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette);
i++) {
| ^~
drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:35: error: 'struct
ingenic_drm' has no member named 'dma_hwdescs'; did you mean
'dma_hwdesc_f0'?
448 | for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette);
i++) {
| ^~~
include/linux/build_bug.h:16:62: note: in definition of macro
'BUILD_BUG_ON_ZERO'
16 | #define BUILD_BUG_ON_ZERO(e) ((int)(sizeof(struct {
int:(-!!(e)); })))
|
^
include/linux/compiler.h:224:46: note: in expansion of macro
'__same_type'
224 | #define __must_be_array(a)
BUILD_BUG_ON_ZERO(__same_type((a), &(a)[0]))
| ^~~
include/linux/kernel.h:47:59: note: in expansion of macro
'__must_be_array'
47 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) +
__must_be_array(arr))
|
^~~
drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:18: note: in
expansion of macro 'ARRAY_SIZE'
448 | for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette);
i++) {
| ^~
include/linux/build_bug.h:16:51: error: bit-field ''
width not an integer constant
16 | #define BUILD_BUG_ON_ZERO(e) ((int)(sizeof(struct {
int:(-!!(e)); })))
| ^
include/linux/compiler.h:224:28: note: in expansion of macro
'BUILD_BUG_ON_ZERO'
224 | #define __must_be_array(a)
BUILD_BUG_ON_ZERO(__same_type((a), &(a)[0]))
|^
include/linux/kernel.h:47:59: note: in expansion of macro
'__must_be_array'
47 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) +
__must_be_array(arr))
|
^~~
drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:18: note: in
expansion of macro 'ARRAY_SIZE'
448 | for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette);
i++) {
Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi all,
[Just adding Dave to cc's]
On Mon, 12 Oct 2020 15:24:52 +1100 Stephen Rothwell
wrote:
>
> Hi all,
>
> On Thu, 8 Oct 2020 15:42:02 +1100 Stephen Rothwell
> wrote:
> >
> > On Thu, 8 Oct 2020 14:09:03 +1100 Stephen Rothwell
> > wrote:
> > >
> > > After merging the drm-misc tree, today's linux-next build (x86_64
> > > allmodconfig) failed like this:
> >
> > In file included from include/linux/clk.h:13,
> > from drivers/gpu/drm/ingenic/ingenic-drm-drv.c:10:
> > drivers/gpu/drm/ingenic/ingenic-drm-drv.c: In function
> > 'ingenic_drm_update_palette':
> > drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:35: error: 'struct
> > ingenic_drm' has no member named 'dma_hwdescs'; did you mean
> > 'dma_hwdesc_f0'?
> > 448 | for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette); i++) {
> > | ^~~
> > include/linux/kernel.h:47:33: note: in definition of macro 'ARRAY_SIZE'
> >47 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) +
> > __must_be_array(arr))
> > | ^~~
> > drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:35: error: 'struct
> > ingenic_drm' has no member named 'dma_hwdescs'; did you mean
> > 'dma_hwdesc_f0'?
> > 448 | for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette); i++) {
> > | ^~~
> > include/linux/kernel.h:47:48: note: in definition of macro 'ARRAY_SIZE'
> >47 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) +
> > __must_be_array(arr))
> > |^~~
> > In file included from include/linux/bits.h:22,
> > from include/linux/bitops.h:5,
> > from drivers/gpu/drm/ingenic/ingenic-drm.h:10,
> > from drivers/gpu/drm/ingenic/ingenic-drm-drv.c:7:
> > drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:35: error: 'struct
> > ingenic_drm' has no member named 'dma_hwdescs'; did you mean
> > 'dma_hwdesc_f0'?
> > 448 | for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette); i++) {
> > | ^~~
> > include/linux/build_bug.h:16:62: note: in definition of macro
> > 'BUILD_BUG_ON_ZERO'
> >16 | #define BUILD_BUG_ON_ZERO(e) ((int)(sizeof(struct { int:(-!!(e));
> > })))
> > | ^
> > include/linux/compiler.h:224:46: note: in expansion of macro '__same_type'
> > 224 | #define __must_be_array(a) BUILD_BUG_ON_ZERO(__same_type((a),
> > &(a)[0]))
> > | ^~~
> > include/linux/kernel.h:47:59: note: in expansion of macro '__must_be_array'
> >47 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) +
> > __must_be_array(arr))
> > |
> > ^~~
> > drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:18: note: in expansion of
> > macro 'ARRAY_SIZE'
> > 448 | for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette); i++) {
> > | ^~
> > drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:35: error: 'struct
> > ingenic_drm' has no member named 'dma_hwdescs'; did you mean
> > 'dma_hwdesc_f0'?
> > 448 | for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette); i++) {
> > | ^~~
> > include/linux/build_bug.h:16:62: note: in definition of macro
> > 'BUILD_BUG_ON_ZERO'
> >16 | #define BUILD_BUG_ON_ZERO(e) ((int)(sizeof(struct { int:(-!!(e));
> > })))
> > | ^
> > include/linux/compiler.h:224:46: note: in expansion of macro '__same_type'
> > 224 | #define __must_be_array(a) BUILD_BUG_ON_ZERO(__same_type((a),
> > &(a)[0]))
> > | ^~~
> > include/linux/kernel.h:47:59: note: in expansion of macro '__must_be_array'
> >47 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) +
> > __must_be_array(arr))
> > |
> > ^~~
> > drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:18: note: in expansion of
> > macro 'ARRAY_SIZE'
> > 448 | for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette); i++) {
> > | ^~
> > include/linux/build_bug.h:16:51: error: bit-field '' width not
> > an integer constant
> >16 | #define BUILD_BUG_ON_ZERO(e) ((int)(sizeof(struct { int:(-!!(e));
> > })))
> > | ^
> > include/linux/compiler.h:224:28: note: in expansion of macro
> > 'BUILD_BUG_ON_ZERO'
> > 224 | #define __must_be_array(a) BUILD_BUG_ON_ZERO(__same_type((a),
> > &(a)[0]))
> > |^
> > include/linux/kernel.h:47:59: note: in expansion of macro '__must_be_array'
> >47 | #define
Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi all,
On Thu, 8 Oct 2020 15:42:02 +1100 Stephen Rothwell
wrote:
>
> On Thu, 8 Oct 2020 14:09:03 +1100 Stephen Rothwell
> wrote:
> >
> > After merging the drm-misc tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
>
> In file included from include/linux/clk.h:13,
> from drivers/gpu/drm/ingenic/ingenic-drm-drv.c:10:
> drivers/gpu/drm/ingenic/ingenic-drm-drv.c: In function
> 'ingenic_drm_update_palette':
> drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:35: error: 'struct ingenic_drm'
> has no member named 'dma_hwdescs'; did you mean 'dma_hwdesc_f0'?
> 448 | for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette); i++) {
> | ^~~
> include/linux/kernel.h:47:33: note: in definition of macro 'ARRAY_SIZE'
>47 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) +
> __must_be_array(arr))
> | ^~~
> drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:35: error: 'struct ingenic_drm'
> has no member named 'dma_hwdescs'; did you mean 'dma_hwdesc_f0'?
> 448 | for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette); i++) {
> | ^~~
> include/linux/kernel.h:47:48: note: in definition of macro 'ARRAY_SIZE'
>47 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) +
> __must_be_array(arr))
> |^~~
> In file included from include/linux/bits.h:22,
> from include/linux/bitops.h:5,
> from drivers/gpu/drm/ingenic/ingenic-drm.h:10,
> from drivers/gpu/drm/ingenic/ingenic-drm-drv.c:7:
> drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:35: error: 'struct ingenic_drm'
> has no member named 'dma_hwdescs'; did you mean 'dma_hwdesc_f0'?
> 448 | for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette); i++) {
> | ^~~
> include/linux/build_bug.h:16:62: note: in definition of macro
> 'BUILD_BUG_ON_ZERO'
>16 | #define BUILD_BUG_ON_ZERO(e) ((int)(sizeof(struct { int:(-!!(e)); })))
> | ^
> include/linux/compiler.h:224:46: note: in expansion of macro '__same_type'
> 224 | #define __must_be_array(a) BUILD_BUG_ON_ZERO(__same_type((a),
> &(a)[0]))
> | ^~~
> include/linux/kernel.h:47:59: note: in expansion of macro '__must_be_array'
>47 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) +
> __must_be_array(arr))
> |
> ^~~
> drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:18: note: in expansion of macro
> 'ARRAY_SIZE'
> 448 | for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette); i++) {
> | ^~
> drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:35: error: 'struct ingenic_drm'
> has no member named 'dma_hwdescs'; did you mean 'dma_hwdesc_f0'?
> 448 | for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette); i++) {
> | ^~~
> include/linux/build_bug.h:16:62: note: in definition of macro
> 'BUILD_BUG_ON_ZERO'
>16 | #define BUILD_BUG_ON_ZERO(e) ((int)(sizeof(struct { int:(-!!(e)); })))
> | ^
> include/linux/compiler.h:224:46: note: in expansion of macro '__same_type'
> 224 | #define __must_be_array(a) BUILD_BUG_ON_ZERO(__same_type((a),
> &(a)[0]))
> | ^~~
> include/linux/kernel.h:47:59: note: in expansion of macro '__must_be_array'
>47 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) +
> __must_be_array(arr))
> |
> ^~~
> drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:18: note: in expansion of macro
> 'ARRAY_SIZE'
> 448 | for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette); i++) {
> | ^~
> include/linux/build_bug.h:16:51: error: bit-field '' width not an
> integer constant
>16 | #define BUILD_BUG_ON_ZERO(e) ((int)(sizeof(struct { int:(-!!(e)); })))
> | ^
> include/linux/compiler.h:224:28: note: in expansion of macro
> 'BUILD_BUG_ON_ZERO'
> 224 | #define __must_be_array(a) BUILD_BUG_ON_ZERO(__same_type((a),
> &(a)[0]))
> |^
> include/linux/kernel.h:47:59: note: in expansion of macro '__must_be_array'
>47 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) +
> __must_be_array(arr))
> |
> ^~~
> drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:18: note: in expansion of macro
> 'ARRAY_SIZE'
> 448 | for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette);
Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi all,
On Thu, 8 Oct 2020 14:09:03 +1100 Stephen Rothwell
wrote:
>
> After merging the drm-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
In file included from include/linux/clk.h:13,
from drivers/gpu/drm/ingenic/ingenic-drm-drv.c:10:
drivers/gpu/drm/ingenic/ingenic-drm-drv.c: In function
'ingenic_drm_update_palette':
drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:35: error: 'struct ingenic_drm'
has no member named 'dma_hwdescs'; did you mean 'dma_hwdesc_f0'?
448 | for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette); i++) {
| ^~~
include/linux/kernel.h:47:33: note: in definition of macro 'ARRAY_SIZE'
47 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) +
__must_be_array(arr))
| ^~~
drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:35: error: 'struct ingenic_drm'
has no member named 'dma_hwdescs'; did you mean 'dma_hwdesc_f0'?
448 | for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette); i++) {
| ^~~
include/linux/kernel.h:47:48: note: in definition of macro 'ARRAY_SIZE'
47 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) +
__must_be_array(arr))
|^~~
In file included from include/linux/bits.h:22,
from include/linux/bitops.h:5,
from drivers/gpu/drm/ingenic/ingenic-drm.h:10,
from drivers/gpu/drm/ingenic/ingenic-drm-drv.c:7:
drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:35: error: 'struct ingenic_drm'
has no member named 'dma_hwdescs'; did you mean 'dma_hwdesc_f0'?
448 | for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette); i++) {
| ^~~
include/linux/build_bug.h:16:62: note: in definition of macro
'BUILD_BUG_ON_ZERO'
16 | #define BUILD_BUG_ON_ZERO(e) ((int)(sizeof(struct { int:(-!!(e)); })))
| ^
include/linux/compiler.h:224:46: note: in expansion of macro '__same_type'
224 | #define __must_be_array(a) BUILD_BUG_ON_ZERO(__same_type((a), &(a)[0]))
| ^~~
include/linux/kernel.h:47:59: note: in expansion of macro '__must_be_array'
47 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) +
__must_be_array(arr))
|
^~~
drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:18: note: in expansion of macro
'ARRAY_SIZE'
448 | for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette); i++) {
| ^~
drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:35: error: 'struct ingenic_drm'
has no member named 'dma_hwdescs'; did you mean 'dma_hwdesc_f0'?
448 | for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette); i++) {
| ^~~
include/linux/build_bug.h:16:62: note: in definition of macro
'BUILD_BUG_ON_ZERO'
16 | #define BUILD_BUG_ON_ZERO(e) ((int)(sizeof(struct { int:(-!!(e)); })))
| ^
include/linux/compiler.h:224:46: note: in expansion of macro '__same_type'
224 | #define __must_be_array(a) BUILD_BUG_ON_ZERO(__same_type((a), &(a)[0]))
| ^~~
include/linux/kernel.h:47:59: note: in expansion of macro '__must_be_array'
47 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) +
__must_be_array(arr))
|
^~~
drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:18: note: in expansion of macro
'ARRAY_SIZE'
448 | for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette); i++) {
| ^~
include/linux/build_bug.h:16:51: error: bit-field '' width not an
integer constant
16 | #define BUILD_BUG_ON_ZERO(e) ((int)(sizeof(struct { int:(-!!(e)); })))
| ^
include/linux/compiler.h:224:28: note: in expansion of macro 'BUILD_BUG_ON_ZERO'
224 | #define __must_be_array(a) BUILD_BUG_ON_ZERO(__same_type((a), &(a)[0]))
|^
include/linux/kernel.h:47:59: note: in expansion of macro '__must_be_array'
47 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) +
__must_be_array(arr))
|
^~~
drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:18: note: in expansion of macro
'ARRAY_SIZE'
448 | for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette); i++) {
| ^~
drivers/gpu/drm/ingenic/ingenic-drm-drv.c:453:9: error: 'struct ingenic_drm'
has no member named 'dma_hwdescs'; did you mean 'dma_hwdesc_f0'?
453 | priv->dma_hwdescs->palette[i] = color;
|
[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: I noticed that the ingenic driver revert I had been waiting for appeared in hte drm-misc tree, so I removed the BROKEN dependency for it, but it produced the above errors, so I have marked it BROKEN again. -- Cheers, Stephen Rothwell pgpzU0SuNYvli.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 all,
On Wed, 26 Aug 2020 10:55:47 +1000 Stephen Rothwell
wrote:
>
> After merging the drm-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/gpu/drm/qxl/qxl_display.c: In function
> 'qxl_display_read_client_monitors_config':
> include/drm/drm_modeset_lock.h:167:7: error: implicit declaration of function
> 'drm_drv_uses_atomic_modeset' [-Werror=implicit-function-declaration]
> 167 | if (!drm_drv_uses_atomic_modeset(dev))\
> | ^~~
> drivers/gpu/drm/qxl/qxl_display.c:187:2: note: in expansion of macro
> 'DRM_MODESET_LOCK_ALL_BEGIN'
> 187 | DRM_MODESET_LOCK_ALL_BEGIN(dev, ctx,
> DRM_MODESET_ACQUIRE_INTERRUPTIBLE, ret);
> | ^~
> drivers/gpu/drm/qxl/qxl_display.c:189:35: error: macro
> "DRM_MODESET_LOCK_ALL_END" requires 3 arguments, but only 2 given
> 189 | DRM_MODESET_LOCK_ALL_END(ctx, ret);
> | ^
> In file included from include/drm/drm_crtc.h:36,
> from include/drm/drm_atomic.h:31,
> from drivers/gpu/drm/qxl/qxl_display.c:29:
> include/drm/drm_modeset_lock.h:194: note: macro "DRM_MODESET_LOCK_ALL_END"
> defined here
> 194 | #define DRM_MODESET_LOCK_ALL_END(dev, ctx, ret)\
> |
> drivers/gpu/drm/qxl/qxl_display.c:189:2: error: 'DRM_MODESET_LOCK_ALL_END'
> undeclared (first use in this function)
> 189 | DRM_MODESET_LOCK_ALL_END(ctx, ret);
> | ^~~~
> drivers/gpu/drm/qxl/qxl_display.c:189:2: note: each undeclared identifier is
> reported only once for each function it appears in
> drivers/gpu/drm/qxl/qxl_display.c:187:2: error: label 'modeset_lock_fail'
> used but not defined
> 187 | DRM_MODESET_LOCK_ALL_BEGIN(dev, ctx,
> DRM_MODESET_ACQUIRE_INTERRUPTIBLE, ret);
> | ^~
> In file included from include/drm/drm_crtc.h:36,
> from include/drm/drm_atomic.h:31,
> from drivers/gpu/drm/qxl/qxl_display.c:29:
> include/drm/drm_modeset_lock.h:170:1: warning: label 'modeset_lock_retry'
> defined but not used [-Wunused-label]
> 170 | modeset_lock_retry: \
> | ^~
> drivers/gpu/drm/qxl/qxl_display.c:187:2: note: in expansion of macro
> 'DRM_MODESET_LOCK_ALL_BEGIN'
> 187 | DRM_MODESET_LOCK_ALL_BEGIN(dev, ctx,
> DRM_MODESET_ACQUIRE_INTERRUPTIBLE, ret);
> | ^~
> drivers/gpu/drm/qxl/qxl_display.c: In function
> 'qxl_framebuffer_surface_dirty':
> drivers/gpu/drm/qxl/qxl_display.c:434:35: error: macro
> "DRM_MODESET_LOCK_ALL_END" requires 3 arguments, but only 2 given
> 434 | DRM_MODESET_LOCK_ALL_END(ctx, ret);
> | ^
> In file included from include/drm/drm_crtc.h:36,
> from include/drm/drm_atomic.h:31,
> from drivers/gpu/drm/qxl/qxl_display.c:29:
> include/drm/drm_modeset_lock.h:194: note: macro "DRM_MODESET_LOCK_ALL_END"
> defined here
> 194 | #define DRM_MODESET_LOCK_ALL_END(dev, ctx, ret)\
> |
> drivers/gpu/drm/qxl/qxl_display.c:434:2: error: 'DRM_MODESET_LOCK_ALL_END'
> undeclared (first use in this function)
> 434 | DRM_MODESET_LOCK_ALL_END(ctx, ret);
> | ^~~~
> drivers/gpu/drm/qxl/qxl_display.c:411:2: error: label 'modeset_lock_fail'
> used but not defined
> 411 | DRM_MODESET_LOCK_ALL_BEGIN(fb->dev, ctx,
> DRM_MODESET_ACQUIRE_INTERRUPTIBLE, ret);
> | ^~
> In file included from include/drm/drm_crtc.h:36,
> from include/drm/drm_atomic.h:31,
> from drivers/gpu/drm/qxl/qxl_display.c:29:
> include/drm/drm_modeset_lock.h:170:1: warning: label 'modeset_lock_retry'
> defined but not used [-Wunused-label]
> 170 | modeset_lock_retry: \
> | ^~
> drivers/gpu/drm/qxl/qxl_display.c:411:2: note: in expansion of macro
> 'DRM_MODESET_LOCK_ALL_BEGIN'
> 411 | DRM_MODESET_LOCK_ALL_BEGIN(fb->dev, ctx,
> DRM_MODESET_ACQUIRE_INTERRUPTIBLE, ret);
> | ^~
>
> Caused by commit
>
> bbaac1354cc9 ("drm/qxl: Replace deprecated function in qxl_display")
>
> interacting with commit
>
> 77ef38574beb ("drm/modeset-lock: Take the modeset BKL for legacy drivers")
>
> from the drm-misc-fixes tree.
>
> drivers/gpu/drm/qxl/qxl_display.c manages to include
> drm/drm_modeset_lock.h by some indirect route, but fails to have
> drm/drm_drv.h similarly included. In fact, drm/drm_modeset_lock.h should
> have included drm/drm_drv.h since it uses things declared there, and
> drivers/gpu/drm/qxl/qxl_display.c should include drm/drm_modeset_lock.h
> similarly.
>
> I have added the following hack patch for today.
>
> From: Stephen Rothwell
> Date: Wed, 26 Aug 2020 10:40:18 +1000
> Subject: [PATCH] fix interaction with drm-misc-fix commit
>
> Signed-off-by: Stephen Rothwell
> ---
> drivers/gpu/drm/qxl/qxl_display.c | 5 +++--
>
[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/qxl/qxl_display.c: In function
'qxl_display_read_client_monitors_config':
include/drm/drm_modeset_lock.h:167:7: error: implicit declaration of function
'drm_drv_uses_atomic_modeset' [-Werror=implicit-function-declaration]
167 | if (!drm_drv_uses_atomic_modeset(dev))\
| ^~~
drivers/gpu/drm/qxl/qxl_display.c:187:2: note: in expansion of macro
'DRM_MODESET_LOCK_ALL_BEGIN'
187 | DRM_MODESET_LOCK_ALL_BEGIN(dev, ctx,
DRM_MODESET_ACQUIRE_INTERRUPTIBLE, ret);
| ^~
drivers/gpu/drm/qxl/qxl_display.c:189:35: error: macro
"DRM_MODESET_LOCK_ALL_END" requires 3 arguments, but only 2 given
189 | DRM_MODESET_LOCK_ALL_END(ctx, ret);
| ^
In file included from include/drm/drm_crtc.h:36,
from include/drm/drm_atomic.h:31,
from drivers/gpu/drm/qxl/qxl_display.c:29:
include/drm/drm_modeset_lock.h:194: note: macro "DRM_MODESET_LOCK_ALL_END"
defined here
194 | #define DRM_MODESET_LOCK_ALL_END(dev, ctx, ret)\
|
drivers/gpu/drm/qxl/qxl_display.c:189:2: error: 'DRM_MODESET_LOCK_ALL_END'
undeclared (first use in this function)
189 | DRM_MODESET_LOCK_ALL_END(ctx, ret);
| ^~~~
drivers/gpu/drm/qxl/qxl_display.c:189:2: note: each undeclared identifier is
reported only once for each function it appears in
drivers/gpu/drm/qxl/qxl_display.c:187:2: error: label 'modeset_lock_fail' used
but not defined
187 | DRM_MODESET_LOCK_ALL_BEGIN(dev, ctx,
DRM_MODESET_ACQUIRE_INTERRUPTIBLE, ret);
| ^~
In file included from include/drm/drm_crtc.h:36,
from include/drm/drm_atomic.h:31,
from drivers/gpu/drm/qxl/qxl_display.c:29:
include/drm/drm_modeset_lock.h:170:1: warning: label 'modeset_lock_retry'
defined but not used [-Wunused-label]
170 | modeset_lock_retry: \
| ^~
drivers/gpu/drm/qxl/qxl_display.c:187:2: note: in expansion of macro
'DRM_MODESET_LOCK_ALL_BEGIN'
187 | DRM_MODESET_LOCK_ALL_BEGIN(dev, ctx,
DRM_MODESET_ACQUIRE_INTERRUPTIBLE, ret);
| ^~
drivers/gpu/drm/qxl/qxl_display.c: In function 'qxl_framebuffer_surface_dirty':
drivers/gpu/drm/qxl/qxl_display.c:434:35: error: macro
"DRM_MODESET_LOCK_ALL_END" requires 3 arguments, but only 2 given
434 | DRM_MODESET_LOCK_ALL_END(ctx, ret);
| ^
In file included from include/drm/drm_crtc.h:36,
from include/drm/drm_atomic.h:31,
from drivers/gpu/drm/qxl/qxl_display.c:29:
include/drm/drm_modeset_lock.h:194: note: macro "DRM_MODESET_LOCK_ALL_END"
defined here
194 | #define DRM_MODESET_LOCK_ALL_END(dev, ctx, ret)\
|
drivers/gpu/drm/qxl/qxl_display.c:434:2: error: 'DRM_MODESET_LOCK_ALL_END'
undeclared (first use in this function)
434 | DRM_MODESET_LOCK_ALL_END(ctx, ret);
| ^~~~
drivers/gpu/drm/qxl/qxl_display.c:411:2: error: label 'modeset_lock_fail' used
but not defined
411 | DRM_MODESET_LOCK_ALL_BEGIN(fb->dev, ctx,
DRM_MODESET_ACQUIRE_INTERRUPTIBLE, ret);
| ^~
In file included from include/drm/drm_crtc.h:36,
from include/drm/drm_atomic.h:31,
from drivers/gpu/drm/qxl/qxl_display.c:29:
include/drm/drm_modeset_lock.h:170:1: warning: label 'modeset_lock_retry'
defined but not used [-Wunused-label]
170 | modeset_lock_retry: \
| ^~
drivers/gpu/drm/qxl/qxl_display.c:411:2: note: in expansion of macro
'DRM_MODESET_LOCK_ALL_BEGIN'
411 | DRM_MODESET_LOCK_ALL_BEGIN(fb->dev, ctx,
DRM_MODESET_ACQUIRE_INTERRUPTIBLE, ret);
| ^~
Caused by commit
bbaac1354cc9 ("drm/qxl: Replace deprecated function in qxl_display")
interacting with commit
77ef38574beb ("drm/modeset-lock: Take the modeset BKL for legacy drivers")
from the drm-misc-fixes tree.
drivers/gpu/drm/qxl/qxl_display.c manages to include
drm/drm_modeset_lock.h by some indirect route, but fails to have
drm/drm_drv.h similarly included. In fact, drm/drm_modeset_lock.h should
have included drm/drm_drv.h since it uses things declared there, and
drivers/gpu/drm/qxl/qxl_display.c should include drm/drm_modeset_lock.h
similarly.
I have added the following hack patch for today.
From: Stephen Rothwell
Date: Wed, 26 Aug 2020 10:40:18 +1000
Subject: [PATCH] fix interaction with drm-misc-fix commit
Signed-off-by: Stephen Rothwell
---
drivers/gpu/drm/qxl/qxl_display.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/qxl/qxl_display.c
b/drivers/gpu/drm/qxl/qxl_display.c
index fa79688013b7..6063f3a15329 100644
--- a/drivers/gpu/drm/qxl/qxl_display.c
+++ b/drivers/gpu/drm/qxl/qxl_display.c
@@ -26,6 +26,7 @@
#include
Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree
Hi Dave, On Wed, 24 Jun 2020 15:47:49 +1000 Dave Airlie wrote: > > My bad, my local builds passed, as I had made the change but forgot > the commit --amend > > Pushed out a new head with it in it now. Excellent, thanks. -- Cheers, Stephen Rothwell pgpiTA7UkNPQK.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
On Wed, 24 Jun 2020 at 11:36, Stephen Rothwell wrote:
>
> Hi all,
>
> On Wed, 17 Jun 2020 10:59:29 +1000 Stephen Rothwell
> wrote:
> >
> > After merging the drm-misc tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
> >
> > drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c: In function
> > 'amdgpu_amdkfd_gpuvm_free_memory_of_gpu':
> > drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c:1357:2: error: implicit
> > declaration of function 'drm_gem_object_put_unlocked'; did you mean
> > 'drm_gem_object_put_locked'? [-Werror=implicit-function-declaration]
> > 1357 | drm_gem_object_put_unlocked(>bo->tbo.base);
> > | ^~~
> > | drm_gem_object_put_locked
> >
> > Caused by commit
> >
> > ab15d56e27be ("drm: remove transient drm_gem_object_put_unlocked()")
> >
> > interacting with commit
> >
> > fd9a9f8801de ("drm/amdgpu: Use GEM obj reference for KFD BOs")
> >
> > from Linus' tree.
> >
> > I have applied the following merge fix up patch for today.
> >
> > From: Stephen Rothwell
> > Date: Wed, 17 Jun 2020 10:55:32 +1000
> > Subject: [PATCH] drm/amdgpu: remove stray drm_gem_object_put_unlocked
> >
> > Signed-off-by: Stephen Rothwell
> > ---
> > drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
> > b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
> > index b91b5171270f..9015c7b76d60 100644
> > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
> > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
> > @@ -1354,7 +1354,7 @@ int amdgpu_amdkfd_gpuvm_free_memory_of_gpu(
> > }
> >
> > /* Free the BO*/
> > - drm_gem_object_put_unlocked(>bo->tbo.base);
> > + drm_gem_object_put(>bo->tbo.base);
> > mutex_destroy(>lock);
> > kfree(mem);
> >
> > --
> > 2.26.2
>
> This fix is now needed when I merge the drm tree :-(
>
> Given that the drm tree is based on v5.8-rc2 and the commit from Linus'
> tree above was merged before v5.8-rc1, the above patch should be
> applied to the drm tree (and should have been part of the patch that
> merged the drm-misc tree). I am a bit suprised that the drm tree
> currently passes CI.
My bad, my local builds passed, as I had made the change but forgot
the commit --amend
Pushed out a new head with it in it now.
Dave.
___
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 all,
On Wed, 17 Jun 2020 10:59:29 +1000 Stephen Rothwell
wrote:
>
> After merging the drm-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c: In function
> 'amdgpu_amdkfd_gpuvm_free_memory_of_gpu':
> drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c:1357:2: error: implicit
> declaration of function 'drm_gem_object_put_unlocked'; did you mean
> 'drm_gem_object_put_locked'? [-Werror=implicit-function-declaration]
> 1357 | drm_gem_object_put_unlocked(>bo->tbo.base);
> | ^~~
> | drm_gem_object_put_locked
>
> Caused by commit
>
> ab15d56e27be ("drm: remove transient drm_gem_object_put_unlocked()")
>
> interacting with commit
>
> fd9a9f8801de ("drm/amdgpu: Use GEM obj reference for KFD BOs")
>
> from Linus' tree.
>
> I have applied the following merge fix up patch for today.
>
> From: Stephen Rothwell
> Date: Wed, 17 Jun 2020 10:55:32 +1000
> Subject: [PATCH] drm/amdgpu: remove stray drm_gem_object_put_unlocked
>
> Signed-off-by: Stephen Rothwell
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
> b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
> index b91b5171270f..9015c7b76d60 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
> @@ -1354,7 +1354,7 @@ int amdgpu_amdkfd_gpuvm_free_memory_of_gpu(
> }
>
> /* Free the BO*/
> - drm_gem_object_put_unlocked(>bo->tbo.base);
> + drm_gem_object_put(>bo->tbo.base);
> mutex_destroy(>lock);
> kfree(mem);
>
> --
> 2.26.2
This fix is now needed when I merge the drm tree :-(
Given that the drm tree is based on v5.8-rc2 and the commit from Linus'
tree above was merged before v5.8-rc1, the above patch should be
applied to the drm tree (and should have been part of the patch that
merged the drm-misc tree). I am a bit suprised that the drm tree
currently passes CI.
Sorry, Dave, for not cc'ing you in the original report.
--
Cheers,
Stephen Rothwell
pgpbXb1oFrwFx.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 Stephen, On Wed, 17 Jun 2020 at 08:03, Stephen Rothwell wrote: > > Hi Thomas, > > On Wed, 17 Jun 2020 08:33:24 +0200 Thomas Zimmermann > wrote: > > > > We recently dropped the _unlock() suffix from drm_gem_object_put(). This > > patch should be ok. > > Yes, but what it shows is that the drm-misc tree is still based on > v5.7-rc1 and v5.8-rc1 has about 16000 more commits for you to get > conflicts against :-) > Being the culprit here - thanks for the patience and report. I believe that both AMD and drm-misc teams are aware of this lovely situation I've put them in. As you mentioned drm-misc is a bit special and doing the usual backmerge will be fun. If you have any tips on how to minimise such issues, I'd gladly utilise them. Thanks again, -Emil ___ 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 Thomas, On Wed, 17 Jun 2020 08:33:24 +0200 Thomas Zimmermann wrote: > > We recently dropped the _unlock() suffix from drm_gem_object_put(). This > patch should be ok. Yes, but what it shows is that the drm-misc tree is still based on v5.7-rc1 and v5.8-rc1 has about 16000 more commits for you to get conflicts against :-) -- Cheers, Stephen Rothwell pgp1cuMZEANkI.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 17.06.20 um 02:59 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_amdkfd_gpuvm.c: In function
> 'amdgpu_amdkfd_gpuvm_free_memory_of_gpu':
> drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c:1357:2: error: implicit
> declaration of function 'drm_gem_object_put_unlocked'; did you mean
> 'drm_gem_object_put_locked'? [-Werror=implicit-function-declaration]
> 1357 | drm_gem_object_put_unlocked(>bo->tbo.base);
> | ^~~
> | drm_gem_object_put_locked
>
> Caused by commit
>
> ab15d56e27be ("drm: remove transient drm_gem_object_put_unlocked()")
>
> interacting with commit
>
> fd9a9f8801de ("drm/amdgpu: Use GEM obj reference for KFD BOs")
>
> from Linus' tree.
>
> I have applied the following merge fix up patch for today.
>
> From: Stephen Rothwell
> Date: Wed, 17 Jun 2020 10:55:32 +1000
> Subject: [PATCH] drm/amdgpu: remove stray drm_gem_object_put_unlocked
>
> Signed-off-by: Stephen Rothwell
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
> b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
> index b91b5171270f..9015c7b76d60 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
> @@ -1354,7 +1354,7 @@ int amdgpu_amdkfd_gpuvm_free_memory_of_gpu(
> }
>
> /* Free the BO*/
> - drm_gem_object_put_unlocked(>bo->tbo.base);
> + drm_gem_object_put(>bo->tbo.base);
We recently dropped the _unlock() suffix from drm_gem_object_put(). This
patch should be ok.
Best regards
Thomas
> mutex_destroy(>lock);
> kfree(mem);
>
>
>
> ___
> dri-devel mailing list
> dri-de...@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
>
--
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
signature.asc
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 (x86_64
allmodconfig) failed like this:
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c: In function
'amdgpu_amdkfd_gpuvm_free_memory_of_gpu':
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c:1357:2: error: implicit
declaration of function 'drm_gem_object_put_unlocked'; did you mean
'drm_gem_object_put_locked'? [-Werror=implicit-function-declaration]
1357 | drm_gem_object_put_unlocked(>bo->tbo.base);
| ^~~
| drm_gem_object_put_locked
Caused by commit
ab15d56e27be ("drm: remove transient drm_gem_object_put_unlocked()")
interacting with commit
fd9a9f8801de ("drm/amdgpu: Use GEM obj reference for KFD BOs")
from Linus' tree.
I have applied the following merge fix up patch for today.
From: Stephen Rothwell
Date: Wed, 17 Jun 2020 10:55:32 +1000
Subject: [PATCH] drm/amdgpu: remove stray drm_gem_object_put_unlocked
Signed-off-by: Stephen Rothwell
---
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
index b91b5171270f..9015c7b76d60 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
@@ -1354,7 +1354,7 @@ int amdgpu_amdkfd_gpuvm_free_memory_of_gpu(
}
/* Free the BO*/
- drm_gem_object_put_unlocked(>bo->tbo.base);
+ drm_gem_object_put(>bo->tbo.base);
mutex_destroy(>lock);
kfree(mem);
--
2.26.2
--
Cheers,
Stephen Rothwell
pgp3Ygr2S8ELT.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
On 4/29/20 10:09 AM, Bartlomiej Zolnierkiewicz wrote:
>
> Hi Stephen,
>
> On 4/29/20 12:33 AM, Stephen Rothwell wrote:
>> Hi all,
>>
>> On Mon, 20 Apr 2020 13:01:18 +1000 Stephen Rothwell
>> wrote:
>>>
>>> After merging the drm-misc tree, today's linux-next build (powerpc
>>> allyesconfig) failed like this:
>>>
>>> drivers/video/fbdev/controlfb.c: In function 'controlfb_mmap':
>>> drivers/video/fbdev/controlfb.c:756:23: error: implicit declaration of
>>> function 'pgprot_cached_wthru'; did you mean 'pgprot_cached'?
>>> [-Werror=implicit-function-declaration]
>>> 756 | vma->vm_page_prot = pgprot_cached_wthru(vma->vm_page_prot);
>>> | ^~~
>>> | pgprot_cached
>>> drivers/video/fbdev/controlfb.c:756:23: error: incompatible types when
>>> assigning to type 'pgprot_t' {aka 'struct '} from type 'int'
>>>
>>> Presumably exposed by commit
>>>
>>> a07a63b0e24d ("video: fbdev: controlfb: add COMPILE_TEST support")
>>>
>>> I just turned off COMPILE_TEST again for today. Please let me know when
>>> this is fixed.
>>
>> This still appears to have not been addressed.
>
> Sorry for the delay, I've just posted a patch (also included below):
>
> "[PATCH] video: fbdev: controlfb: fix build for COMPILE_TEST=y && PPC_PMAC=y
> && PPC32=n"
>
> which should fix it.
>
> Please verify it, thank you!
I have tested it with powerpc allyesconfig now and it adds one dependency too
much,
fixed in v2:
https://lore.kernel.org/lkml/fe520316-3863-e6c4-9581-5d709f49e...@samsung.com/
Sam, could you please review / merge it to drm-misc-next?
Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R Institute Poland
Samsung Electronics
___
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 Stephen,
On 4/29/20 12:33 AM, Stephen Rothwell wrote:
> Hi all,
>
> On Mon, 20 Apr 2020 13:01:18 +1000 Stephen Rothwell
> wrote:
>>
>> After merging the drm-misc tree, today's linux-next build (powerpc
>> allyesconfig) failed like this:
>>
>> drivers/video/fbdev/controlfb.c: In function 'controlfb_mmap':
>> drivers/video/fbdev/controlfb.c:756:23: error: implicit declaration of
>> function 'pgprot_cached_wthru'; did you mean 'pgprot_cached'?
>> [-Werror=implicit-function-declaration]
>> 756 | vma->vm_page_prot = pgprot_cached_wthru(vma->vm_page_prot);
>> | ^~~
>> | pgprot_cached
>> drivers/video/fbdev/controlfb.c:756:23: error: incompatible types when
>> assigning to type 'pgprot_t' {aka 'struct '} from type 'int'
>>
>> Presumably exposed by commit
>>
>> a07a63b0e24d ("video: fbdev: controlfb: add COMPILE_TEST support")
>>
>> I just turned off COMPILE_TEST again for today. Please let me know when
>> this is fixed.
>
> This still appears to have not been addressed.
Sorry for the delay, I've just posted a patch (also included below):
"[PATCH] video: fbdev: controlfb: fix build for COMPILE_TEST=y && PPC_PMAC=y &&
PPC32=n"
which should fix it.
Please verify it, thank you!
Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R Institute Poland
Samsung Electronics
From: Bartlomiej Zolnierkiewicz
Subject: [PATCH] video: fbdev: controlfb: fix build for COMPILE_TEST=y &&
PPC_PMAC=y && PPC32=n
powerpc allyesconfig fails like this:
drivers/video/fbdev/controlfb.c: In function 'controlfb_mmap':
drivers/video/fbdev/controlfb.c:756:23: error: implicit declaration of function
'pgprot_cached_wthru'; did you mean 'pgprot_cached'?
[-Werror=implicit-function-declaration]
756 | vma->vm_page_prot = pgprot_cached_wthru(vma->vm_page_prot);
| ^~~
| pgprot_cached
drivers/video/fbdev/controlfb.c:756:23: error: incompatible types when
assigning to type 'pgprot_t' {aka 'struct '} from type 'int'
Fix it by adding missing PPC32 dependency.
Fixes: a07a63b0e24d ("video: fbdev: controlfb: add COMPILE_TEST support")
Reported-by: Stephen Rothwell
Reported-by: kbuild test robot
Cc: Sam Ravnborg
Cc: Daniel Vetter
Signed-off-by: Bartlomiej Zolnierkiewicz
---
drivers/video/fbdev/controlfb.c |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Index: b/drivers/video/fbdev/controlfb.c
===
--- a/drivers/video/fbdev/controlfb.c
+++ b/drivers/video/fbdev/controlfb.c
@@ -47,7 +47,7 @@
#include
#include
#include
-#ifdef CONFIG_PPC_PMAC
+#if defined(CONFIG_PPC_PMAC) && defined(CONFIG_PPC32)
#include
#include
#endif
@@ -55,7 +55,7 @@
#include "macmodes.h"
#include "controlfb.h"
-#ifndef CONFIG_PPC_PMAC
+#if !defined(CONFIG_PPC_PMAC) || !defined(CONFIG_PPC32)
#define invalid_vram_cache(addr)
#undef in_8
#undef out_8
___
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 all,
On Mon, 20 Apr 2020 13:01:18 +1000 Stephen Rothwell
wrote:
>
> After merging the drm-misc tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
>
> drivers/video/fbdev/controlfb.c: In function 'controlfb_mmap':
> drivers/video/fbdev/controlfb.c:756:23: error: implicit declaration of
> function 'pgprot_cached_wthru'; did you mean 'pgprot_cached'?
> [-Werror=implicit-function-declaration]
> 756 | vma->vm_page_prot = pgprot_cached_wthru(vma->vm_page_prot);
> | ^~~
> | pgprot_cached
> drivers/video/fbdev/controlfb.c:756:23: error: incompatible types when
> assigning to type 'pgprot_t' {aka 'struct '} from type 'int'
>
> Presumably exposed by commit
>
> a07a63b0e24d ("video: fbdev: controlfb: add COMPILE_TEST support")
>
> I just turned off COMPILE_TEST again for today. Please let me know when
> this is fixed.
This still appears to have not been addressed.
--
Cheers,
Stephen Rothwell
pgpOZCSowFN1m.pgp
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/video/fbdev/controlfb.c: In function 'controlfb_mmap':
drivers/video/fbdev/controlfb.c:756:23: error: implicit declaration of function
'pgprot_cached_wthru'; did you mean 'pgprot_cached'?
[-Werror=implicit-function-declaration]
756 | vma->vm_page_prot = pgprot_cached_wthru(vma->vm_page_prot);
| ^~~
| pgprot_cached
drivers/video/fbdev/controlfb.c:756:23: error: incompatible types when
assigning to type 'pgprot_t' {aka 'struct '} from type 'int'
Presumably exposed by commit
a07a63b0e24d ("video: fbdev: controlfb: add COMPILE_TEST support")
I just turned off COMPILE_TEST again for today. Please let me know when
this is fixed.
--
Cheers,
Stephen Rothwell
pgpxu9O9u3X9c.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
On Tue, Dec 17, 2019 at 9:22 PM Stephen Rothwell wrote:
>
> Hi Daniel,
>
> On Tue, 17 Dec 2019 14:19:37 +0100 Daniel Vetter wrote:
> >
> > On Mon, Dec 16, 2019 at 12:23:31PM +1100, Stephen Rothwell wrote:
> > >
> > > After merging the drm-misc tree, today's linux-next build (x86_64
> > > allmodconfig) failed like this:
> > >
> > > drivers/gpu/drm/bridge/analogix/analogix-anx6345.c: In function
> > > 'anx6345_i2c_probe':
> > > drivers/gpu/drm/bridge/analogix/analogix-anx6345.c:738:30: error:
> > > implicit declaration of function 'i2c_new_dummy'
> > > [-Werror=implicit-function-declaration]
> > > 738 |anx6345->i2c_clients[i] = i2c_new_dummy(client->adapter,
> > > | ^
> > > drivers/gpu/drm/bridge/analogix/analogix-anx6345.c:738:28: warning:
> > > assignment to 'struct i2c_client *' from 'int' makes pointer from integer
> > > without a cast [-Wint-conversion]
> > > 738 |anx6345->i2c_clients[i] = i2c_new_dummy(client->adapter,
> > > |^
> > >
> > > Caused by commit
> > >
> > > 6aa192698089 ("drm/bridge: Add Analogix anx6345 support")
> > >
> > > interacting with commit
> > >
> > > 2c2f00ab1641 ("i2c: remove i2c_new_dummy() API")
> > >
> > > From Linus' tree.
> > >
> > > I have applied the following fix up patch for today:
> > >
> > > From: Stephen Rothwell
> > > Date: Mon, 16 Dec 2019 12:11:19 +1100
> > > Subject: [PATCH] drm/bridge: fix up for removal of i2c_new_dummy()
> > >
> > > Signed-off-by: Stephen Rothwell
> >
> > Thanks pulled into drm-next since I just processed the first drm-misc-next
> > pull.
>
> Thanks. For the future, though, merge fixes like this should be part
> of the actual merge commit to avoid bisection problems.
I flip flop on this one, between retaining your contribution
explicitly and merging them in. Usually I squash them in, but this
felt substantial enough to retain explicitly. Worst case if someone is
unlucky they need to git bisect skip once. I guess next time I should
do a topic branch, apply it there on top of the pull, and then pull
that in so that it's both pretty history and no bisect hole.
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
___
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 Daniel,
On Tue, 17 Dec 2019 14:19:37 +0100 Daniel Vetter wrote:
>
> On Mon, Dec 16, 2019 at 12:23:31PM +1100, Stephen Rothwell wrote:
> >
> > After merging the drm-misc tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
> >
> > drivers/gpu/drm/bridge/analogix/analogix-anx6345.c: In function
> > 'anx6345_i2c_probe':
> > drivers/gpu/drm/bridge/analogix/analogix-anx6345.c:738:30: error: implicit
> > declaration of function 'i2c_new_dummy'
> > [-Werror=implicit-function-declaration]
> > 738 |anx6345->i2c_clients[i] = i2c_new_dummy(client->adapter,
> > | ^
> > drivers/gpu/drm/bridge/analogix/analogix-anx6345.c:738:28: warning:
> > assignment to 'struct i2c_client *' from 'int' makes pointer from integer
> > without a cast [-Wint-conversion]
> > 738 |anx6345->i2c_clients[i] = i2c_new_dummy(client->adapter,
> > |^
> >
> > Caused by commit
> >
> > 6aa192698089 ("drm/bridge: Add Analogix anx6345 support")
> >
> > interacting with commit
> >
> > 2c2f00ab1641 ("i2c: remove i2c_new_dummy() API")
> >
> > From Linus' tree.
> >
> > I have applied the following fix up patch for today:
> >
> > From: Stephen Rothwell
> > Date: Mon, 16 Dec 2019 12:11:19 +1100
> > Subject: [PATCH] drm/bridge: fix up for removal of i2c_new_dummy()
> >
> > Signed-off-by: Stephen Rothwell
>
> Thanks pulled into drm-next since I just processed the first drm-misc-next
> pull.
Thanks. For the future, though, merge fixes like this should be part
of the actual merge commit to avoid bisection problems.
--
Cheers,
Stephen Rothwell
pgpcULRT3Pf9e.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
On Mon, Dec 16, 2019 at 12:23:31PM +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/bridge/analogix/analogix-anx6345.c: In function
> 'anx6345_i2c_probe':
> drivers/gpu/drm/bridge/analogix/analogix-anx6345.c:738:30: error: implicit
> declaration of function 'i2c_new_dummy'
> [-Werror=implicit-function-declaration]
> 738 |anx6345->i2c_clients[i] = i2c_new_dummy(client->adapter,
> | ^
> drivers/gpu/drm/bridge/analogix/analogix-anx6345.c:738:28: warning:
> assignment to 'struct i2c_client *' from 'int' makes pointer from integer
> without a cast [-Wint-conversion]
> 738 |anx6345->i2c_clients[i] = i2c_new_dummy(client->adapter,
> |^
>
> Caused by commit
>
> 6aa192698089 ("drm/bridge: Add Analogix anx6345 support")
>
> interacting with commit
>
> 2c2f00ab1641 ("i2c: remove i2c_new_dummy() API")
>
> From Linus' tree.
>
> I have applied the following fix up patch for today:
>
> From: Stephen Rothwell
> Date: Mon, 16 Dec 2019 12:11:19 +1100
> Subject: [PATCH] drm/bridge: fix up for removal of i2c_new_dummy()
>
> Signed-off-by: Stephen Rothwell
Thanks pulled into drm-next since I just processed the first drm-misc-next
pull.
-Daniel
> ---
> drivers/gpu/drm/bridge/analogix/analogix-anx6345.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/bridge/analogix/analogix-anx6345.c
> b/drivers/gpu/drm/bridge/analogix/analogix-anx6345.c
> index 9917ce0d86a0..56f55c53abfd 100644
> --- a/drivers/gpu/drm/bridge/analogix/analogix-anx6345.c
> +++ b/drivers/gpu/drm/bridge/analogix/analogix-anx6345.c
> @@ -735,13 +735,13 @@ static int anx6345_i2c_probe(struct i2c_client *client,
> /* Map slave addresses of ANX6345 */
> for (i = 0; i < I2C_NUM_ADDRESSES; i++) {
> if (anx6345_i2c_addresses[i] >> 1 != client->addr)
> - anx6345->i2c_clients[i] = i2c_new_dummy(client->adapter,
> + anx6345->i2c_clients[i] =
> i2c_new_dummy_device(client->adapter,
> anx6345_i2c_addresses[i] >> 1);
> else
> anx6345->i2c_clients[i] = client;
>
> - if (!anx6345->i2c_clients[i]) {
> - err = -ENOMEM;
> + if (IS_ERR(anx6345->i2c_clients[i])) {
> + err = PTR_ERR(anx6345->i2c_clients[i]);
> DRM_ERROR("Failed to reserve I2C bus %02x\n",
> anx6345_i2c_addresses[i]);
> goto err_unregister_i2c;
> --
> 2.24.0
>
> --
> Cheers,
> Stephen Rothwell
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
___
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/bridge/analogix/analogix-anx6345.c: In function
'anx6345_i2c_probe':
drivers/gpu/drm/bridge/analogix/analogix-anx6345.c:738:30: error: implicit
declaration of function 'i2c_new_dummy' [-Werror=implicit-function-declaration]
738 |anx6345->i2c_clients[i] = i2c_new_dummy(client->adapter,
| ^
drivers/gpu/drm/bridge/analogix/analogix-anx6345.c:738:28: warning: assignment
to 'struct i2c_client *' from 'int' makes pointer from integer without a cast
[-Wint-conversion]
738 |anx6345->i2c_clients[i] = i2c_new_dummy(client->adapter,
|^
Caused by commit
6aa192698089 ("drm/bridge: Add Analogix anx6345 support")
interacting with commit
2c2f00ab1641 ("i2c: remove i2c_new_dummy() API")
From Linus' tree.
I have applied the following fix up patch for today:
From: Stephen Rothwell
Date: Mon, 16 Dec 2019 12:11:19 +1100
Subject: [PATCH] drm/bridge: fix up for removal of i2c_new_dummy()
Signed-off-by: Stephen Rothwell
---
drivers/gpu/drm/bridge/analogix/analogix-anx6345.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/bridge/analogix/analogix-anx6345.c
b/drivers/gpu/drm/bridge/analogix/analogix-anx6345.c
index 9917ce0d86a0..56f55c53abfd 100644
--- a/drivers/gpu/drm/bridge/analogix/analogix-anx6345.c
+++ b/drivers/gpu/drm/bridge/analogix/analogix-anx6345.c
@@ -735,13 +735,13 @@ static int anx6345_i2c_probe(struct i2c_client *client,
/* Map slave addresses of ANX6345 */
for (i = 0; i < I2C_NUM_ADDRESSES; i++) {
if (anx6345_i2c_addresses[i] >> 1 != client->addr)
- anx6345->i2c_clients[i] = i2c_new_dummy(client->adapter,
+ anx6345->i2c_clients[i] =
i2c_new_dummy_device(client->adapter,
anx6345_i2c_addresses[i] >> 1);
else
anx6345->i2c_clients[i] = client;
- if (!anx6345->i2c_clients[i]) {
- err = -ENOMEM;
+ if (IS_ERR(anx6345->i2c_clients[i])) {
+ err = PTR_ERR(anx6345->i2c_clients[i]);
DRM_ERROR("Failed to reserve I2C bus %02x\n",
anx6345_i2c_addresses[i]);
goto err_unregister_i2c;
--
2.24.0
--
Cheers,
Stephen Rothwell
pgpJ9mcEK0qc9.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
Applied. Thanks!
Alex
On Tue, Oct 15, 2019 at 8:22 PM 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/amd/amdgpu/amdgpu_tmz.c:23:10: fatal error: drm/drmP.h: No
> such file or directory
>23 | #include
> | ^~~~
>
> Caused by commit
>
> 4e98f871bcff ("drm: delete drmP.h + drm_os_linux.h")
>
> interacting with commit
>
> 8b8c294c5d37 ("drm/amdgpu: add function to check tmz capability (v4)")
>
> from the amdgpu tree.
>
> I applied the following merge fix patch for today (which should also
> apply to the amdgpu tree).
>
> From: Stephen Rothwell
> Date: Wed, 16 Oct 2019 11:17:32 +1100
> Subject: [PATCH] drm/amdgpu: fix up for amdgpu_tmz.c and removal of drm/drmP.h
>
> Signed-off-by: Stephen Rothwell
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_tmz.c | 5 -
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_tmz.c
> b/drivers/gpu/drm/amd/amdgpu/amdgpu_tmz.c
> index 14a55003dd81..823527a0fa47 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_tmz.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_tmz.c
> @@ -20,7 +20,10 @@
> * OTHER DEALINGS IN THE SOFTWARE.
> */
>
> -#include
> +#include
> +
> +#include
> +
> #include "amdgpu.h"
> #include "amdgpu_tmz.h"
>
> --
> 2.23.0
>
> --
> Cheers,
> Stephen Rothwell
___
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_tmz.c:23:10: fatal error: drm/drmP.h: No such
file or directory
23 | #include
| ^~~~
Caused by commit
4e98f871bcff ("drm: delete drmP.h + drm_os_linux.h")
interacting with commit
8b8c294c5d37 ("drm/amdgpu: add function to check tmz capability (v4)")
from the amdgpu tree.
I applied the following merge fix patch for today (which should also
apply to the amdgpu tree).
From: Stephen Rothwell
Date: Wed, 16 Oct 2019 11:17:32 +1100
Subject: [PATCH] drm/amdgpu: fix up for amdgpu_tmz.c and removal of drm/drmP.h
Signed-off-by: Stephen Rothwell
---
drivers/gpu/drm/amd/amdgpu/amdgpu_tmz.c | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_tmz.c
b/drivers/gpu/drm/amd/amdgpu/amdgpu_tmz.c
index 14a55003dd81..823527a0fa47 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_tmz.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_tmz.c
@@ -20,7 +20,10 @@
* OTHER DEALINGS IN THE SOFTWARE.
*/
-#include
+#include
+
+#include
+
#include "amdgpu.h"
#include "amdgpu_tmz.h"
--
2.23.0
--
Cheers,
Stephen Rothwell
pgpILj2DiYPCk.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 all,
This is now a semantic conflict between the drm and v4l-dvb trees.
On Tue, 8 Oct 2019 10:30:45 +1100 Stephen Rothwell
wrote:
>
> After merging the drm-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
drivers/media/platform/cec-gpio/cec-gpio.c: In function 'cec_gpio_probe':
drivers/media/platform/cec-gpio/cec-gpio.c:262:2: error: too few arguments to
function 'cec_notifier_cec_adap_unregister'
262 | cec_notifier_cec_adap_unregister(cec->notifier);
| ^~~~
In file included from drivers/media/platform/cec-gpio/cec-gpio.c:11:
include/media/cec-notifier.h:98:6: note: declared here
98 | void cec_notifier_cec_adap_unregister(struct cec_notifier *n,
| ^~~~
drivers/media/platform/cec-gpio/cec-gpio.c: In function 'cec_gpio_remove':
drivers/media/platform/cec-gpio/cec-gpio.c:272:2: error: too few arguments to
function 'cec_notifier_cec_adap_unregister'
272 | cec_notifier_cec_adap_unregister(cec->notifier);
| ^~~~
In file included from drivers/media/platform/cec-gpio/cec-gpio.c:11:
include/media/cec-notifier.h:98:6: note: declared here
98 | void cec_notifier_cec_adap_unregister(struct cec_notifier *n,
| ^~~~
> Caused by commit
>
> 10d8f308ba3e ("cec: add cec_adapter to cec_notifier_cec_adap_unregister()")
>
> interacting with commit
>
> 7e86efa2ff03 ("media: cec-gpio: add notifier support")
>
> form the v4l-dvb tree.
>
> I have applied the following merge fix patch.
>
> From: Stephen Rothwell
> Date: Tue, 8 Oct 2019 10:26:05 +1100
> Subject: [PATCH] cec: fix up for "cec: add cec_adapter to
> cec_notifier_cec_adap_unregister()"
>
> Signed-off-by: Stephen Rothwell
> ---
> drivers/media/platform/cec-gpio/cec-gpio.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/media/platform/cec-gpio/cec-gpio.c
> b/drivers/media/platform/cec-gpio/cec-gpio.c
> index 7be91e712c4a..42d2c2cd9a78 100644
> --- a/drivers/media/platform/cec-gpio/cec-gpio.c
> +++ b/drivers/media/platform/cec-gpio/cec-gpio.c
> @@ -259,7 +259,7 @@ static int cec_gpio_probe(struct platform_device *pdev)
> return 0;
>
> unreg_notifier:
> - cec_notifier_cec_adap_unregister(cec->notifier);
> + cec_notifier_cec_adap_unregister(cec->notifier, cec->adap);
> del_adap:
> cec_delete_adapter(cec->adap);
> return ret;
> @@ -269,7 +269,7 @@ static int cec_gpio_remove(struct platform_device *pdev)
> {
> struct cec_gpio *cec = platform_get_drvdata(pdev);
>
> - cec_notifier_cec_adap_unregister(cec->notifier);
> + cec_notifier_cec_adap_unregister(cec->notifier, cec->adap);
> cec_unregister_adapter(cec->adap);
> return 0;
> }
--
Cheers,
Stephen Rothwell
pgpquO5UzCmV8.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
Applied. thanks!
Alex
On Tue, Oct 8, 2019 at 8:36 PM Stephen Rothwell wrote:
>
> 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/amd/amdgpu/../amdkfd/kfd_module.c:25:
> drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_priv.h:40:10: fatal error:
> drm/drmP.h: No such file or directory
>40 | #include
> | ^~~~
> In file included from drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_chardev.c:38:
> drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_priv.h:40:10: fatal error:
> drm/drmP.h: No such file or directory
>40 | #include
> | ^~~~
> In file included from drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_device.c:26:
> drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_priv.h:40:10: fatal error:
> drm/drmP.h: No such file or directory
>40 | #include
> | ^~~~
> In file included from drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_topology.c:34:
> drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_priv.h:40:10: fatal error:
> drm/drmP.h: No such file or directory
>40 | #include
> | ^~~~
>
>
> Caused by commit
>
> 4e98f871bcff ("drm: delete drmP.h + drm_os_linux.h")
>
> interacting with commit
>
> 6b855f7b83d2 ("drm/amdkfd: Check against device cgroup")
>
> from the amdgpu tree.
>
> I added the following merge fix patch for today:
>
> From: Stephen Rothwell
> Date: Wed, 9 Oct 2019 11:24:38 +1100
> Subject: [PATCH] drm/amdkfd: update for drmP.h removal
>
> Signed-off-by: Stephen Rothwell
> ---
> drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
> b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
> index b8b4485c8f74..41bc0428bfc0 100644
> --- a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
> +++ b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
> @@ -37,7 +37,9 @@
> #include
> #include
> #include
> -#include
> +#include
> +#include
> +#include
> #include
>
> #include "amd_shared.h"
> @@ -49,8 +51,6 @@
> /* GPU ID hash width in bits */
> #define KFD_GPU_ID_HASH_WIDTH 16
>
> -struct drm_device;
> -
> /* Use upper bits of mmap offset to store KFD driver specific information.
> * BITS[63:62] - Encode MMAP type
> * BITS[61:46] - Encode gpu_id. To identify to which GPU the offset belongs
> to
> --
> 2.23.0
>
> --
> Cheers,
> Stephen Rothwell
___
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:
In file included from drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_module.c:25:
drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_priv.h:40:10: fatal error: drm/drmP.h:
No such file or directory
40 | #include
| ^~~~
In file included from drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_chardev.c:38:
drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_priv.h:40:10: fatal error: drm/drmP.h:
No such file or directory
40 | #include
| ^~~~
In file included from drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_device.c:26:
drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_priv.h:40:10: fatal error: drm/drmP.h:
No such file or directory
40 | #include
| ^~~~
In file included from drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_topology.c:34:
drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_priv.h:40:10: fatal error: drm/drmP.h:
No such file or directory
40 | #include
| ^~~~
Caused by commit
4e98f871bcff ("drm: delete drmP.h + drm_os_linux.h")
interacting with commit
6b855f7b83d2 ("drm/amdkfd: Check against device cgroup")
from the amdgpu tree.
I added the following merge fix patch for today:
From: Stephen Rothwell
Date: Wed, 9 Oct 2019 11:24:38 +1100
Subject: [PATCH] drm/amdkfd: update for drmP.h removal
Signed-off-by: Stephen Rothwell
---
drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
index b8b4485c8f74..41bc0428bfc0 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
@@ -37,7 +37,9 @@
#include
#include
#include
-#include
+#include
+#include
+#include
#include
#include "amd_shared.h"
@@ -49,8 +51,6 @@
/* GPU ID hash width in bits */
#define KFD_GPU_ID_HASH_WIDTH 16
-struct drm_device;
-
/* Use upper bits of mmap offset to store KFD driver specific information.
* BITS[63:62] - Encode MMAP type
* BITS[61:46] - Encode gpu_id. To identify to which GPU the offset belongs to
--
2.23.0
--
Cheers,
Stephen Rothwell
pgpZdzpthon0_.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 all, On Tue, 8 Oct 2019 10:30:45 +1100 Stephen Rothwell wrote: > > Hi all, > > After merging the drm-misc tree, today's linux-next build (x86_64 > allmodconfig) failed like this: > Sorry, forgot to include the error messages. But they shuld be clear from the fix ... -- Cheers, Stephen Rothwell pgpsAKGQxAfBY.pgp 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 (x86_64
allmodconfig) failed like this:
Caused by commit
10d8f308ba3e ("cec: add cec_adapter to cec_notifier_cec_adap_unregister()")
interacting with commit
7e86efa2ff03 ("media: cec-gpio: add notifier support")
form the v4l-dvb tree.
I have applied the following merge fix patch.
From: Stephen Rothwell
Date: Tue, 8 Oct 2019 10:26:05 +1100
Subject: [PATCH] cec: fix up for "cec: add cec_adapter to
cec_notifier_cec_adap_unregister()"
Signed-off-by: Stephen Rothwell
---
drivers/media/platform/cec-gpio/cec-gpio.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/media/platform/cec-gpio/cec-gpio.c
b/drivers/media/platform/cec-gpio/cec-gpio.c
index 7be91e712c4a..42d2c2cd9a78 100644
--- a/drivers/media/platform/cec-gpio/cec-gpio.c
+++ b/drivers/media/platform/cec-gpio/cec-gpio.c
@@ -259,7 +259,7 @@ static int cec_gpio_probe(struct platform_device *pdev)
return 0;
unreg_notifier:
- cec_notifier_cec_adap_unregister(cec->notifier);
+ cec_notifier_cec_adap_unregister(cec->notifier, cec->adap);
del_adap:
cec_delete_adapter(cec->adap);
return ret;
@@ -269,7 +269,7 @@ static int cec_gpio_remove(struct platform_device *pdev)
{
struct cec_gpio *cec = platform_get_drvdata(pdev);
- cec_notifier_cec_adap_unregister(cec->notifier);
+ cec_notifier_cec_adap_unregister(cec->notifier, cec->adap);
cec_unregister_adapter(cec->adap);
return 0;
}
--
2.23.0.rc1
--
Cheers,
Stephen Rothwell
pgpK5fn7J9sbB.pgp
Description: OpenPGP digital signature
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
