Re: linux-next: build failure after merge of the drm-intel-fixes tree

[Rodrigo Vivi]

On Wed, Nov 04, 2020 at 09:37:05AM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the drm-intel-fixes tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/gpu/drm/i915/gt/intel_lrc.c: In function 'gen12_emit_fini_breadcrumb':
> drivers/gpu/drm/i915/gt/intel_lrc.c:4998:31: error: implicit declaration of 
> function '__gen8_emit_flush_dw'; did you mean 'gen8_emit_flush'? 
> [-Werror=implicit-function-declaration]
>  4998 |  cs = emit_xcs_breadcrumb(rq, __gen8_emit_flush_dw(cs, 0, 0, 0));
>   |   ^~~~
>   |   gen8_emit_flush
> drivers/gpu/drm/i915/gt/intel_lrc.c:4998:31: warning: passing argument 2 of 
> 'emit_xcs_breadcrumb' makes pointer from integer without a cast 
> [-Wint-conversion]
>  4998 |  cs = emit_xcs_breadcrumb(rq, __gen8_emit_flush_dw(cs, 0, 0, 0));
>   |   ^
>   |   |
>   |   int
> drivers/gpu/drm/i915/gt/intel_lrc.c:4902:63: note: expected 'u32 *' {aka 
> 'unsigned int *'} but argument is of type 'int'
>  4902 | static u32 *emit_xcs_breadcrumb(struct i915_request *rq, u32 *cs)
>   |  ~^~
> 
> Caused by commit
> 
>   c94d65d2ff6d ("drm/i915/gt: Flush xcs before tgl breadcrumbs")
> 
> I have reverted that commit for today.

Sorry for the trouble. Dependency picked to drm-intel-fixes now.

Thanks for reporting,
Rodrigo.

> 
> -- 
> Cheers,
> Stephen Rothwell



> ___
> dri-devel mailing list
> dri-de...@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: linux-next: build failure after merge of the drm-intel-fixes tree

[Joonas Lahtinen]

Quoting Stephen Rothwell (2020-06-16 02:39:12)
> Hi all,
> 
> After merging the drm-intel-fixes tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> In file included from drivers/gpu/drm/i915/gt/intel_lrc.c:5972:
> drivers/gpu/drm/i915/gt/selftest_lrc.c: In function 
> 'live_timeslice_nopreempt':
> drivers/gpu/drm/i915/gt/selftest_lrc.c:1333:3: error: too few arguments to 
> function 'engine_heartbeat_disable'
>  1333 |   engine_heartbeat_disable(engine);
>   |   ^~~~
> drivers/gpu/drm/i915/gt/selftest_lrc.c:54:13: note: declared here
>54 | static void engine_heartbeat_disable(struct intel_engine_cs *engine,
>   | ^~~~
> drivers/gpu/drm/i915/gt/selftest_lrc.c:1402:3: error: too few arguments to 
> function 'engine_heartbeat_enable'
>  1402 |   engine_heartbeat_enable(engine);
>   |   ^~~
> drivers/gpu/drm/i915/gt/selftest_lrc.c:64:13: note: declared here
>64 | static void engine_heartbeat_enable(struct intel_engine_cs *engine,
>   | ^~~
> 
> Caused by commit
> 
>   04dc41776145 ("drm/i915/gt: Prevent timeslicing into unpreemptable 
> requests")
> 
> I have reverted that commit for today.

Thanks for reporting. I had my drm-intel-fixes build tree configured
without selftests. I've now corrected that and added a missing dependency
patch.

Regards, Joonas

> 
> -- 
> Cheers,
> Stephen Rothwell

Re: linux-next: build failure after merge of the drm-intel-fixes tree

[Mark Brown]

On Tue, Oct 10, 2017 at 08:03:00AM +0100, Mark Brown wrote:
> Hi all,
> 
> After merging the drm-misc-fixes tree, today's linux-next build
> (x86_allmodconfig) failed like this:
> 
>   CC [M]  drivers/gpu/drm/i915/i915_gem_evict.o
> drivers/gpu/drm/i915/i915_gem_evict.c: In function ‘i915_gem_evict_for_node’:
> drivers/gpu/drm/i915/i915_gem_evict.c:318:31: error: implicit declaration of 
> function ‘i915_vma_has_userfault’; did you mean ‘i915_vma_pin_count’? 
> [-Werror=implicit-function-declaration]
>if (flags & PIN_NONFAULT && i915_vma_has_userfault(vma)) {
>^~
>i915_vma_pin_count
> 
> Caused by commit
> 
>   72872c99b6dbc ("drm/i915: Check PIN_NONFAULT overlaps in evict_for_node")
> 
> in the drm-intel-fixes tree.  I've used the tree from yesterday.

This is still present today.


signature.asc
Description: PGP signature

Re: linux-next: build failure after merge of the drm-intel-fixes tree

[Mark Brown]

On Tue, Oct 10, 2017 at 08:03:00AM +0100, Mark Brown wrote:
> Hi all,
> 
> After merging the drm-misc-fixes tree, today's linux-next build
> (x86_allmodconfig) failed like this:
> 
>   CC [M]  drivers/gpu/drm/i915/i915_gem_evict.o
> drivers/gpu/drm/i915/i915_gem_evict.c: In function ‘i915_gem_evict_for_node’:
> drivers/gpu/drm/i915/i915_gem_evict.c:318:31: error: implicit declaration of 
> function ‘i915_vma_has_userfault’; did you mean ‘i915_vma_pin_count’? 
> [-Werror=implicit-function-declaration]
>if (flags & PIN_NONFAULT && i915_vma_has_userfault(vma)) {
>^~
>i915_vma_pin_count
> 
> Caused by commit
> 
>   72872c99b6dbc ("drm/i915: Check PIN_NONFAULT overlaps in evict_for_node")
> 
> in the drm-intel-fixes tree.  I've used the tree from yesterday.

This is still present today.


signature.asc
Description: PGP signature

Re: linux-next: build failure after merge of the drm-intel-fixes tree

[Zhenyu Wang]

On 2017.01.02 21:48:57 -0700, Alex Williamson wrote:
> > Alex, I liked to have kvmgt related mdev interface change be merged through
> > vfio tree, but wasn't awared one of Jike's fix had conflict. Could you apply
> > below fix in your tree? I think in general for possible interface change in
> > future we still need a pull request for i915 to resolve dependence earlier.
> 
> Hi Zhenyu,
> 
> Hopefully this abstraction will help to isolate vendor drivers from
> mdev API changes in the future.  I can certainly roll this patch into
> the original to maintain bisectability.  I want to get these changes in
> for rc3, will a pull request for the i915 changes be sent this week?

Send to Jani who is managing i915 fixes pull.

-- 
Open Source Technology Center, Intel ltd.

$gpg --keyserver wwwkeys.pgp.net --recv-keys 4D781827


signature.asc
Description: PGP signature

Re: linux-next: build failure after merge of the drm-intel-fixes tree

[Zhenyu Wang]

On 2017.01.02 21:48:57 -0700, Alex Williamson wrote:
> > Alex, I liked to have kvmgt related mdev interface change be merged through
> > vfio tree, but wasn't awared one of Jike's fix had conflict. Could you apply
> > below fix in your tree? I think in general for possible interface change in
> > future we still need a pull request for i915 to resolve dependence earlier.
> 
> Hi Zhenyu,
> 
> Hopefully this abstraction will help to isolate vendor drivers from
> mdev API changes in the future.  I can certainly roll this patch into
> the original to maintain bisectability.  I want to get these changes in
> for rc3, will a pull request for the i915 changes be sent this week?

Send to Jani who is managing i915 fixes pull.

-- 
Open Source Technology Center, Intel ltd.

$gpg --keyserver wwwkeys.pgp.net --recv-keys 4D781827


signature.asc
Description: PGP signature

Re: linux-next: build failure after merge of the drm-intel-fixes tree

[Alex Williamson]

On Tue, 3 Jan 2017 10:59:29 +0800
Zhenyu Wang  wrote:

> On 2017.01.03 10:42:39 +1100, Stephen Rothwell wrote:
> > Hi all,
> > 
> > After merging the drm-intel-fixes tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
> > 
> > drivers/gpu/drm/i915/gvt/kvmgt.c: In function 'intel_vgpu_open':
> > drivers/gpu/drm/i915/gvt/kvmgt.c:511:32: error: dereferencing pointer to 
> > incomplete type 'struct mdev_device'
> >   vfio_unregister_notifier(>dev, VFIO_GROUP_NOTIFY,
> > ^   
> > 
> > Caused by commit
> > 
> >   99e3123e3d72 ("vfio-mdev: Make mdev_device private and abstract 
> > interfaces")
> > 
> > from the vfio-fixes tree interacting with commit
> > 
> >   364fb6b789ff ("drm/i915/gvt/kvmgt: prevent double-release of vgpu")
> > 
> > from the drm-intel-fixes tree.  
> 
> Alex, I liked to have kvmgt related mdev interface change be merged through
> vfio tree, but wasn't awared one of Jike's fix had conflict. Could you apply
> below fix in your tree? I think in general for possible interface change in
> future we still need a pull request for i915 to resolve dependence earlier.

Hi Zhenyu,

Hopefully this abstraction will help to isolate vendor drivers from
mdev API changes in the future.  I can certainly roll this patch into
the original to maintain bisectability.  I want to get these changes in
for rc3, will a pull request for the i915 changes be sent this week?
Thanks for spotting and fixing this, Stephen.  Thanks,

Alex

> > I applied this merge fix patch:
> > 
> > From: Stephen Rothwell 
> > Date: Tue, 3 Jan 2017 10:38:48 +1100
> > Subject: [PATCH] vfio-mdev: fixup for "Make mdev_device private and 
> > abstract interfaces"
> > 
> > Signed-off-by: Stephen Rothwell 
> > ---
> >  drivers/gpu/drm/i915/gvt/kvmgt.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/drivers/gpu/drm/i915/gvt/kvmgt.c 
> > b/drivers/gpu/drm/i915/gvt/kvmgt.c
> > index c24b665e007b..faaae07ae487 100644
> > --- a/drivers/gpu/drm/i915/gvt/kvmgt.c
> > +++ b/drivers/gpu/drm/i915/gvt/kvmgt.c
> > @@ -508,7 +508,7 @@ static int intel_vgpu_open(struct mdev_device *mdev)
> > return ret;
> >  
> >  undo_group:
> > -   vfio_unregister_notifier(>dev, VFIO_GROUP_NOTIFY,
> > +   vfio_unregister_notifier(mdev_dev(mdev), VFIO_GROUP_NOTIFY,
> > >vdev.group_notifier);
> >  
> >  undo_iommu:
> > -- 
> > 2.10.2
> > 
> > -- 
> > Cheers,
> > Stephen Rothwell  
> 

Re: linux-next: build failure after merge of the drm-intel-fixes tree

[Alex Williamson]

On Tue, 3 Jan 2017 10:59:29 +0800
Zhenyu Wang  wrote:

> On 2017.01.03 10:42:39 +1100, Stephen Rothwell wrote:
> > Hi all,
> > 
> > After merging the drm-intel-fixes tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
> > 
> > drivers/gpu/drm/i915/gvt/kvmgt.c: In function 'intel_vgpu_open':
> > drivers/gpu/drm/i915/gvt/kvmgt.c:511:32: error: dereferencing pointer to 
> > incomplete type 'struct mdev_device'
> >   vfio_unregister_notifier(>dev, VFIO_GROUP_NOTIFY,
> > ^   
> > 
> > Caused by commit
> > 
> >   99e3123e3d72 ("vfio-mdev: Make mdev_device private and abstract 
> > interfaces")
> > 
> > from the vfio-fixes tree interacting with commit
> > 
> >   364fb6b789ff ("drm/i915/gvt/kvmgt: prevent double-release of vgpu")
> > 
> > from the drm-intel-fixes tree.  
> 
> Alex, I liked to have kvmgt related mdev interface change be merged through
> vfio tree, but wasn't awared one of Jike's fix had conflict. Could you apply
> below fix in your tree? I think in general for possible interface change in
> future we still need a pull request for i915 to resolve dependence earlier.

Hi Zhenyu,

Hopefully this abstraction will help to isolate vendor drivers from
mdev API changes in the future.  I can certainly roll this patch into
the original to maintain bisectability.  I want to get these changes in
for rc3, will a pull request for the i915 changes be sent this week?
Thanks for spotting and fixing this, Stephen.  Thanks,

Alex

> > I applied this merge fix patch:
> > 
> > From: Stephen Rothwell 
> > Date: Tue, 3 Jan 2017 10:38:48 +1100
> > Subject: [PATCH] vfio-mdev: fixup for "Make mdev_device private and 
> > abstract interfaces"
> > 
> > Signed-off-by: Stephen Rothwell 
> > ---
> >  drivers/gpu/drm/i915/gvt/kvmgt.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/drivers/gpu/drm/i915/gvt/kvmgt.c 
> > b/drivers/gpu/drm/i915/gvt/kvmgt.c
> > index c24b665e007b..faaae07ae487 100644
> > --- a/drivers/gpu/drm/i915/gvt/kvmgt.c
> > +++ b/drivers/gpu/drm/i915/gvt/kvmgt.c
> > @@ -508,7 +508,7 @@ static int intel_vgpu_open(struct mdev_device *mdev)
> > return ret;
> >  
> >  undo_group:
> > -   vfio_unregister_notifier(>dev, VFIO_GROUP_NOTIFY,
> > +   vfio_unregister_notifier(mdev_dev(mdev), VFIO_GROUP_NOTIFY,
> > >vdev.group_notifier);
> >  
> >  undo_iommu:
> > -- 
> > 2.10.2
> > 
> > -- 
> > Cheers,
> > Stephen Rothwell  
> 

Re: linux-next: build failure after merge of the drm-intel-fixes tree

[Stephen Rothwell]

Hi Zhenyu,

On Tue, 3 Jan 2017 10:59:29 +0800 Zhenyu Wang  wrote:
>
> Alex, I liked to have kvmgt related mdev interface change be merged through
> vfio tree, but wasn't awared one of Jike's fix had conflict. Could you apply
> below fix in your tree? I think in general for possible interface change in
> future we still need a pull request for i915 to resolve dependence earlier.

This only happens because I merge both trees (I think) ...

-- 
Cheers,
Stephen Rothwell

Re: linux-next: build failure after merge of the drm-intel-fixes tree

[Stephen Rothwell]

Hi Zhenyu,

On Tue, 3 Jan 2017 10:59:29 +0800 Zhenyu Wang  wrote:
>
> Alex, I liked to have kvmgt related mdev interface change be merged through
> vfio tree, but wasn't awared one of Jike's fix had conflict. Could you apply
> below fix in your tree? I think in general for possible interface change in
> future we still need a pull request for i915 to resolve dependence earlier.

This only happens because I merge both trees (I think) ...

-- 
Cheers,
Stephen Rothwell

Re: linux-next: build failure after merge of the drm-intel-fixes tree

[Zhenyu Wang]

On 2017.01.03 10:42:39 +1100, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the drm-intel-fixes tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/gpu/drm/i915/gvt/kvmgt.c: In function 'intel_vgpu_open':
> drivers/gpu/drm/i915/gvt/kvmgt.c:511:32: error: dereferencing pointer to 
> incomplete type 'struct mdev_device'
>   vfio_unregister_notifier(>dev, VFIO_GROUP_NOTIFY,
> ^   
> 
> Caused by commit
> 
>   99e3123e3d72 ("vfio-mdev: Make mdev_device private and abstract interfaces")
> 
> from the vfio-fixes tree interacting with commit
> 
>   364fb6b789ff ("drm/i915/gvt/kvmgt: prevent double-release of vgpu")
> 
> from the drm-intel-fixes tree.

Alex, I liked to have kvmgt related mdev interface change be merged through
vfio tree, but wasn't awared one of Jike's fix had conflict. Could you apply
below fix in your tree? I think in general for possible interface change in
future we still need a pull request for i915 to resolve dependence earlier.

Thanks.

> 
> I applied this merge fix patch:
> 
> From: Stephen Rothwell 
> Date: Tue, 3 Jan 2017 10:38:48 +1100
> Subject: [PATCH] vfio-mdev: fixup for "Make mdev_device private and abstract 
> interfaces"
> 
> Signed-off-by: Stephen Rothwell 
> ---
>  drivers/gpu/drm/i915/gvt/kvmgt.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/i915/gvt/kvmgt.c 
> b/drivers/gpu/drm/i915/gvt/kvmgt.c
> index c24b665e007b..faaae07ae487 100644
> --- a/drivers/gpu/drm/i915/gvt/kvmgt.c
> +++ b/drivers/gpu/drm/i915/gvt/kvmgt.c
> @@ -508,7 +508,7 @@ static int intel_vgpu_open(struct mdev_device *mdev)
>   return ret;
>  
>  undo_group:
> - vfio_unregister_notifier(>dev, VFIO_GROUP_NOTIFY,
> + vfio_unregister_notifier(mdev_dev(mdev), VFIO_GROUP_NOTIFY,
>   >vdev.group_notifier);
>  
>  undo_iommu:
> -- 
> 2.10.2
> 
> -- 
> Cheers,
> Stephen Rothwell

-- 
Open Source Technology Center, Intel ltd.

$gpg --keyserver wwwkeys.pgp.net --recv-keys 4D781827


signature.asc
Description: PGP signature

Re: linux-next: build failure after merge of the drm-intel-fixes tree

[Zhenyu Wang]

On 2017.01.03 10:42:39 +1100, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the drm-intel-fixes tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/gpu/drm/i915/gvt/kvmgt.c: In function 'intel_vgpu_open':
> drivers/gpu/drm/i915/gvt/kvmgt.c:511:32: error: dereferencing pointer to 
> incomplete type 'struct mdev_device'
>   vfio_unregister_notifier(>dev, VFIO_GROUP_NOTIFY,
> ^   
> 
> Caused by commit
> 
>   99e3123e3d72 ("vfio-mdev: Make mdev_device private and abstract interfaces")
> 
> from the vfio-fixes tree interacting with commit
> 
>   364fb6b789ff ("drm/i915/gvt/kvmgt: prevent double-release of vgpu")
> 
> from the drm-intel-fixes tree.

Alex, I liked to have kvmgt related mdev interface change be merged through
vfio tree, but wasn't awared one of Jike's fix had conflict. Could you apply
below fix in your tree? I think in general for possible interface change in
future we still need a pull request for i915 to resolve dependence earlier.

Thanks.

> 
> I applied this merge fix patch:
> 
> From: Stephen Rothwell 
> Date: Tue, 3 Jan 2017 10:38:48 +1100
> Subject: [PATCH] vfio-mdev: fixup for "Make mdev_device private and abstract 
> interfaces"
> 
> Signed-off-by: Stephen Rothwell 
> ---
>  drivers/gpu/drm/i915/gvt/kvmgt.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/i915/gvt/kvmgt.c 
> b/drivers/gpu/drm/i915/gvt/kvmgt.c
> index c24b665e007b..faaae07ae487 100644
> --- a/drivers/gpu/drm/i915/gvt/kvmgt.c
> +++ b/drivers/gpu/drm/i915/gvt/kvmgt.c
> @@ -508,7 +508,7 @@ static int intel_vgpu_open(struct mdev_device *mdev)
>   return ret;
>  
>  undo_group:
> - vfio_unregister_notifier(>dev, VFIO_GROUP_NOTIFY,
> + vfio_unregister_notifier(mdev_dev(mdev), VFIO_GROUP_NOTIFY,
>   >vdev.group_notifier);
>  
>  undo_iommu:
> -- 
> 2.10.2
> 
> -- 
> Cheers,
> Stephen Rothwell

-- 
Open Source Technology Center, Intel ltd.

$gpg --keyserver wwwkeys.pgp.net --recv-keys 4D781827


signature.asc
Description: PGP signature

Re: linux-next: build failure after merge of the drm-intel-fixes tree

[Daniel Vetter]

On Fri, Jun 6, 2014 at 4:03 AM, Stephen Rothwell  wrote:
> Hi all,
>
> After merging the drm-intel-fixes tree, today's linux-next build
> (x86_64 allmodconfig) failed like this:
>
>
> drivers/gpu/drm/i915/intel_fbdev.c: In function 'intel_fb_initial_config':
> drivers/gpu/drm/i915/intel_fbdev.c:392:4: error: implicit declaration of 
> function 'drm_get_connector_name' [-Werror=implicit-function-declaration]
> DRM_DEBUG_KMS("using first mode listed on connector %s\n",
> ^
>
> This is just the error I reported yesterday against the drm and
> drm-intel trees, but migrated to the drm-intel-fixes tree.  Your -fixes
> tree shoudl really only contain stuff that depend on Linus' trees ...
> but here it include all of yesterday's drm tree as well.

Should be fixed now since Dave pushed out the backmerge to drm-next
with the resolution.

I'm sorry about the mess this caused but Linus' interleaved merge
window has caused quite a havoc with my branch model here. But since I
have everything ready already and no outstanding fixes I've moved
drm-intel-fixes already over to track 3.17 and gather patches on top
of the all the work readied before the merge window.

> I have used the drm-intel-fixes tree from next-20140605 for today.

I think you should drop drm-intel-fixes until 3.16 is out and the
merge window properly public, otherwise this mess will repeat.
-Daniel
-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: linux-next: build failure after merge of the drm-intel-fixes tree

[Daniel Vetter]

On Fri, Jun 6, 2014 at 4:03 AM, Stephen Rothwell s...@canb.auug.org.au wrote:
 Hi all,

 After merging the drm-intel-fixes tree, today's linux-next build
 (x86_64 allmodconfig) failed like this:


 drivers/gpu/drm/i915/intel_fbdev.c: In function 'intel_fb_initial_config':
 drivers/gpu/drm/i915/intel_fbdev.c:392:4: error: implicit declaration of 
 function 'drm_get_connector_name' [-Werror=implicit-function-declaration]
 DRM_DEBUG_KMS(using first mode listed on connector %s\n,
 ^

 This is just the error I reported yesterday against the drm and
 drm-intel trees, but migrated to the drm-intel-fixes tree.  Your -fixes
 tree shoudl really only contain stuff that depend on Linus' trees ...
 but here it include all of yesterday's drm tree as well.

Should be fixed now since Dave pushed out the backmerge to drm-next
with the resolution.

I'm sorry about the mess this caused but Linus' interleaved merge
window has caused quite a havoc with my branch model here. But since I
have everything ready already and no outstanding fixes I've moved
drm-intel-fixes already over to track 3.17 and gather patches on top
of the all the work readied before the merge window.

 I have used the drm-intel-fixes tree from next-20140605 for today.

I think you should drop drm-intel-fixes until 3.16 is out and the
merge window properly public, otherwise this mess will repeat.
-Daniel
-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/