Re: [Intel-gfx] linux-next: build failure after merge of the drm-intel tree
On Fri, 26 Aug 2022, Stephen Rothwell 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 > 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 > --- > 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(>->i915->runtime_pm, wakeref) > stamp = intel_uncore_read(gt->uncore, GUCPMTIMESTAMP); > -- > 2.35.1 -- Jani Nikula, Intel Open Source Graphics Center
[Intel-gfx] linux-next: build failure after merge of the drm-intel tree
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 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 --- 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(>->i915->runtime_pm, wakeref) stamp = intel_uncore_read(gt->uncore, GUCPMTIMESTAMP); -- 2.35.1 -- Cheers, Stephen Rothwell pgpcytQCJufjF.pgp Description: OpenPGP digital signature
Re: [Intel-gfx] linux-next: build failure after merge of the drm-intel tree
On Tue, 26 Apr 2022, Stephen Rothwell 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@intel.com [2] https://lore.kernel.org/r/20220425220331.24865-1-zhi.a.w...@intel.com -- Jani Nikula, Intel Open Source Graphics Center
[Intel-gfx] linux-next: build failure after merge of the drm-intel tree
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 pgpQWBMcQ4M2j.pgp Description: OpenPGP digital signature
Re: [Intel-gfx] linux-next: build failure after merge of the drm-intel tree
On Tue, 15 Feb 2022, Stephen Rothwell 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
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 pgpEN1JYDctRF.pgp Description: OpenPGP digital signature
[Intel-gfx] linux-next: build failure after merge of the drm-intel tree
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 pgpevIrKne_Fd.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-intel tree
Hi all, On Wed, 20 Jan 2021 10:57:15 +1100 Stephen Rothwell 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 pgpBlpaqoIsSK.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-intel tree
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 pgp_guYF11K3o.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-intel tree
On Tue, 10 Dec 2019, Stephen Rothwell wrote: > Hi all, > > [Just adding Dave Airlie to the cc list] > > On Tue, 10 Dec 2019 09:39:57 +1100 Stephen Rothwell > 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 >> 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
Re: [Intel-gfx] linux-next: build failure after merge of the drm-intel tree
Hi all, [Just adding Dave Airlie to the cc list] On Tue, 10 Dec 2019 09:39:57 +1100 Stephen Rothwell 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 > 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 pgpFzTGMTexqX.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-intel tree
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 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 pgpcomlxblEzl.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-intel tree
Hi Joonas, On Wed, 27 Mar 2019 13:07:40 +0200 Joonas Lahtinen wrote: > > Quoting Stephen Rothwell (2019-03-27 04:59:04) > > > > After merging the drm-intel tree, today's linux-next build (i386 > > defconfig) failed like this: > > We had a CI reporting mishap, where a failed 32-bit build resulted in > a misleading success e-mail being sent. It happens. > The tree is now fixed and we'll investigate the problem to avoid such > a false report in the future. Thanks. -- Cheers, Stephen Rothwell pgpm5ymnXX5E3.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-intel tree
Quoting Stephen Rothwell (2019-03-27 04:59:04) > Hi all, > > After merging the drm-intel tree, today's linux-next build (i386 > defconfig) failed like this: We had a CI reporting mishap, where a failed 32-bit build resulted in a misleading success e-mail being sent. The tree is now fixed and we'll investigate the problem to avoid such a false report in the future. Regards, Joonas > > In file included from drivers/gpu/drm/i915/intel_guc.h:28:0, > from drivers/gpu/drm/i915/intel_uc.h:27, > from drivers/gpu/drm/i915/intel_uc.c:25: > drivers/gpu/drm/i915/intel_uncore.h: In function '__raw_uncore_read64': > drivers/gpu/drm/i915/intel_uncore.h:257:9: error: implicit declaration of > function 'readq'; did you mean 'readl'? > [-Werror=implicit-function-declaration] > return read##s__(uncore->regs + i915_mmio_reg_offset(reg)); \ > ^ > drivers/gpu/drm/i915/intel_uncore.h:269:1: note: in expansion of macro > '__raw_read' > __raw_read(64, q) > ^~ > drivers/gpu/drm/i915/intel_uncore.h: In function '__raw_uncore_write64': > drivers/gpu/drm/i915/intel_uncore.h:264:2: error: implicit declaration of > function 'writeq'; did you mean 'writel'? > [-Werror=implicit-function-declaration] > write##s__(val, uncore->regs + i915_mmio_reg_offset(reg)); \ > ^ > drivers/gpu/drm/i915/intel_uncore.h:274:1: note: in expansion of macro > '__raw_write' > __raw_write(64, q) > ^~~ > > Caused by commit > > 6cc5ca768825 ("drm/i915: rename raw reg access functions") > > I have reverted that commit and the following ones in the tree up to > > 9511cb6481af ("drm/i915: Adding missing '; ' to ENGINE_INSTANCES") > > -- > 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 tree
Hi all, After merging the drm-intel tree, today's linux-next build (i386 defconfig) failed like this: In file included from drivers/gpu/drm/i915/intel_guc.h:28:0, from drivers/gpu/drm/i915/intel_uc.h:27, from drivers/gpu/drm/i915/intel_uc.c:25: drivers/gpu/drm/i915/intel_uncore.h: In function '__raw_uncore_read64': drivers/gpu/drm/i915/intel_uncore.h:257:9: error: implicit declaration of function 'readq'; did you mean 'readl'? [-Werror=implicit-function-declaration] return read##s__(uncore->regs + i915_mmio_reg_offset(reg)); \ ^ drivers/gpu/drm/i915/intel_uncore.h:269:1: note: in expansion of macro '__raw_read' __raw_read(64, q) ^~ drivers/gpu/drm/i915/intel_uncore.h: In function '__raw_uncore_write64': drivers/gpu/drm/i915/intel_uncore.h:264:2: error: implicit declaration of function 'writeq'; did you mean 'writel'? [-Werror=implicit-function-declaration] write##s__(val, uncore->regs + i915_mmio_reg_offset(reg)); \ ^ drivers/gpu/drm/i915/intel_uncore.h:274:1: note: in expansion of macro '__raw_write' __raw_write(64, q) ^~~ Caused by commit 6cc5ca768825 ("drm/i915: rename raw reg access functions") I have reverted that commit and the following ones in the tree up to 9511cb6481af ("drm/i915: Adding missing '; ' to ENGINE_INSTANCES") -- Cheers, Stephen Rothwell pgphbS4xFJIay.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-intel tree
Hi all, On Fri, 13 Jul 2018 11:54:19 +1000 Stephen Rothwell wrote: > > [Dave cc'd because this will probably turn up in the drm tree soon.] And now it has ... > 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 'gvt_dma_map_page': > drivers/gpu/drm/i915/gvt/kvmgt.c:188:17: error: 'pfn' undeclared (first use > in this function); did you mean 'gfn'? > if (!pfn_valid(pfn)) { > ^~~ > > Caused by commit > > 79e542f5af79 ("drm/i915/kvmgt: Support setting dma map for huge pages") > > interacting with commit > > 39b4cbadb9a9 ("drm/i915/kvmgt: Check the pfn got from vfio_pin_pages") > > from Linus' tree (v4.18-rc1). > > I added the following merge fix patch: > > From: Stephen Rothwell > Date: Fri, 13 Jul 2018 11:48:41 +1000 > Subject: [PATCH] drm/i915/kvmgt: merge fixup for "Check the pfn got from > vfio_pin_pages" > > Signed-off-by: Stephen Rothwell > --- > drivers/gpu/drm/i915/gvt/kvmgt.c | 6 -- > 1 file changed, 6 deletions(-) > > diff --git a/drivers/gpu/drm/i915/gvt/kvmgt.c > b/drivers/gpu/drm/i915/gvt/kvmgt.c > index 718ab307a500..4d2f53ae9f0f 100644 > --- a/drivers/gpu/drm/i915/gvt/kvmgt.c > +++ b/drivers/gpu/drm/i915/gvt/kvmgt.c > @@ -185,12 +185,6 @@ static int gvt_dma_map_page(struct intel_vgpu *vgpu, > unsigned long gfn, > if (ret) > return ret; > > - if (!pfn_valid(pfn)) { > - gvt_vgpu_err("pfn 0x%lx is not mem backed\n", pfn); > - vfio_unpin_pages(mdev_dev(vgpu->vdev.mdev), &gfn, 1); > - return -EINVAL; > - } > - > /* Setup DMA mapping. */ > *dma_addr = dma_map_page(dev, page, 0, size, PCI_DMA_BIDIRECTIONAL); > ret = dma_mapping_error(dev, *dma_addr); -- Cheers, Stephen Rothwell pgpYOXVmvcrvX.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-intel tree
Hi all, [Dave cc'd because this will probably turn up in the drm tree soon.] 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 'gvt_dma_map_page': drivers/gpu/drm/i915/gvt/kvmgt.c:188:17: error: 'pfn' undeclared (first use in this function); did you mean 'gfn'? if (!pfn_valid(pfn)) { ^~~ Caused by commit 79e542f5af79 ("drm/i915/kvmgt: Support setting dma map for huge pages") interacting with commit 39b4cbadb9a9 ("drm/i915/kvmgt: Check the pfn got from vfio_pin_pages") from Linus' tree (v4.18-rc1). I added the following merge fix patch: From: Stephen Rothwell Date: Fri, 13 Jul 2018 11:48:41 +1000 Subject: [PATCH] drm/i915/kvmgt: merge fixup for "Check the pfn got from vfio_pin_pages" Signed-off-by: Stephen Rothwell --- drivers/gpu/drm/i915/gvt/kvmgt.c | 6 -- 1 file changed, 6 deletions(-) diff --git a/drivers/gpu/drm/i915/gvt/kvmgt.c b/drivers/gpu/drm/i915/gvt/kvmgt.c index 718ab307a500..4d2f53ae9f0f 100644 --- a/drivers/gpu/drm/i915/gvt/kvmgt.c +++ b/drivers/gpu/drm/i915/gvt/kvmgt.c @@ -185,12 +185,6 @@ static int gvt_dma_map_page(struct intel_vgpu *vgpu, unsigned long gfn, if (ret) return ret; - if (!pfn_valid(pfn)) { - gvt_vgpu_err("pfn 0x%lx is not mem backed\n", pfn); - vfio_unpin_pages(mdev_dev(vgpu->vdev.mdev), &gfn, 1); - return -EINVAL; - } - /* Setup DMA mapping. */ *dma_addr = dma_map_page(dev, page, 0, size, PCI_DMA_BIDIRECTIONAL); ret = dma_mapping_error(dev, *dma_addr); -- 2.18.0 -- Cheers, Stephen Rothwell pgpTpnUiuSRT4.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-intel tree
Hi Christoph, On Wed, 9 May 2018 07:08:55 +0200 Christoph Hellwig wrote: > > FYI, because the dma_configure change touch so much code and the author > wants to base more work on it it actually is in a guranteed stable > branch with just those patches: > > git://git.infradead.org/users/hch/dma-mapping.git dma-configure > > Gitweb: > > > http://git.infradead.org/users/hch/dma-mapping.git/shortlog/refs/heads/dma-configure > > Feel free to pull this into the drm tree. Thanks for that. -- Cheers, Stephen Rothwell pgpwiGSy0YJud.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-intel tree
On Wed, May 09, 2018 at 03:02:55PM +1000, Stephen Rothwell wrote: > > - ret = of_dma_configure(dev, NULL); > > + ret = of_dma_configure(dev, NULL, true); > > if (ret < 0) { > > DRM_ERROR("Cannot setup DMA ops, ret %d", ret); > > return ret; > > -- > > 2.17.0 > > This is now needed for the merge of the drm and dma-mapping trees. FYI, because the dma_configure change touch so much code and the author wants to base more work on it it actually is in a guranteed stable branch with just those patches: git://git.infradead.org/users/hch/dma-mapping.git dma-configure Gitweb: http://git.infradead.org/users/hch/dma-mapping.git/shortlog/refs/heads/dma-configure Feel free to pull this into the drm tree. ___ 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
Hi all, On Tue, 8 May 2018 11:07:16 +1000 Stephen Rothwell wrote: > > After merging the drm-intel tree, today's linux-next build (x86_64 > allmodconfig) failed like this: > > drivers/gpu/drm/xen/xen_drm_front.c: In function 'xen_drv_probe': > drivers/gpu/drm/xen/xen_drm_front.c:740:10: error: 'struct bus_type' has no > member named 'force_dma' > dev->bus->force_dma = true; > ^~ > drivers/gpu/drm/xen/xen_drm_front.c:742:8: error: too few arguments to > function 'of_dma_configure' > ret = of_dma_configure(dev, NULL); > ^~~~ > In file included from drivers/gpu/drm/xen/xen_drm_front.c:16:0: > include/linux/of_device.h:58:5: note: declared here > int of_dma_configure(struct device *dev, > ^~~~ > > Caused by commit > > c575b7eeb89f ("drm/xen-front: Add support for Xen PV display frontend") > > interacting with commit > > 3d6ce86ee794 ("drivers: remove force dma flag from buses") > > from the dma-mapping tree. > > I have added the following merge fix patch: > > From: Stephen Rothwell > Date: Tue, 8 May 2018 11:02:24 +1000 > Subject: [PATCH] drm/xen-front: merge fix for "drivers: remove force dma flag > from buses" > > Signed-off-by: Stephen Rothwell > --- > drivers/gpu/drm/xen/xen_drm_front.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/xen/xen_drm_front.c > b/drivers/gpu/drm/xen/xen_drm_front.c > index 1b0ea9ac330e..0e486cb1c10c 100644 > --- a/drivers/gpu/drm/xen/xen_drm_front.c > +++ b/drivers/gpu/drm/xen/xen_drm_front.c > @@ -737,9 +737,8 @@ static int xen_drv_probe(struct xenbus_device *xb_dev, >* is not correct: to fix this call of_dma_configure() with a NULL >* node to set default DMA ops. >*/ > - dev->bus->force_dma = true; > dev->coherent_dma_mask = DMA_BIT_MASK(32); > - ret = of_dma_configure(dev, NULL); > + ret = of_dma_configure(dev, NULL, true); > if (ret < 0) { > DRM_ERROR("Cannot setup DMA ops, ret %d", ret); > return ret; > -- > 2.17.0 This is now needed for the merge of the drm and dma-mapping trees. -- Cheers, Stephen Rothwell pgpxmBPftk1Nt.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-intel tree
On 05/08/2018 04:07 AM, Stephen Rothwell wrote: Hi all, After merging the drm-intel tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/gpu/drm/xen/xen_drm_front.c: In function 'xen_drv_probe': drivers/gpu/drm/xen/xen_drm_front.c:740:10: error: 'struct bus_type' has no member named 'force_dma' dev->bus->force_dma = true; ^~ drivers/gpu/drm/xen/xen_drm_front.c:742:8: error: too few arguments to function 'of_dma_configure' ret = of_dma_configure(dev, NULL); ^~~~ In file included from drivers/gpu/drm/xen/xen_drm_front.c:16:0: include/linux/of_device.h:58:5: note: declared here int of_dma_configure(struct device *dev, ^~~~ Caused by commit c575b7eeb89f ("drm/xen-front: Add support for Xen PV display frontend") interacting with commit 3d6ce86ee794 ("drivers: remove force dma flag from buses") from the dma-mapping tree. I have added the following merge fix patch: From: Stephen Rothwell Date: Tue, 8 May 2018 11:02:24 +1000 Subject: [PATCH] drm/xen-front: merge fix for "drivers: remove force dma flag from buses" Signed-off-by: Stephen Rothwell Thank you, Reviewed-by: Oleksandr Andrushchenko --- drivers/gpu/drm/xen/xen_drm_front.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/gpu/drm/xen/xen_drm_front.c b/drivers/gpu/drm/xen/xen_drm_front.c index 1b0ea9ac330e..0e486cb1c10c 100644 --- a/drivers/gpu/drm/xen/xen_drm_front.c +++ b/drivers/gpu/drm/xen/xen_drm_front.c @@ -737,9 +737,8 @@ static int xen_drv_probe(struct xenbus_device *xb_dev, * is not correct: to fix this call of_dma_configure() with a NULL * node to set default DMA ops. */ - dev->bus->force_dma = true; dev->coherent_dma_mask = DMA_BIT_MASK(32); - ret = of_dma_configure(dev, NULL); + ret = of_dma_configure(dev, NULL, true); if (ret < 0) { DRM_ERROR("Cannot setup DMA ops, ret %d", ret); return ret; ___ dri-devel mailing list dri-de...@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 tree
Hi all, After merging the drm-intel tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/gpu/drm/xen/xen_drm_front.c: In function 'xen_drv_probe': drivers/gpu/drm/xen/xen_drm_front.c:740:10: error: 'struct bus_type' has no member named 'force_dma' dev->bus->force_dma = true; ^~ drivers/gpu/drm/xen/xen_drm_front.c:742:8: error: too few arguments to function 'of_dma_configure' ret = of_dma_configure(dev, NULL); ^~~~ In file included from drivers/gpu/drm/xen/xen_drm_front.c:16:0: include/linux/of_device.h:58:5: note: declared here int of_dma_configure(struct device *dev, ^~~~ Caused by commit c575b7eeb89f ("drm/xen-front: Add support for Xen PV display frontend") interacting with commit 3d6ce86ee794 ("drivers: remove force dma flag from buses") from the dma-mapping tree. I have added the following merge fix patch: From: Stephen Rothwell Date: Tue, 8 May 2018 11:02:24 +1000 Subject: [PATCH] drm/xen-front: merge fix for "drivers: remove force dma flag from buses" Signed-off-by: Stephen Rothwell --- drivers/gpu/drm/xen/xen_drm_front.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/gpu/drm/xen/xen_drm_front.c b/drivers/gpu/drm/xen/xen_drm_front.c index 1b0ea9ac330e..0e486cb1c10c 100644 --- a/drivers/gpu/drm/xen/xen_drm_front.c +++ b/drivers/gpu/drm/xen/xen_drm_front.c @@ -737,9 +737,8 @@ static int xen_drv_probe(struct xenbus_device *xb_dev, * is not correct: to fix this call of_dma_configure() with a NULL * node to set default DMA ops. */ - dev->bus->force_dma = true; dev->coherent_dma_mask = DMA_BIT_MASK(32); - ret = of_dma_configure(dev, NULL); + ret = of_dma_configure(dev, NULL, true); if (ret < 0) { DRM_ERROR("Cannot setup DMA ops, ret %d", ret); return ret; -- 2.17.0 -- Cheers, Stephen Rothwell pgpJRVkeJqfMO.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-intel tree
On Tue, Oct 18, 2016 at 10:59:20AM +1100, Stephen Rothwell 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/handlers.c: In function 'render_mmio_to_ring_id': > drivers/gpu/drm/i915/gvt/handlers.c:137:31: error: request for member > 'mmio_base' in something not a structure or union >if (gvt->dev_priv->engine[i].mmio_base == reg) >^ > drivers/gpu/drm/i915/gvt/scheduler.c: In function 'populate_shadow_context': > drivers/gpu/drm/i915/gvt/scheduler.c:71:4: error: passing argument 1 of > 'intel_lr_context_size' from incompatible pointer type > [-Werror=incompatible-pointer-types] > &gvt->dev_priv->engine[ring_id]); > ^ > In file included from drivers/gpu/drm/i915/i915_drv.h:58:0, > from drivers/gpu/drm/i915/gvt/scheduler.c:36: > drivers/gpu/drm/i915/intel_lrc.h:84:10: note: expected 'struct > intel_engine_cs *' but argument is of type 'struct intel_engine_cs **' > uint32_t intel_lr_context_size(struct intel_engine_cs *engine); > ^ > drivers/gpu/drm/i915/gvt/scheduler.c: In function 'dispatch_workload': > drivers/gpu/drm/i915/gvt/scheduler.c:174:41: error: passing argument 1 of > 'i915_gem_request_alloc' from incompatible pointer type > [-Werror=incompatible-pointer-types] > workload->req = i915_gem_request_alloc(&dev_priv->engine[ring_id], > ^ > In file included from drivers/gpu/drm/i915/intel_ringbuffer.h:6:0, > from drivers/gpu/drm/i915/intel_guc.h:29, > from drivers/gpu/drm/i915/i915_drv.h:57, > from drivers/gpu/drm/i915/gvt/scheduler.c:36: > drivers/gpu/drm/i915/i915_gem_request.h:156:1: note: expected 'struct > intel_engine_cs *' but argument is of type 'struct intel_engine_cs **' > i915_gem_request_alloc(struct intel_engine_cs *engine, > ^ > drivers/gpu/drm/i915/gvt/scheduler.c: In function 'update_guest_context': > drivers/gpu/drm/i915/gvt/scheduler.c:301:4: error: passing argument 1 of > 'intel_lr_context_size' from incompatible pointer type > [-Werror=incompatible-pointer-types] > &gvt->dev_priv->engine[ring_id]); > ^ > In file included from drivers/gpu/drm/i915/i915_drv.h:58:0, > from drivers/gpu/drm/i915/gvt/scheduler.c:36: > drivers/gpu/drm/i915/intel_lrc.h:84:10: note: expected 'struct > intel_engine_cs *' but argument is of type 'struct intel_engine_cs **' > uint32_t intel_lr_context_size(struct intel_engine_cs *engine); > ^ > drivers/gpu/drm/i915/gvt/execlist.c: In function 'emulate_execlist_status': > drivers/gpu/drm/i915/gvt/execlist.c:42:33: error: request for member > 'mmio_base' in something not a structure or union > (gvt->dev_priv->engine[ring_id].mmio_base + (offset)) > ^ > drivers/gpu/drm/i915/gvt/execlist.c:97:19: note: in expansion of macro > 'execlist_ring_mmio' > u32 status_reg = execlist_ring_mmio(vgpu->gvt, >^ > drivers/gpu/drm/i915/gvt/execlist.c: In function 'emulate_csb_update': > drivers/gpu/drm/i915/gvt/execlist.c:42:33: error: request for member > 'mmio_base' in something not a structure or union > (gvt->dev_priv->engine[ring_id].mmio_base + (offset)) > ^ > drivers/gpu/drm/i915/gvt/execlist.c:136:23: note: in expansion of macro > 'execlist_ring_mmio' > ctx_status_ptr_reg = execlist_ring_mmio(vgpu->gvt, ring_id, >^ > drivers/gpu/drm/i915/gvt/execlist.c:42:33: error: request for member > 'mmio_base' in something not a structure or union > (gvt->dev_priv->engine[ring_id].mmio_base + (offset)) > ^ > drivers/gpu/drm/i915/gvt/execlist.c:138:23: note: in expansion of macro > 'execlist_ring_mmio' > ctx_status_buf_reg = execlist_ring_mmio(vgpu->gvt, ring_id, >^ > drivers/gpu/drm/i915/gvt/execlist.c: In function 'get_next_execlist_slot': > drivers/gpu/drm/i915/gvt/execlist.c:42:33: error: request for member > 'mmio_base' in something not a structure or union > (gvt->dev_priv->engine[ring_id].mmio_base + (offset)) > ^ > drivers/gpu/drm/i915/gvt/execlist.c:248:19: note: in expansion of macro > 'execlist_ring_mmio' > u32 status_reg = execlist_ring_mmio(vgpu->gvt, ring_id, >^ > drivers/gpu/drm/i915/gvt/execlist.c: In function > 'release_shadow_batch_buffer': > drivers/gpu/drm/i915/gvt/execlist.c:501:4: warning: > 'drm_gem_object_unreference' is deprecated [-Wdeprecated-declarations] > drm_gem_object_unreference(&(entry_obj->obj->base)); > ^ > In file included from drivers/gpu/drm/i915/gvt/execlist.c:35:0: > drivers/gpu/drm/i915/i915_drv.h:2344:13: note: declared here > extern void drm_gem_object_unreference(struct drm_gem_object *); > ^ > drivers/gpu/drm/i915/gvt/execlist.c: In function 'release_shadow_wa_c
[Intel-gfx] linux-next: build failure after merge of the drm-intel tree
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 'render_mmio_to_ring_id': drivers/gpu/drm/i915/gvt/handlers.c:137:31: error: request for member 'mmio_base' in something not a structure or union if (gvt->dev_priv->engine[i].mmio_base == reg) ^ drivers/gpu/drm/i915/gvt/scheduler.c: In function 'populate_shadow_context': drivers/gpu/drm/i915/gvt/scheduler.c:71:4: error: passing argument 1 of 'intel_lr_context_size' from incompatible pointer type [-Werror=incompatible-pointer-types] &gvt->dev_priv->engine[ring_id]); ^ In file included from drivers/gpu/drm/i915/i915_drv.h:58:0, from drivers/gpu/drm/i915/gvt/scheduler.c:36: drivers/gpu/drm/i915/intel_lrc.h:84:10: note: expected 'struct intel_engine_cs *' but argument is of type 'struct intel_engine_cs **' uint32_t intel_lr_context_size(struct intel_engine_cs *engine); ^ drivers/gpu/drm/i915/gvt/scheduler.c: In function 'dispatch_workload': drivers/gpu/drm/i915/gvt/scheduler.c:174:41: error: passing argument 1 of 'i915_gem_request_alloc' from incompatible pointer type [-Werror=incompatible-pointer-types] workload->req = i915_gem_request_alloc(&dev_priv->engine[ring_id], ^ In file included from drivers/gpu/drm/i915/intel_ringbuffer.h:6:0, from drivers/gpu/drm/i915/intel_guc.h:29, from drivers/gpu/drm/i915/i915_drv.h:57, from drivers/gpu/drm/i915/gvt/scheduler.c:36: drivers/gpu/drm/i915/i915_gem_request.h:156:1: note: expected 'struct intel_engine_cs *' but argument is of type 'struct intel_engine_cs **' i915_gem_request_alloc(struct intel_engine_cs *engine, ^ drivers/gpu/drm/i915/gvt/scheduler.c: In function 'update_guest_context': drivers/gpu/drm/i915/gvt/scheduler.c:301:4: error: passing argument 1 of 'intel_lr_context_size' from incompatible pointer type [-Werror=incompatible-pointer-types] &gvt->dev_priv->engine[ring_id]); ^ In file included from drivers/gpu/drm/i915/i915_drv.h:58:0, from drivers/gpu/drm/i915/gvt/scheduler.c:36: drivers/gpu/drm/i915/intel_lrc.h:84:10: note: expected 'struct intel_engine_cs *' but argument is of type 'struct intel_engine_cs **' uint32_t intel_lr_context_size(struct intel_engine_cs *engine); ^ drivers/gpu/drm/i915/gvt/execlist.c: In function 'emulate_execlist_status': drivers/gpu/drm/i915/gvt/execlist.c:42:33: error: request for member 'mmio_base' in something not a structure or union (gvt->dev_priv->engine[ring_id].mmio_base + (offset)) ^ drivers/gpu/drm/i915/gvt/execlist.c:97:19: note: in expansion of macro 'execlist_ring_mmio' u32 status_reg = execlist_ring_mmio(vgpu->gvt, ^ drivers/gpu/drm/i915/gvt/execlist.c: In function 'emulate_csb_update': drivers/gpu/drm/i915/gvt/execlist.c:42:33: error: request for member 'mmio_base' in something not a structure or union (gvt->dev_priv->engine[ring_id].mmio_base + (offset)) ^ drivers/gpu/drm/i915/gvt/execlist.c:136:23: note: in expansion of macro 'execlist_ring_mmio' ctx_status_ptr_reg = execlist_ring_mmio(vgpu->gvt, ring_id, ^ drivers/gpu/drm/i915/gvt/execlist.c:42:33: error: request for member 'mmio_base' in something not a structure or union (gvt->dev_priv->engine[ring_id].mmio_base + (offset)) ^ drivers/gpu/drm/i915/gvt/execlist.c:138:23: note: in expansion of macro 'execlist_ring_mmio' ctx_status_buf_reg = execlist_ring_mmio(vgpu->gvt, ring_id, ^ drivers/gpu/drm/i915/gvt/execlist.c: In function 'get_next_execlist_slot': drivers/gpu/drm/i915/gvt/execlist.c:42:33: error: request for member 'mmio_base' in something not a structure or union (gvt->dev_priv->engine[ring_id].mmio_base + (offset)) ^ drivers/gpu/drm/i915/gvt/execlist.c:248:19: note: in expansion of macro 'execlist_ring_mmio' u32 status_reg = execlist_ring_mmio(vgpu->gvt, ring_id, ^ drivers/gpu/drm/i915/gvt/execlist.c: In function 'release_shadow_batch_buffer': drivers/gpu/drm/i915/gvt/execlist.c:501:4: warning: 'drm_gem_object_unreference' is deprecated [-Wdeprecated-declarations] drm_gem_object_unreference(&(entry_obj->obj->base)); ^ In file included from drivers/gpu/drm/i915/gvt/execlist.c:35:0: drivers/gpu/drm/i915/i915_drv.h:2344:13: note: declared here extern void drm_gem_object_unreference(struct drm_gem_object *); ^ drivers/gpu/drm/i915/gvt/execlist.c: In function 'release_shadow_wa_ctx': drivers/gpu/drm/i915/gvt/execlist.c:514:2: warning: 'drm_gem_object_unreference' is deprecated [-Wdeprecated-declarations] drm_gem_object_unreference(&(wa_ctx->indirect_ctx.obj->base)); ^ In file included from drivers/gpu/drm/i915/gvt/execlist.c
Re: [Intel-gfx] linux-next: build failure after merge of the drm-intel tree
On Tue, Aug 23, 2016 at 11:56:14AM +1000, Stephen Rothwell wrote: > Hi all, > > After merging the drm-intel tree, today's linux-next build (arm > multi_v7_defconfig) failed like this: > > In file included from drivers/gpio/gpiolib-of.c:19:0: > include/linux/io-mapping.h:115:31: fatal error: asm/pgtable_types.h: No such > file or directory > In file included from drivers/gpu/drm/nouveau/include/nvif/os.h:16:0, > from drivers/gpu/drm/nouveau/include/nvkm/core/os.h:3, > from drivers/gpu/drm/nouveau/include/nvkm/core/object.h:3, > from drivers/gpu/drm/nouveau/include/nvkm/core/client.h:3, > from drivers/gpu/drm/nouveau/nvkm/core/client.c:24: > include/linux/io-mapping.h:115:31: fatal error: asm/pgtable_types.h: No such > file or directory > > and many more. > > Caused by commit > > cafaf14a5d8f ("io-mapping: Always create a struct to hold metadata about > the io-mapping") > > I have used the drm-intel tree from next-20160822 for today. Should be fixed now, thanks for reporting. -Daniel -- 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-intel tree
Hi all, After merging the drm-intel tree, today's linux-next build (arm multi_v7_defconfig) failed like this: In file included from drivers/gpio/gpiolib-of.c:19:0: include/linux/io-mapping.h:115:31: fatal error: asm/pgtable_types.h: No such file or directory In file included from drivers/gpu/drm/nouveau/include/nvif/os.h:16:0, from drivers/gpu/drm/nouveau/include/nvkm/core/os.h:3, from drivers/gpu/drm/nouveau/include/nvkm/core/object.h:3, from drivers/gpu/drm/nouveau/include/nvkm/core/client.h:3, from drivers/gpu/drm/nouveau/nvkm/core/client.c:24: include/linux/io-mapping.h:115:31: fatal error: asm/pgtable_types.h: No such file or directory and many more. Caused by commit cafaf14a5d8f ("io-mapping: Always create a struct to hold metadata about the io-mapping") I have used the drm-intel tree from next-20160822 for today. -- 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-intel tree
On Mon, 23 May 2016, Stephen Rothwell 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 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
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. -- 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 tree
Hi all, After merging the drm-intel tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/gpu/drm/i915/intel_display.c: In function 'intel_alloc_plane_obj': drivers/gpu/drm/i915/intel_display.c:2089:27: error: 'struct drm_crtc' has no member named 'fb' obj->stride = crtc->base.fb->pitches[0]; ^ drivers/gpu/drm/i915/intel_display.c:2092:36: error: 'struct drm_crtc' has no member named 'fb' mode_cmd.pixel_format = crtc->base.fb->pixel_format; ^ drivers/gpu/drm/i915/intel_display.c:2093:29: error: 'struct drm_crtc' has no member named 'fb' mode_cmd.width = crtc->base.fb->width; ^ drivers/gpu/drm/i915/intel_display.c:2094:30: error: 'struct drm_crtc' has no member named 'fb' mode_cmd.height = crtc->base.fb->height; ^ drivers/gpu/drm/i915/intel_display.c:2095:34: error: 'struct drm_crtc' has no member named 'fb' mode_cmd.pitches[0] = crtc->base.fb->pitches[0]; ^ In file included from arch/x86/include/asm/percpu.h:44:0, from arch/x86/include/asm/preempt.h:5, from include/linux/preempt.h:18, from include/linux/spinlock.h:50, from include/linux/seqlock.h:35, from include/linux/time.h:5, from include/linux/stat.h:18, from include/linux/module.h:10, from drivers/gpu/drm/i915/intel_display.c:28: drivers/gpu/drm/i915/intel_display.c:2099:65: error: 'struct drm_crtc' has no member named 'fb' if (intel_framebuffer_init(dev, to_intel_framebuffer(crtc->base.fb), ^ include/linux/kernel.h:833:49: note: in definition of macro 'container_of' const typeof( ((type *)0)->member ) *__mptr = (ptr); \ ^ drivers/gpu/drm/i915/intel_display.c:2099:34: note: in expansion of macro 'to_intel_framebuffer' if (intel_framebuffer_init(dev, to_intel_framebuffer(crtc->base.fb), ^ drivers/gpu/drm/i915/intel_display.c: In function 'intel_find_plane_obj': drivers/gpu/drm/i915/intel_display.c:2124:23: error: 'struct drm_crtc' has no member named 'fb' if (!intel_crtc->base.fb) ^ drivers/gpu/drm/i915/intel_display.c:2130:24: error: 'struct drm_crtc' has no member named 'fb' kfree(intel_crtc->base.fb); ^ drivers/gpu/drm/i915/intel_display.c:2131:18: error: 'struct drm_crtc' has no member named 'fb' intel_crtc->base.fb = NULL; ^ drivers/gpu/drm/i915/intel_display.c:2143:23: error: 'struct drm_crtc' has no member named 'fb' if (!i->active || !c->fb) ^ In file included from arch/x86/include/asm/percpu.h:44:0, from arch/x86/include/asm/preempt.h:5, from include/linux/preempt.h:18, from include/linux/spinlock.h:50, from include/linux/seqlock.h:35, from include/linux/time.h:5, from include/linux/stat.h:18, from include/linux/module.h:10, from drivers/gpu/drm/i915/intel_display.c:28: drivers/gpu/drm/i915/intel_display.c:2146:30: error: 'struct drm_crtc' has no member named 'fb' fb = to_intel_framebuffer(c->fb); ^ include/linux/kernel.h:833:49: note: in definition of macro 'container_of' const typeof( ((type *)0)->member ) *__mptr = (ptr); \ ^ drivers/gpu/drm/i915/intel_display.c:2146:8: note: in expansion of macro 'to_intel_framebuffer' fb = to_intel_framebuffer(c->fb); ^ drivers/gpu/drm/i915/intel_display.c:2148:31: error: 'struct drm_crtc' has no member named 'fb' drm_framebuffer_reference(c->fb); ^ drivers/gpu/drm/i915/intel_display.c:2149:20: error: 'struct drm_crtc' has no member named 'fb' intel_crtc->base.fb = c->fb; ^ drivers/gpu/drm/i915/intel_display.c:2149:27: error: 'struct drm_crtc' has no member named 'fb' intel_crtc->base.fb = c->fb; ^ drivers/gpu/drm/i915/intel_display.c: In function 'i9xx_get_plane_config': drivers/gpu/drm/i915/intel_display.c:5745:12: error: 'struct drm_crtc' has no member named 'fb' crtc->base.fb = kzalloc(sizeof(struct intel_framebuffer), GFP_KERNEL); ^ drivers/gpu/drm/i915/intel_display.c:5746:17: error: 'struct drm_crtc' has no member named 'fb' if (!crtc->base.fb) { ^ drivers/gpu/drm/i915/intel_display.c:5759:12: error: 'struct drm_crtc' has no member named 'fb' crtc->base.fb->pixel_format = fourcc; ^ drivers/gpu/drm/i915/intel_display.c:5760:12: error: 'struct drm_crtc' has no member named 'fb' crtc->base.fb->bits_per_pixel = ^ drivers/gpu/drm/i915/inte
Re: [Intel-gfx] linux-next: build failure after merge of the drm-intel tree
On Wed, Mar 19, 2014 at 2:54 AM, Ben Widawsky 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 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 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 ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] linux-next: build failure after merge of the drm-intel tree
On Tue, Mar 18, 2014 at 09:18:42PM -0400, Steven Rostedt wrote: > On Wed, 19 Mar 2014 11:53:50 +1100 > Stephen Rothwell 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 > -- 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 ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] linux-next: build failure after merge of the drm-intel tree
On Wed, 19 Mar 2014 11:53:50 +1100 Stephen Rothwell 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. -- 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
[Intel-gfx] linux-next: build failure after merge of the drm-intel tree
Hi all, After merging the drm-intel tree, today's linux-next build (x86_64 allmodconfig) failed like this: In file included from include/trace/define_trace.h:90:0, from drivers/gpu/drm/i915/i915_trace.h:520, from drivers/gpu/drm/i915/i915_trace_points.c:12: drivers/gpu/drm/i915/./i915_trace.h: In function 'ftrace_raw_event_i915_gem_evict_vm': drivers/gpu/drm/i915/./i915_trace.h:246:22: error: 'dev' undeclared (first use in this function) __entry->dev = dev->primary->index; ^ include/trace/ftrace.h:574:4: note: in definition of macro 'DECLARE_EVENT_CLASS' { assign; } \ ^ include/trace/ftrace.h:36:9: note: in expansion of macro 'PARAMS' PARAMS(assign), \ ^ drivers/gpu/drm/i915/./i915_trace.h:236:1: note: in expansion of macro 'TRACE_EVENT' TRACE_EVENT(i915_gem_evict_vm, ^ drivers/gpu/drm/i915/./i915_trace.h:245:6: note: in expansion of macro 'TP_fast_assign' TP_fast_assign( ^ drivers/gpu/drm/i915/./i915_trace.h:246:22: note: each undeclared identifier is reported only once for each function it appears in __entry->dev = dev->primary->index; ^ include/trace/ftrace.h:574:4: note: in definition of macro 'DECLARE_EVENT_CLASS' { assign; } \ ^ include/trace/ftrace.h:36:9: note: in expansion of macro 'PARAMS' PARAMS(assign), \ ^ drivers/gpu/drm/i915/./i915_trace.h:236:1: note: in expansion of macro 'TRACE_EVENT' TRACE_EVENT(i915_gem_evict_vm, ^ drivers/gpu/drm/i915/./i915_trace.h:245:6: note: in expansion of macro 'TP_fast_assign' TP_fast_assign( ^ In file included from include/trace/define_trace.h:90:0, from drivers/gpu/drm/i915/i915_trace.h:520, from drivers/gpu/drm/i915/i915_trace_points.c:12: drivers/gpu/drm/i915/./i915_trace.h: In function 'perf_trace_i915_gem_evict_vm': drivers/gpu/drm/i915/./i915_trace.h:246:22: error: 'dev' undeclared (first use in this function) __entry->dev = dev->primary->index; ^ include/trace/ftrace.h:708:4: note: in definition of macro 'DECLARE_EVENT_CLASS' { assign; } \ ^ include/trace/ftrace.h:36:9: note: in expansion of macro 'PARAMS' PARAMS(assign), \ ^ drivers/gpu/drm/i915/./i915_trace.h:236:1: note: in expansion of macro 'TRACE_EVENT' TRACE_EVENT(i915_gem_evict_vm, ^ drivers/gpu/drm/i915/./i915_trace.h:245:6: note: in expansion of macro 'TP_fast_assign' TP_fast_assign( ^ 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. -- Cheers, Stephen Rothwell pgpqeWOMxmBp5.pgp Description: PGP signature ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] linux-next: build failure after merge of the drm-intel tree
On Tue, Feb 19, 2013 at 3:01 AM, Stephen Rothwell wrote: > On Fri, 15 Feb 2013 08:16:26 -0800 Jesse Barnes > wrote: >> >> On Fri, 15 Feb 2013 10:30:16 +0100 >> Daniel Vetter wrote: >> >> > On Fri, Feb 15, 2013 at 3:37 AM, Stephen Rothwell >> > wrote: >> > > >> > > After merging the drm-intel tree, today's linux-next build (x86_64 >> > > allmodconfig) failed like this: >> > > >> > > ERROR: "pm_vt_switch_unregister" [drivers/video/fb.ko] undefined! >> > > >> > > I have dropped the tree for today. >> > >> > Meh, that fail was already reported from Wu's kernel builder a few >> > days ago, but no patch yet showed up to fix things. Since the i915 >> > side of that work isn't ready yet either I've dropped the offending >> > patches. >> >> I sent a patch yesterday for this. I'll bounce it over again. > > I am still getting that build failure. Ok, should be really fixed now, my apologies for the mess. -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 http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] linux-next: build failure after merge of the drm-intel tree
Hi Daniel, On Fri, 15 Feb 2013 08:16:26 -0800 Jesse Barnes wrote: > > On Fri, 15 Feb 2013 10:30:16 +0100 > Daniel Vetter wrote: > > > On Fri, Feb 15, 2013 at 3:37 AM, Stephen Rothwell > > wrote: > > > > > > After merging the drm-intel tree, today's linux-next build (x86_64 > > > allmodconfig) failed like this: > > > > > > ERROR: "pm_vt_switch_unregister" [drivers/video/fb.ko] undefined! > > > > > > I have dropped the tree for today. > > > > Meh, that fail was already reported from Wu's kernel builder a few > > days ago, but no patch yet showed up to fix things. Since the i915 > > side of that work isn't ready yet either I've dropped the offending > > patches. > > I sent a patch yesterday for this. I'll bounce it over again. I am still getting that build failure. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgp0zWQkl_7yx.pgp Description: PGP signature ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/intel-gfx
[Intel-gfx] linux-next: build failure after merge of the drm-intel tree
Hi all, After merging the drm-intel tree, today's linux-next build (x86_64 allmodconfig) failed like this: ERROR: "pm_vt_switch_unregister" [drivers/video/fb.ko] undefined! I have dropped the tree for today. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpLVsDkTPhcY.pgp Description: PGP signature ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] linux-next: build failure after merge of the drm-intel tree
On Fri, 15 Feb 2013 10:30:16 +0100 Daniel Vetter wrote: > On Fri, Feb 15, 2013 at 3:37 AM, Stephen Rothwell > wrote: > > Hi all, > > > > After merging the drm-intel tree, today's linux-next build (x86_64 > > allmodconfig) failed like this: > > > > ERROR: "pm_vt_switch_unregister" [drivers/video/fb.ko] undefined! > > > > I have dropped the tree for today. > > Meh, that fail was already reported from Wu's kernel builder a few > days ago, but no patch yet showed up to fix things. Since the i915 > side of that work isn't ready yet either I've dropped the offending > patches. I sent a patch yesterday for this. I'll bounce it over again. -- Jesse Barnes, Intel Open Source Technology Center ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] linux-next: build failure after merge of the drm-intel tree
On Fri, Feb 15, 2013 at 3:37 AM, Stephen Rothwell wrote: > Hi all, > > After merging the drm-intel tree, today's linux-next build (x86_64 > allmodconfig) failed like this: > > ERROR: "pm_vt_switch_unregister" [drivers/video/fb.ko] undefined! > > I have dropped the tree for today. Meh, that fail was already reported from Wu's kernel builder a few days ago, but no patch yet showed up to fix things. Since the i915 side of that work isn't ready yet either I've dropped the offending patches. -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 http://lists.freedesktop.org/mailman/listinfo/intel-gfx