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

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

[Ben Widawsky]

On Tue, Mar 18, 2014 at 09:18:42PM -0400, Steven Rostedt wrote:
> On Wed, 19 Mar 2014 11:53:50 +1100
> Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 
> 
> > Caused by commit a25ca17c1eac ("drm/i915: Do not dereference pointers
> > from ring buffer in evict event").
> > 
> > I have used the drm-intel tree from next-20140318 for today.
> > 
> 
> Bah! I'm still suffering from jet lag (just came back from Linux-Tage
> in Chemnitz).
> 
> The next time I compile test a patch for a module, I'll make sure I have
> that module's config option set :-(  The woe of using localmodconfig. I
> should have picked the box with the i915. :-/
> 
> Below is the fix. I'll repost a v2 of the original patch.
> 
> Sorry about that.
> 

I was about to send out the same fix when I saw this.

Reviewed-by: Ben Widawsky <ben@bwidawsk.net>

> -- Steve
> 
> diff --git a/drivers/gpu/drm/i915/i915_trace.h b/drivers/gpu/drm/i915/i915_trace.h
> index f3e8a90..783ae08 100644
> --- a/drivers/gpu/drm/i915/i915_trace.h
> +++ b/drivers/gpu/drm/i915/i915_trace.h
> @@ -243,7 +243,7 @@ TRACE_EVENT(i915_gem_evict_vm,
>  			    ),
>  
>  	    TP_fast_assign(
> -			   __entry->dev = dev->primary->index;
> +			   __entry->dev = vm->dev->primary->index;
>  			   __entry->vm = vm;
>  			  ),
>  
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Ben Widawsky, Intel Open Source Technology Center

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

[Daniel Vetter]

On Wed, Mar 19, 2014 at 2:54 AM, Ben Widawsky <ben@bwidawsk.net> wrote:
> On Tue, Mar 18, 2014 at 09:18:42PM -0400, Steven Rostedt wrote:
>> On Wed, 19 Mar 2014 11:53:50 +1100
>> Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>
>>
>> > Caused by commit a25ca17c1eac ("drm/i915: Do not dereference pointers
>> > from ring buffer in evict event").
>> >
>> > I have used the drm-intel tree from next-20140318 for today.
>> >
>>
>> Bah! I'm still suffering from jet lag (just came back from Linux-Tage
>> in Chemnitz).
>>
>> The next time I compile test a patch for a module, I'll make sure I have
>> that module's config option set :-(  The woe of using localmodconfig. I
>> should have picked the box with the i915. :-/
>>
>> Below is the fix. I'll repost a v2 of the original patch.
>>
>> Sorry about that.
>>
>
> I was about to send out the same fix when I saw this.
>
> Reviewed-by: Ben Widawsky <ben@bwidawsk.net>

Just fixed this this morning before starting to read mail - my
apologies the mess me pushing out a patch yesterday right before
rushing out caused, really shouldn't be doing that ;-)

Cheers, Daniel
-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch

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

[Jani Nikula]

On Mon, 23 May 2016, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> After merging the drm-intel tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> In file included from drivers/gpu/drm/i915/i915_trace.h:10:0,
>                  from drivers/gpu/drm/i915/i915_drv.h:2735,
>                  from drivers/gpu/drm/i915/i915_drv.c:34:
> drivers/gpu/drm/i915/intel_drv.h:36:41: fatal error: drm/drm_dp_dual_mode_helper.h: No such file or directory
>
> Caused by commit
>
>   8d87410a019f ("drm/i915: Respect DP++ adaptor TMDS clock limit")
>
> I have used the drm-intel tree from next-20160520 for today.

Hi Stephen, my bad, should be fixed now, sorry for the trouble.

(Note to self, don't even dream of doing this stuff when you're out
sick. Try to remember there was a reason you were out sick and not at
the office in the first place...)

BR,
Jani.

-- 
Jani Nikula, Intel Open Source Technology Center

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

