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

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

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 780 bytes --]

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.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

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

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 907 bytes --]

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.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

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

[Mark Brown]

[-- Attachment #1.1: Type: text/plain, Size: 907 bytes --]

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.

[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[-- Attachment #2: Type: text/plain, Size: 160 bytes --]

_______________________________________________
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-intel-fixes tree

[Rodrigo Vivi]

On Wed, Oct 11, 2017 at 08:51:06AM +0000, Mark Brown wrote:
> 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.

It is fixed now. Sorry for the trouble.

> _______________________________________________
> 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-intel-fixes tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 444 bytes --]

Hi all,

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

x86_64-linux-gnu-ld: drivers/gpu/drm/i915/i915_scatterlist.o: in function `i915_rsgt_from_mm_node':
i915_scatterlist.c:(.text+0x196): undefined reference to `__udivdi3'

Caused by commit

  aff1e0b09b54 ("drm/i915/ttm: fix sg_table construction")

I have reverted that commit for today.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[Intel-gfx] linux-next: build failure after merge of the drm-intel-fixes tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 619 bytes --]

Hi all,

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

drivers/gpu/drm/i915/i915_vma.c: In function 'i915_vma_bind':
drivers/gpu/drm/i915/i915_vma.c:451:25: error: 'ret' undeclared (first use in this function); did you mean 'net'?
  451 |                         ret = i915_gem_object_wait_moving_fence(vma->obj, true);
      |                         ^~~
      |                         net

Caused by commit

  2e872d87cbf2 ("drm/i915: delete shadow "ret" variable")

I have reverted that commit for today.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: [Intel-gfx] linux-next: build failure after merge of the drm-intel-fixes tree

[Tvrtko Ursulin]

On 31/01/2022 22:27, 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/i915_vma.c: In function 'i915_vma_bind':
> drivers/gpu/drm/i915/i915_vma.c:451:25: error: 'ret' undeclared (first use in this function); did you mean 'net'?
>    451 |                         ret = i915_gem_object_wait_moving_fence(vma->obj, true);
>        |                         ^~~
>        |                         net
> 
> Caused by commit
> 
>    2e872d87cbf2 ("drm/i915: delete shadow "ret" variable")
> 
> I have reverted that commit for today.

Dropping was the right call - I have since removed it from 
drm-intel-fixes as well.

Root cause was a bad Fixes: tag in that patch which caused it to be 
wrongly cherry-picked and I did not build test before pushing.

We can't edit the wrong Fixes: tag now, so for future reference only, 
2e872d87cbf2 ("drm/i915: delete shadow "ret" variable") should not be 
backported to 5.17 by anyone.

Wrong tag:
Fixes: f6c466b84cfa ("drm/i915: Add support for moving fence waiting")

Correct tag should have been:
Fixes: 2f6b90da9192 ("drm/i915: Use vma resources for async unbinding")

Regards,

Tvrtko

[Intel-gfx] linux-next: build failure after merge of the drm-intel-fixes tree

[Stephen Rothwell]

[-- Attachment #1.1: Type: text/plain, Size: 1399 bytes --]

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.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[-- Attachment #2: Type: text/plain, Size: 160 bytes --]

_______________________________________________
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-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-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel

_______________________________________________
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-intel-fixes tree

[Stephen Rothwell]

[-- Attachment #1.1: Type: text/plain, Size: 1208 bytes --]

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.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 484 bytes --]

[-- Attachment #2: Type: text/plain, Size: 160 bytes --]

_______________________________________________
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-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
_______________________________________________
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-intel-fixes tree

[Stephen Rothwell]

[-- Attachment #1.1: Type: text/plain, Size: 1208 bytes --]

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:5472:
drivers/gpu/drm/i915/gt/selftest_lrc.c: In function 'live_timeslice_nopreempt':
drivers/gpu/drm/i915/gt/selftest_lrc.c:1311:3: error: too few arguments to function 'engine_heartbeat_disable'
 1311 |   engine_heartbeat_disable(engine);
      |   ^~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/i915/gt/selftest_lrc.c:53:13: note: declared here
   53 | static void engine_heartbeat_disable(struct intel_engine_cs *engine,
      |             ^~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/i915/gt/selftest_lrc.c:1380:3: error: too few arguments to function 'engine_heartbeat_enable'
 1380 |   engine_heartbeat_enable(engine);
      |   ^~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/i915/gt/selftest_lrc.c:63:13: note: declared here
   63 | static void engine_heartbeat_enable(struct intel_engine_cs *engine,
      |             ^~~~~~~~~~~~~~~~~~~~~~~

Caused by commit

  1f65efb624c4 ("drm/i915/gt: Prevent timeslicing into unpreemptable requests")

I have reverted that commit for today.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[-- Attachment #2: Type: text/plain, Size: 160 bytes --]

_______________________________________________
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-intel-fixes tree

[Stephen Rothwell]

[-- Attachment #1.1: Type: text/plain, Size: 277 bytes --]

Hi all,

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


Caused by commit

  d8fcca47e195 ("drm/i915/userptr: fix size calculation")

I have reverted that commit for today.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[-- Attachment #2: Type: text/plain, Size: 160 bytes --]

_______________________________________________
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-intel-fixes tree

[Joonas Lahtinen]

Quoting Stephen Rothwell (2020-01-20 23:34:24)
> Hi all,
> 
> After merging the drm-intel-fixes tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> 
> Caused by commit
> 
>   d8fcca47e195 ("drm/i915/userptr: fix size calculation")
> 
> I have reverted that commit for today.

It was a missing git add while fixing a cherry-pick and is now fixed.

Regards, Joonas
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 611 bytes --]

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_display.c: In function 'has_bogus_dpll_config':
drivers/gpu/drm/i915/intel_display.c:15432:27: error: macro "IS_GEN" requires 3 arguments, but only 2 given
  return IS_GEN(dev_priv, 6) &&
                           ^

Caused by commit

  a49a17226feb ("drm/i915: Try to sanitize bogus DPLL state left over by broken SNB BIOSen")

It seems this was cherry-picked incorrectly :-(

I have reverted that commit for today.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: [Intel-gfx] linux-next: build failure after merge of the drm-intel-fixes tree

[Lucas De Marchi]

On Tue, Jan 29, 2019 at 2:39 PM Stephen Rothwell <sfr@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_display.c: In function 'has_bogus_dpll_config':
> drivers/gpu/drm/i915/intel_display.c:15432:27: error: macro "IS_GEN" requires 3 arguments, but only 2 given
>   return IS_GEN(dev_priv, 6) &&
>                            ^
>
> Caused by commit
>
>   a49a17226feb ("drm/i915: Try to sanitize bogus DPLL state left over by broken SNB BIOSen")
>
> It seems this was cherry-picked incorrectly :-(

while the cherry-pick was correct, the macro is different on
drm-intel-fixes. IS_GEN(dev_priv, 6) needs to be converted to
IS_GEN6(dev_priv).

Lucas De Marchi

>
> I have reverted that commit for today.
>
> --
> Cheers,
> Stephen Rothwell
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx



-- 
Lucas De Marchi

Re: [Intel-gfx] linux-next: build failure after merge of the drm-intel-fixes tree

[Jani Nikula]

On Tue, 29 Jan 2019, Lucas De Marchi <lucas.de.marchi@gmail.com> wrote:
> On Tue, Jan 29, 2019 at 2:39 PM Stephen Rothwell <sfr@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_display.c: In function 'has_bogus_dpll_config':
>> drivers/gpu/drm/i915/intel_display.c:15432:27: error: macro "IS_GEN" requires 3 arguments, but only 2 given
>>   return IS_GEN(dev_priv, 6) &&
>>                            ^
>>
>> Caused by commit
>>
>>   a49a17226feb ("drm/i915: Try to sanitize bogus DPLL state left over by broken SNB BIOSen")
>>
>> It seems this was cherry-picked incorrectly :-(
>
> while the cherry-pick was correct, the macro is different on
> drm-intel-fixes. IS_GEN(dev_priv, 6) needs to be converted to
> IS_GEN6(dev_priv).
>
> Lucas De Marchi
>
>>
>> I have reverted that commit for today.

Dropped the commit from drm-intel-fixes.

Somehow I had managed to screw up my kernel config in a way that avoided
the build failure.

BR,
Jani.

-- 
Jani Nikula, Intel Open Source Graphics Center

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

[Stephen Rothwell]

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(&mdev->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.

I applied this merge fix patch:

From: Stephen Rothwell <sfr@canb.auug.org.au>
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 <sfr@canb.auug.org.au>
---
 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(&mdev->dev, VFIO_GROUP_NOTIFY,
+	vfio_unregister_notifier(mdev_dev(mdev), VFIO_GROUP_NOTIFY,
 					&vgpu->vdev.group_notifier);
 
 undo_iommu:
-- 
2.10.2

-- 
Cheers,
Stephen Rothwell

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

[Zhenyu Wang]

[-- Attachment #1: Type: text/plain, Size: 2139 bytes --]

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(&mdev->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 <sfr@canb.auug.org.au>
> 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 <sfr@canb.auug.org.au>
> ---
>  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(&mdev->dev, VFIO_GROUP_NOTIFY,
> +	vfio_unregister_notifier(mdev_dev(mdev), VFIO_GROUP_NOTIFY,
>  					&vgpu->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

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 163 bytes --]

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 <zhenyuw@linux.intel.com> 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(&mdev->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 <sfr@canb.auug.org.au>
> > 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 <sfr@canb.auug.org.au>
> > ---
> >  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(&mdev->dev, VFIO_GROUP_NOTIFY,
> > +	vfio_unregister_notifier(mdev_dev(mdev), VFIO_GROUP_NOTIFY,
> >  					&vgpu->vdev.group_notifier);
> >  
> >  undo_iommu:
> > -- 
> > 2.10.2
> > 
> > -- 
> > Cheers,
> > Stephen Rothwell  
> 

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

[Zhenyu Wang]

[-- Attachment #1: Type: text/plain, Size: 848 bytes --]

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

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 163 bytes --]

Re: [Intel-gfx] linux-next: build failure after merge of the drm-intel-fixes tree

[Jani Nikula]

On Tue, 03 Jan 2017, Zhenyu Wang <zhenyuw@linux.intel.com> wrote:
> 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.

Send what to me? I've pushed fixes to drm-intel-fixes today for testing,
and expect to send a pull request to Dave early Thursday. If there's a
conflict, it can usually be solved while merging, like Stephen has done.

BR,
Jani.


-- 
Jani Nikula, Intel Open Source Technology Center

Re: [Intel-gfx] linux-next: build failure after merge of the drm-intel-fixes tree

[Alex Williamson]

On Tue, 03 Jan 2017 15:25:24 +0200
Jani Nikula <jani.nikula@intel.com> wrote:

> On Tue, 03 Jan 2017, Zhenyu Wang <zhenyuw@linux.intel.com> wrote:
> > 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.  
> 
> Send what to me? I've pushed fixes to drm-intel-fixes today for testing,
> and expect to send a pull request to Dave early Thursday. If there's a
> conflict, it can usually be solved while merging, like Stephen has done.

Unless there's some preference otherwise, I was only asking if the i915
changes were queued for rc3 such that I could trail behind them and
fixup the mdev API change without relying on it getting caught in the
merge.  If we're happy to do it at merge time, I won't worry about it.
Thanks,

Alex

Re: [Intel-gfx] linux-next: build failure after merge of the drm-intel-fixes tree

[Daniel Vetter]

On Tue, Jan 03, 2017 at 01:37:17PM -0700, Alex Williamson wrote:
> On Tue, 03 Jan 2017 15:25:24 +0200
> Jani Nikula <jani.nikula@intel.com> wrote:
> 
> > On Tue, 03 Jan 2017, Zhenyu Wang <zhenyuw@linux.intel.com> wrote:
> > > 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.  
> > 
> > Send what to me? I've pushed fixes to drm-intel-fixes today for testing,
> > and expect to send a pull request to Dave early Thursday. If there's a
> > conflict, it can usually be solved while merging, like Stephen has done.
> 
> Unless there's some preference otherwise, I was only asking if the i915
> changes were queued for rc3 such that I could trail behind them and
> fixup the mdev API change without relying on it getting caught in the
> merge.  If we're happy to do it at merge time, I won't worry about it.

Dave Airlie is still on vacation, so I expect drm fixes pull request to
get a bit delayed. I think adding a warning when sending each respective
pull to Linus about this is the best approach, to avoid stalling mdev
fixes.
-Daniel
-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch