| Message ID | 20220428204011.3365653-1-lucas.demarchi@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/2] drm/i915/gvt: Fix missing static | expand |
On 4/28/22 8:40 PM, De Marchi, Lucas wrote: > Fix broken build: > > $ make W=1 drivers/gpu/drm/i915/gvt/handlers.o > ... > CC [M] drivers/gpu/drm/i915/gvt/handlers.o > drivers/gpu/drm/i915/gvt/handlers.c:75:6: error: no previous prototype for ‘intel_gvt_match_device’ [-Werror=missing-prototypes] > 75 | bool intel_gvt_match_device(struct intel_gvt *gvt, > | ^~~~~~~~~~~~~~~~~~~~~~ > cc1: all warnings being treated as errors > > Commit e0f74ed4634d ("i915/gvt: Separate the MMIO tracking table from > GVT-g") removed the prototype from the header due to the function being > used only in this single compilation unit, but forgot to make it static. > > Fixes: e0f74ed4634d ("i915/gvt: Separate the MMIO tracking table from GVT-g") > Cc: Zhi Wang <zhi.a.wang@intel.com> > Cc: Christoph Hellwig <hch@lst.de> > Cc: Zhenyu Wang <zhenyuw@linux.intel.com> > Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com> > --- > drivers/gpu/drm/i915/gvt/handlers.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > Hi Lucas: Thanks so much for the patch. There is a patch to fix undergoing already. I will take your second patch. > diff --git a/drivers/gpu/drm/i915/gvt/handlers.c b/drivers/gpu/drm/i915/gvt/handlers.c > index cf00398c2870..e4358aa01048 100644 > --- a/drivers/gpu/drm/i915/gvt/handlers.c > +++ b/drivers/gpu/drm/i915/gvt/handlers.c > @@ -72,8 +72,8 @@ unsigned long intel_gvt_get_device_type(struct intel_gvt *gvt) > return 0; > } > > -bool intel_gvt_match_device(struct intel_gvt *gvt, > - unsigned long device) > +static bool intel_gvt_match_device(struct intel_gvt *gvt, > + unsigned long device) > { > return intel_gvt_get_device_type(gvt) & device; > } >
On Thu, Apr 28, 2022 at 01:42:53PM -0700, Wang, Zhi A wrote: >On 4/28/22 8:40 PM, De Marchi, Lucas wrote: >> Fix broken build: >> >> $ make W=1 drivers/gpu/drm/i915/gvt/handlers.o >> ... >> CC [M] drivers/gpu/drm/i915/gvt/handlers.o >> drivers/gpu/drm/i915/gvt/handlers.c:75:6: error: no previous prototype for ‘intel_gvt_match_device’ [-Werror=missing-prototypes] >> 75 | bool intel_gvt_match_device(struct intel_gvt *gvt, >> | ^~~~~~~~~~~~~~~~~~~~~~ >> cc1: all warnings being treated as errors >> >> Commit e0f74ed4634d ("i915/gvt: Separate the MMIO tracking table from >> GVT-g") removed the prototype from the header due to the function being >> used only in this single compilation unit, but forgot to make it static. >> >> Fixes: e0f74ed4634d ("i915/gvt: Separate the MMIO tracking table from GVT-g") >> Cc: Zhi Wang <zhi.a.wang@intel.com> >> Cc: Christoph Hellwig <hch@lst.de> >> Cc: Zhenyu Wang <zhenyuw@linux.intel.com> >> Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com> >> --- >> drivers/gpu/drm/i915/gvt/handlers.c | 4 ++-- >> 1 file changed, 2 insertions(+), 2 deletions(-) >> >Hi Lucas: > >Thanks so much for the patch. There is a patch to fix >undergoing already. I will take your second patch. oh 20220427212849.18109-1-zhi.a.wang@intel.com, I missed that. Do you mind adding the Fixes tag in that one to avoid it going to a kernel release without that? thanks Lucas De Marchi
On Thu, Apr 28, 2022 at 08:55:48PM +0000, Patchwork wrote: >== Series Details == > >Series: series starting with [1/2] drm/i915/gvt: Fix missing static >URL : https://patchwork.freedesktop.org/series/103293/ >State : failure > >== Summary == > >Error: make failed > CALL scripts/checksyscalls.sh > CALL scripts/atomic/check-atomics.sh > DESCEND objtool > CHK include/generated/compile.h > CC [M] drivers/gpu/drm/i915/gvt/handlers.o >drivers/gpu/drm/i915/gvt/handlers.c:75:13: error: static declaration of ‘intel_gvt_match_device’ follows non-static declaration > static bool intel_gvt_match_device(struct intel_gvt *gvt, > ^~~~~~~~~~~~~~~~~~~~~~ >In file included from drivers/gpu/drm/i915/gvt/gvt.h:42, > from drivers/gpu/drm/i915/gvt/handlers.c:41: >drivers/gpu/drm/i915/gvt/mmio.h:75:6: note: previous declaration of ‘intel_gvt_match_device’ was here > bool intel_gvt_match_device(struct intel_gvt *gvt, unsigned long device); > ^~~~~~~~~~~~~~~~~~~~~~ it looks like CI tried to apply this to the wrong rev. It's probably trying to apply it to the last one that it knows is buildable... which means it never validates if something fixes the build? I think it would be better to try applying to the latest drm-tip, and fallback to latest known-buildable iff it fails. Lucas De Marchi >scripts/Makefile.build:288: recipe for target 'drivers/gpu/drm/i915/gvt/handlers.o' failed >make[4]: *** [drivers/gpu/drm/i915/gvt/handlers.o] Error 1 >scripts/Makefile.build:550: recipe for target 'drivers/gpu/drm/i915' failed >make[3]: *** [drivers/gpu/drm/i915] Error 2 >scripts/Makefile.build:550: recipe for target 'drivers/gpu/drm' failed >make[2]: *** [drivers/gpu/drm] Error 2 >scripts/Makefile.build:550: recipe for target 'drivers/gpu' failed >make[1]: *** [drivers/gpu] Error 2 >Makefile:1834: recipe for target 'drivers' failed >make: *** [drivers] Error 2 > >
diff --git a/drivers/gpu/drm/i915/gvt/handlers.c b/drivers/gpu/drm/i915/gvt/handlers.c index cf00398c2870..e4358aa01048 100644 --- a/drivers/gpu/drm/i915/gvt/handlers.c +++ b/drivers/gpu/drm/i915/gvt/handlers.c @@ -72,8 +72,8 @@ unsigned long intel_gvt_get_device_type(struct intel_gvt *gvt) return 0; } -bool intel_gvt_match_device(struct intel_gvt *gvt, - unsigned long device) +static bool intel_gvt_match_device(struct intel_gvt *gvt, + unsigned long device) { return intel_gvt_get_device_type(gvt) & device; }
Fix broken build: $ make W=1 drivers/gpu/drm/i915/gvt/handlers.o ... CC [M] drivers/gpu/drm/i915/gvt/handlers.o drivers/gpu/drm/i915/gvt/handlers.c:75:6: error: no previous prototype for ‘intel_gvt_match_device’ [-Werror=missing-prototypes] 75 | bool intel_gvt_match_device(struct intel_gvt *gvt, | ^~~~~~~~~~~~~~~~~~~~~~ cc1: all warnings being treated as errors Commit e0f74ed4634d ("i915/gvt: Separate the MMIO tracking table from GVT-g") removed the prototype from the header due to the function being used only in this single compilation unit, but forgot to make it static. Fixes: e0f74ed4634d ("i915/gvt: Separate the MMIO tracking table from GVT-g") Cc: Zhi Wang <zhi.a.wang@intel.com> Cc: Christoph Hellwig <hch@lst.de> Cc: Zhenyu Wang <zhenyuw@linux.intel.com> Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com> --- drivers/gpu/drm/i915/gvt/handlers.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)