[Stephen Rothwell]

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

Hi all,

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

In file included from include/linux/spinlock_types.h:18,
                 from include/linux/mutex.h:16,
                 from include/linux/kernfs.h:12,
                 from include/linux/sysfs.h:16,
                 from include/linux/kobject.h:20,
                 from include/linux/of.h:17,
                 from include/linux/irqdomain.h:35,
                 from include/linux/acpi.h:13,
                 from drivers/gpu/drm/i915/i915_drv.c:30:
drivers/gpu/drm/i915/gem/i915_gem_object.h: In function 'i915_gem_object_pin_pages':
include/linux/lockdep.h:635:2: error: too many arguments to function 'lock_release'
  635 |  lock_release(&(lock)->dep_map, 0, _THIS_IP_);  \
      |  ^~~~~~~~~~~~
drivers/gpu/drm/i915/gem/i915_gem_object.h:294:2: note: in expansion of macro 'might_lock_nested'
  294 |  might_lock_nested(&obj->mm.lock, I915_MM_GET_PAGES);
      |  ^~~~~~~~~~~~~~~~~
include/linux/lockdep.h:352:13: note: declared here
  352 | extern void lock_release(struct lockdep_map *lock, unsigned long ip);
      |             ^~~~~~~~~~~~
In file included from include/linux/spinlock_types.h:18,
                 from include/linux/spinlock.h:83,
                 from include/linux/mmzone.h:8,
                 from include/linux/gfp.h:6,
                 from include/linux/slab.h:15,
                 from drivers/gpu/drm/i915/i915_irq.c:32:
drivers/gpu/drm/i915/gem/i915_gem_object.h: In function 'i915_gem_object_pin_pages':
include/linux/lockdep.h:635:2: error: too many arguments to function 'lock_release'
  635 |  lock_release(&(lock)->dep_map, 0, _THIS_IP_);  \
      |  ^~~~~~~~~~~~
drivers/gpu/drm/i915/gem/i915_gem_object.h:294:2: note: in expansion of macro 'might_lock_nested'
  294 |  might_lock_nested(&obj->mm.lock, I915_MM_GET_PAGES);
      |  ^~~~~~~~~~~~~~~~~
include/linux/lockdep.h:352:13: note: declared here
  352 | extern void lock_release(struct lockdep_map *lock, unsigned long ip);
      |             ^~~~~~~~~~~~

Caused by commit

  e692b4021a2e ("lockdep: add might_lock_nested()")

interacting with commit

  5facae4f3549 ("locking/lockdep: Remove unused @nested argument from lock_release()")

from Linus' tree.

I have applied the following merge fix patch for today:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 10 Dec 2019 09:37:07 +1100
Subject: [PATCH] lockdep: fix up for lock_release API change

---
 include/linux/lockdep.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/linux/lockdep.h b/include/linux/lockdep.h
index 5bbfd5866081..664f52c6dd4c 100644
--- a/include/linux/lockdep.h
+++ b/include/linux/lockdep.h
@@ -632,7 +632,7 @@ do {									\
 	typecheck(struct lockdep_map *, &(lock)->dep_map);		\
 	lock_acquire(&(lock)->dep_map, subclass, 0, 1, 1, NULL,		\
 		     _THIS_IP_);					\
-	lock_release(&(lock)->dep_map, 0, _THIS_IP_);		\
+	lock_release(&(lock)->dep_map, _THIS_IP_);			\
 } while (0)
 
 #define lockdep_assert_irqs_enabled()	do {				\
-- 
2.24.0

-- 
Cheers,
Stephen Rothwell

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

[-- Attachment #2: Type: text/plain, Size: 159 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 tree

[Stephen Rothwell]

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

Hi all,

[Just adding Dave Airlie to the cc list]

On Tue, 10 Dec 2019 09:39:57 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the drm-intel tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> In file included from include/linux/spinlock_types.h:18,
>                  from include/linux/mutex.h:16,
>                  from include/linux/kernfs.h:12,
>                  from include/linux/sysfs.h:16,
>                  from include/linux/kobject.h:20,
>                  from include/linux/of.h:17,
>                  from include/linux/irqdomain.h:35,
>                  from include/linux/acpi.h:13,
>                  from drivers/gpu/drm/i915/i915_drv.c:30:
> drivers/gpu/drm/i915/gem/i915_gem_object.h: In function 'i915_gem_object_pin_pages':
> include/linux/lockdep.h:635:2: error: too many arguments to function 'lock_release'
>   635 |  lock_release(&(lock)->dep_map, 0, _THIS_IP_);  \
>       |  ^~~~~~~~~~~~
> drivers/gpu/drm/i915/gem/i915_gem_object.h:294:2: note: in expansion of macro 'might_lock_nested'
>   294 |  might_lock_nested(&obj->mm.lock, I915_MM_GET_PAGES);
>       |  ^~~~~~~~~~~~~~~~~
> include/linux/lockdep.h:352:13: note: declared here
>   352 | extern void lock_release(struct lockdep_map *lock, unsigned long ip);
>       |             ^~~~~~~~~~~~
> In file included from include/linux/spinlock_types.h:18,
>                  from include/linux/spinlock.h:83,
>                  from include/linux/mmzone.h:8,
>                  from include/linux/gfp.h:6,
>                  from include/linux/slab.h:15,
>                  from drivers/gpu/drm/i915/i915_irq.c:32:
> drivers/gpu/drm/i915/gem/i915_gem_object.h: In function 'i915_gem_object_pin_pages':
> include/linux/lockdep.h:635:2: error: too many arguments to function 'lock_release'
>   635 |  lock_release(&(lock)->dep_map, 0, _THIS_IP_);  \
>       |  ^~~~~~~~~~~~
> drivers/gpu/drm/i915/gem/i915_gem_object.h:294:2: note: in expansion of macro 'might_lock_nested'
>   294 |  might_lock_nested(&obj->mm.lock, I915_MM_GET_PAGES);
>       |  ^~~~~~~~~~~~~~~~~
> include/linux/lockdep.h:352:13: note: declared here
>   352 | extern void lock_release(struct lockdep_map *lock, unsigned long ip);
>       |             ^~~~~~~~~~~~
> 
> Caused by commit
> 
>   e692b4021a2e ("lockdep: add might_lock_nested()")
> 
> interacting with commit
> 
>   5facae4f3549 ("locking/lockdep: Remove unused @nested argument from lock_release()")
> 
> from Linus' tree.
> 
> I have applied the following merge fix patch for today:
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 10 Dec 2019 09:37:07 +1100
> Subject: [PATCH] lockdep: fix up for lock_release API change
> 
> ---
>  include/linux/lockdep.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/include/linux/lockdep.h b/include/linux/lockdep.h
> index 5bbfd5866081..664f52c6dd4c 100644
> --- a/include/linux/lockdep.h
> +++ b/include/linux/lockdep.h
> @@ -632,7 +632,7 @@ do {									\
>  	typecheck(struct lockdep_map *, &(lock)->dep_map);		\
>  	lock_acquire(&(lock)->dep_map, subclass, 0, 1, 1, NULL,		\
>  		     _THIS_IP_);					\
> -	lock_release(&(lock)->dep_map, 0, _THIS_IP_);		\
> +	lock_release(&(lock)->dep_map, _THIS_IP_);			\
>  } while (0)
>  
>  #define lockdep_assert_irqs_enabled()	do {				\

-- 
Cheers,
Stephen Rothwell

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

[-- Attachment #2: Type: text/plain, Size: 159 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 tree

[Jani Nikula]

On Tue, 10 Dec 2019, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> [Just adding Dave Airlie to the cc list]
>
> On Tue, 10 Dec 2019 09:39:57 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>
>> After merging the drm-intel tree, today's linux-next build (x86_64
>> allmodconfig) failed like this:

FYI, I've now backmerged drm-next and thus v5.5-rc1 to
drm-intel-next-queued, resolving the conflict.

BR,
Jani.


>> 
>> In file included from include/linux/spinlock_types.h:18,
>>                  from include/linux/mutex.h:16,
>>                  from include/linux/kernfs.h:12,
>>                  from include/linux/sysfs.h:16,
>>                  from include/linux/kobject.h:20,
>>                  from include/linux/of.h:17,
>>                  from include/linux/irqdomain.h:35,
>>                  from include/linux/acpi.h:13,
>>                  from drivers/gpu/drm/i915/i915_drv.c:30:
>> drivers/gpu/drm/i915/gem/i915_gem_object.h: In function 'i915_gem_object_pin_pages':
>> include/linux/lockdep.h:635:2: error: too many arguments to function 'lock_release'
>>   635 |  lock_release(&(lock)->dep_map, 0, _THIS_IP_);  \
>>       |  ^~~~~~~~~~~~
>> drivers/gpu/drm/i915/gem/i915_gem_object.h:294:2: note: in expansion of macro 'might_lock_nested'
>>   294 |  might_lock_nested(&obj->mm.lock, I915_MM_GET_PAGES);
>>       |  ^~~~~~~~~~~~~~~~~
>> include/linux/lockdep.h:352:13: note: declared here
>>   352 | extern void lock_release(struct lockdep_map *lock, unsigned long ip);
>>       |             ^~~~~~~~~~~~
>> In file included from include/linux/spinlock_types.h:18,
>>                  from include/linux/spinlock.h:83,
>>                  from include/linux/mmzone.h:8,
>>                  from include/linux/gfp.h:6,
>>                  from include/linux/slab.h:15,
>>                  from drivers/gpu/drm/i915/i915_irq.c:32:
>> drivers/gpu/drm/i915/gem/i915_gem_object.h: In function 'i915_gem_object_pin_pages':
>> include/linux/lockdep.h:635:2: error: too many arguments to function 'lock_release'
>>   635 |  lock_release(&(lock)->dep_map, 0, _THIS_IP_);  \
>>       |  ^~~~~~~~~~~~
>> drivers/gpu/drm/i915/gem/i915_gem_object.h:294:2: note: in expansion of macro 'might_lock_nested'
>>   294 |  might_lock_nested(&obj->mm.lock, I915_MM_GET_PAGES);
>>       |  ^~~~~~~~~~~~~~~~~
>> include/linux/lockdep.h:352:13: note: declared here
>>   352 | extern void lock_release(struct lockdep_map *lock, unsigned long ip);
>>       |             ^~~~~~~~~~~~
>> 
>> Caused by commit
>> 
>>   e692b4021a2e ("lockdep: add might_lock_nested()")
>> 
>> interacting with commit
>> 
>>   5facae4f3549 ("locking/lockdep: Remove unused @nested argument from lock_release()")
>> 
>> from Linus' tree.
>> 
>> I have applied the following merge fix patch for today:
>> 
>> From: Stephen Rothwell <sfr@canb.auug.org.au>
>> Date: Tue, 10 Dec 2019 09:37:07 +1100
>> Subject: [PATCH] lockdep: fix up for lock_release API change
>> 
>> ---
>>  include/linux/lockdep.h | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>> 
>> diff --git a/include/linux/lockdep.h b/include/linux/lockdep.h
>> index 5bbfd5866081..664f52c6dd4c 100644
>> --- a/include/linux/lockdep.h
>> +++ b/include/linux/lockdep.h
>> @@ -632,7 +632,7 @@ do {									\
>>  	typecheck(struct lockdep_map *, &(lock)->dep_map);		\
>>  	lock_acquire(&(lock)->dep_map, subclass, 0, 1, 1, NULL,		\
>>  		     _THIS_IP_);					\
>> -	lock_release(&(lock)->dep_map, 0, _THIS_IP_);		\
>> +	lock_release(&(lock)->dep_map, _THIS_IP_);			\
>>  } while (0)
>>  
>>  #define lockdep_assert_irqs_enabled()	do {				\

-- 
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
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 tree

[Stephen Rothwell]

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

Hi all,

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

drivers/gpu/drm/msm/dp/dp_ctrl.c: In function 'dp_ctrl_use_fixed_nvid':
drivers/gpu/drm/msm/dp/dp_ctrl.c:1425:16: error: implicit declaration of function 'drm_dp_get_edid_quirks'; did you mean 'drm_do_get_edid'? [-Werror=implicit-function-declaration]
 1425 |  edid_quirks = drm_dp_get_edid_quirks(ctrl->panel->edid);
      |                ^~~~~~~~~~~~~~~~~~~~~~
      |                drm_do_get_edid
drivers/gpu/drm/msm/dp/dp_ctrl.c:1431:11: error: too many arguments to function 'drm_dp_has_quirk'
 1431 |   return (drm_dp_has_quirk(&ctrl->panel->desc, edid_quirks,
      |           ^~~~~~~~~~~~~~~~
In file included from drivers/gpu/drm/msm/dp/dp_ctrl.c:15:
include/drm/drm_dp_helper.h:2087:1: note: declared here
 2087 | drm_dp_has_quirk(const struct drm_dp_desc *desc, enum drm_dp_quirk quirk)
      | ^~~~~~~~~~~~~~~~

Caused by commit

  7c553f8b5a7d ("drm/dp: Revert "drm/dp: Introduce EDID-based quirks"")

Since the drm-intel tree still has its other build failure, I used the
version from next-20210108 again 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 tree

[Stephen Rothwell]

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

Hi all,

On Wed, 20 Jan 2021 10:57:15 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the drm-intel tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
> 
> drivers/gpu/drm/msm/dp/dp_ctrl.c: In function 'dp_ctrl_use_fixed_nvid':
> drivers/gpu/drm/msm/dp/dp_ctrl.c:1425:16: error: implicit declaration of function 'drm_dp_get_edid_quirks'; did you mean 'drm_do_get_edid'? [-Werror=implicit-function-declaration]
>  1425 |  edid_quirks = drm_dp_get_edid_quirks(ctrl->panel->edid);
>       |                ^~~~~~~~~~~~~~~~~~~~~~
>       |                drm_do_get_edid
> drivers/gpu/drm/msm/dp/dp_ctrl.c:1431:11: error: too many arguments to function 'drm_dp_has_quirk'
>  1431 |   return (drm_dp_has_quirk(&ctrl->panel->desc, edid_quirks,
>       |           ^~~~~~~~~~~~~~~~
> In file included from drivers/gpu/drm/msm/dp/dp_ctrl.c:15:
> include/drm/drm_dp_helper.h:2087:1: note: declared here
>  2087 | drm_dp_has_quirk(const struct drm_dp_desc *desc, enum drm_dp_quirk quirk)
>       | ^~~~~~~~~~~~~~~~
> 
> Caused by commit
> 
>   7c553f8b5a7d ("drm/dp: Revert "drm/dp: Introduce EDID-based quirks"")
> 
> Since the drm-intel tree still has its other build failure, I used the
> version from next-20210108 again today.

I still get this failure, but not the one from the drm tree, so I have
used the drm-intel tree from next-20210119 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 tree

[Stephen Rothwell]

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

Hi all,

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

drivers/gpu/drm/i915/gvt/handlers.c: In function 'init_skl_mmio_info':
drivers/gpu/drm/i915/gvt/handlers.c:3345:9: error: 'CSR_SSP_BASE' undeclared (first use in this function); did you mean 'DMC_SSP_BASE'?
 3345 |  MMIO_D(CSR_SSP_BASE, D_SKL_PLUS);
      |         ^~~~~~~~~~~~
drivers/gpu/drm/i915/gvt/handlers.c:2120:48: note: in definition of macro 'MMIO_F'
 2120 |  ret = new_mmio_info(gvt, i915_mmio_reg_offset(reg), \
      |                                                ^~~
drivers/gpu/drm/i915/gvt/handlers.c:3345:2: note: in expansion of macro 'MMIO_D'
 3345 |  MMIO_D(CSR_SSP_BASE, D_SKL_PLUS);
      |  ^~~~~~
drivers/gpu/drm/i915/gvt/handlers.c:3345:9: note: each undeclared identifier is reported only once for each function it appears in
 3345 |  MMIO_D(CSR_SSP_BASE, D_SKL_PLUS);
      |         ^~~~~~~~~~~~
drivers/gpu/drm/i915/gvt/handlers.c:2120:48: note: in definition of macro 'MMIO_F'
 2120 |  ret = new_mmio_info(gvt, i915_mmio_reg_offset(reg), \
      |                                                ^~~
drivers/gpu/drm/i915/gvt/handlers.c:3345:2: note: in expansion of macro 'MMIO_D'
 3345 |  MMIO_D(CSR_SSP_BASE, D_SKL_PLUS);
      |  ^~~~~~
drivers/gpu/drm/i915/gvt/handlers.c:3346:9: error: 'CSR_HTP_SKL' undeclared (first use in this function); did you mean 'DMC_HTP_SKL'?
 3346 |  MMIO_D(CSR_HTP_SKL, D_SKL_PLUS);
      |         ^~~~~~~~~~~
drivers/gpu/drm/i915/gvt/handlers.c:2120:48: note: in definition of macro 'MMIO_F'
 2120 |  ret = new_mmio_info(gvt, i915_mmio_reg_offset(reg), \
      |                                                ^~~
drivers/gpu/drm/i915/gvt/handlers.c:3346:2: note: in expansion of macro 'MMIO_D'
 3346 |  MMIO_D(CSR_HTP_SKL, D_SKL_PLUS);
      |  ^~~~~~
drivers/gpu/drm/i915/gvt/handlers.c:3347:9: error: 'CSR_LAST_WRITE' undeclared (first use in this function); did you mean 'DMC_LAST_WRITE'?
 3347 |  MMIO_D(CSR_LAST_WRITE, D_SKL_PLUS);
      |         ^~~~~~~~~~~~~~
drivers/gpu/drm/i915/gvt/handlers.c:2120:48: note: in definition of macro 'MMIO_F'
 2120 |  ret = new_mmio_info(gvt, i915_mmio_reg_offset(reg), \
      |                                                ^~~
drivers/gpu/drm/i915/gvt/handlers.c:3347:2: note: in expansion of macro 'MMIO_D'
 3347 |  MMIO_D(CSR_LAST_WRITE, D_SKL_PLUS);
      |  ^~~~~~
In file included from drivers/gpu/drm/i915/i915_drv.h:64,
                 from drivers/gpu/drm/i915/gvt/handlers.c:39:
drivers/gpu/drm/i915/gvt/handlers.c: At top level:
drivers/gpu/drm/i915/gvt/handlers.c:3658:21: error: 'CSR_MMIO_START_RANGE' undeclared here (not in a function); did you mean 'DMC_MMIO_START_RANGE'?
 3658 |  {D_SKL_PLUS, _MMIO(CSR_MMIO_START_RANGE), 0x3000, NULL, NULL},
      |                     ^~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/i915/i915_reg.h:185:47: note: in definition of macro '_MMIO'
  185 | #define _MMIO(r) ((const i915_reg_t){ .reg = (r) })
      |                                               ^

Caused by commit

  0633cdcbaa77 ("drm/i915/dmc: Rename macro names containing csr")

I have used the drm-intel tree from next-20210520 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 tree

[Stephen Rothwell]

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

Hi all,

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

drivers/gpu/drm/i915/gvt/kvmgt.c: In function 'handle_edid_regs':
drivers/gpu/drm/i915/gvt/kvmgt.c:595:38: error: implicit declaration of function 'drm_edid_block_valid' [-Werror=implicit-function-declaration]
  595 |                                 if (!drm_edid_block_valid(
      |                                      ^~~~~~~~~~~~~~~~~~~~

Presumably caused by commit

  14da21cc4671 ("drm/i915: axe lots of unnecessary includes from i915_drv.h")

I am beginning to wonder if you guys run stuff through your CI before
relasing to linux-next.  Especially important when removing #include
statements from include files :-)

I have used the drm-intel tree from next-20220214 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 tree

[Jani Nikula]

On Tue, 15 Feb 2022, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> After merging the drm-intel tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/gpu/drm/i915/gvt/kvmgt.c: In function 'handle_edid_regs':
> drivers/gpu/drm/i915/gvt/kvmgt.c:595:38: error: implicit declaration of function 'drm_edid_block_valid' [-Werror=implicit-function-declaration]
>   595 |                                 if (!drm_edid_block_valid(
>       |                                      ^~~~~~~~~~~~~~~~~~~~
>
> Presumably caused by commit
>
>   14da21cc4671 ("drm/i915: axe lots of unnecessary includes from i915_drv.h")
>
> I am beginning to wonder if you guys run stuff through your CI before
> relasing to linux-next.  Especially important when removing #include
> statements from include files :-)

Thanks for the report. Apparently CI (and I) have VFIO=n, VFIO_MDEV=n,
and DRM_I915_GVT_KVMGT=n.

BR,
Jani.


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

-- 
Jani Nikula, Intel Open Source Graphics Center

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

[Stephen Rothwell]

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

Hi all,

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

ERROR: modpost: "intel_runtime_pm_put" [drivers/gpu/drm/i915/kvmgt.ko] undefined!

Possibly caused by commit

  8b750bf74418 ("drm/i915/gvt: move the gvt code into kvmgt.ko")

or one of tehe follow ups.

I have used the drm-intel tree from next-20220422 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 tree

[Jani Nikula]

On Tue, 26 Apr 2022, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> After merging the drm-intel tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> ERROR: modpost: "intel_runtime_pm_put" [drivers/gpu/drm/i915/kvmgt.ko] undefined!
>
> Possibly caused by commit
>
>   8b750bf74418 ("drm/i915/gvt: move the gvt code into kvmgt.ko")
>
> or one of tehe follow ups.
>
> I have used the drm-intel tree from next-20220422 for today.

Details at [1], fix at [2].

BR,
Jani.

[1] https://lore.kernel.org/r/87ilqxuyu3.fsf@intel.com
[2] https://lore.kernel.org/r/20220425220331.24865-1-zhi.a.wang@intel.com


-- 
Jani Nikula, Intel Open Source Graphics Center

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

[Stephen Rothwell]

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

Hi all,

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

drivers/gpu/drm/i915/gt/uc/intel_guc.c: In function 'intel_guc_dump_time_info':
drivers/gpu/drm/i915/gt/uc/intel_guc.c:399:9: error: implicit declaration of function 'intel_device_info_print_runtime'; did you mean 'intel_device_info_print'? [-Werror=implicit-function-declaration]
  399 |         intel_device_info_print_runtime(RUNTIME_INFO(gt->i915), p);
      |         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
      |         intel_device_info_print

Caused by commit

  c7d3c8447b26 ("drm/i915: combine device info printing into one")

interacting with commit

  368d179adbac ("drm/i915/guc: Add GuC <-> kernel time stamp translation information")

from the drm tree.

I have applied the following merge fix patch for today:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 26 Aug 2022 12:30:19 +1000
Subject: [PATCH] fix up for "drm/i915/guc: Add GuC <-> kernel time stamp translation information"

interacting with "drm/i915: combine device info printing into one".

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/gpu/drm/i915/gt/uc/intel_guc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc.c b/drivers/gpu/drm/i915/gt/uc/intel_guc.c
index ab4aacc516aa..977278d71182 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_guc.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_guc.c
@@ -396,7 +396,7 @@ void intel_guc_dump_time_info(struct intel_guc *guc, struct drm_printer *p)
 	u32 stamp = 0;
 	u64 ktime;
 
-	intel_device_info_print_runtime(RUNTIME_INFO(gt->i915), p);
+	intel_device_info_print(INTEL_INFO(gt->i915), RUNTIME_INFO(gt->i915), p);
 
 	with_intel_runtime_pm(&gt->i915->runtime_pm, wakeref)
 		stamp = intel_uncore_read(gt->uncore, GUCPMTIMESTAMP);
-- 
2.35.1

-- 
Cheers,
Stephen Rothwell

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

[Intel-gfx] ✗ Fi.CI.BUILD: failure for linux-next: build failure after merge of the drm-intel tree (rev4)

[Patchwork]

== Series Details ==

Series: linux-next: build failure after merge of the drm-intel tree (rev4)
URL   : https://patchwork.freedesktop.org/series/42839/
State : failure

== Summary ==

Error: patch https://patchwork.freedesktop.org/api/1.0/series/42839/revisions/4/mbox/ not applied
Applying: linux-next: build failure after merge of the drm-intel tree
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/gt/uc/intel_guc.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/gt/uc/intel_guc.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/uc/intel_guc.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 linux-next: build failure after merge of the drm-intel tree
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

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

[Jani Nikula]

On Fri, 26 Aug 2022, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> After merging the drm-intel tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/gpu/drm/i915/gt/uc/intel_guc.c: In function 'intel_guc_dump_time_info':
> drivers/gpu/drm/i915/gt/uc/intel_guc.c:399:9: error: implicit declaration of function 'intel_device_info_print_runtime'; did you mean 'intel_device_info_print'? [-Werror=implicit-function-declaration]
>   399 |         intel_device_info_print_runtime(RUNTIME_INFO(gt->i915), p);
>       |         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>       |         intel_device_info_print
>
> Caused by commit
>
>   c7d3c8447b26 ("drm/i915: combine device info printing into one")
>
> interacting with commit
>
>   368d179adbac ("drm/i915/guc: Add GuC <-> kernel time stamp translation information")
>
> from the drm tree.

There's commit f0c70d41e4e8 ("drm/i915/guc: remove runtime info printing
from time stamp logging") in drm-intel-gt-next removing that line
altogether.

BR,
Jani.

>
> I have applied the following merge fix patch for today:
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Fri, 26 Aug 2022 12:30:19 +1000
> Subject: [PATCH] fix up for "drm/i915/guc: Add GuC <-> kernel time stamp translation information"
>
> interacting with "drm/i915: combine device info printing into one".
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/gpu/drm/i915/gt/uc/intel_guc.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc.c b/drivers/gpu/drm/i915/gt/uc/intel_guc.c
> index ab4aacc516aa..977278d71182 100644
> --- a/drivers/gpu/drm/i915/gt/uc/intel_guc.c
> +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc.c
> @@ -396,7 +396,7 @@ void intel_guc_dump_time_info(struct intel_guc *guc, struct drm_printer *p)
>  	u32 stamp = 0;
>  	u64 ktime;
>  
> -	intel_device_info_print_runtime(RUNTIME_INFO(gt->i915), p);
> +	intel_device_info_print(INTEL_INFO(gt->i915), RUNTIME_INFO(gt->i915), p);
>  
>  	with_intel_runtime_pm(&gt->i915->runtime_pm, wakeref)
>  		stamp = intel_uncore_read(gt->uncore, GUCPMTIMESTAMP);
> -- 
> 2.35.1

-- 
Jani Nikula, Intel Open Source Graphics Center