diff mbox series

drm/i915: Add includes for BUG_ON/BUILD_BUG_ON in i915_memcpy.c

Message ID 20240308144643.137831-1-joonas.lahtinen@linux.intel.com (mailing list archive)
State New, archived
Headers show
Series drm/i915: Add includes for BUG_ON/BUILD_BUG_ON in i915_memcpy.c | expand

Commit Message

Joonas Lahtinen March 8, 2024, 2:46 p.m. UTC
Add standalone includes for BUG_ON and BUILD_BUG_ON to avoid build failure
after linux-next include refactoring.

Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Chris Wilson <chris.p.wilson@linux.intel.com>
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Tvrtko Ursulin <tursulin@ursulin.net>
---
 drivers/gpu/drm/i915/i915_memcpy.c | 2 ++
 1 file changed, 2 insertions(+)

Comments

Rodrigo Vivi March 8, 2024, 2:58 p.m. UTC | #1
On Fri, Mar 08, 2024 at 04:46:43PM +0200, Joonas Lahtinen wrote:
> Add standalone includes for BUG_ON and BUILD_BUG_ON to avoid build failure
> after linux-next include refactoring.

any lore link so we can use with a 'Closes:' tag?
and perhaps a reported-by?

> 
> Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
> Cc: Chris Wilson <chris.p.wilson@linux.intel.com>
> Cc: Jani Nikula <jani.nikula@linux.intel.com>
> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> Cc: Tvrtko Ursulin <tursulin@ursulin.net>
> ---
>  drivers/gpu/drm/i915/i915_memcpy.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/drivers/gpu/drm/i915/i915_memcpy.c b/drivers/gpu/drm/i915/i915_memcpy.c
> index ba82277254b7..cc41974cee74 100644
> --- a/drivers/gpu/drm/i915/i915_memcpy.c
> +++ b/drivers/gpu/drm/i915/i915_memcpy.c
> @@ -25,6 +25,8 @@
>  #include <linux/kernel.h>
>  #include <linux/string.h>
>  #include <linux/cpufeature.h>
> +#include <linux/bug.h>
> +#include <linux/build_bug.h>

git grep BUILD_BUG_ON drivers/gpu/drm/i915/
output

vs

git grep build_bug.h drivers/gpu/drm/i915/
output

tells me that we likely need this in many more files...

but not opposed to move with this faster and come back later with
other fixes if this unblocks people:

Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

>  #include <asm/fpu/api.h>
>  
>  #include "i915_memcpy.h"
> -- 
> 2.43.2
>
Joonas Lahtinen March 14, 2024, 12:48 p.m. UTC | #2
Quoting Rodrigo Vivi (2024-03-08 16:58:04)
> On Fri, Mar 08, 2024 at 04:46:43PM +0200, Joonas Lahtinen wrote:
> > Add standalone includes for BUG_ON and BUILD_BUG_ON to avoid build failure
> > after linux-next include refactoring.
> 
> any lore link so we can use with a 'Closes:' tag?
> and perhaps a reported-by?

The build failure seems to have happened in intel-gfx-ci.01.org but the
failing build results are not uploaded so it's only visible in the
background.

From the CI page[1] we can see next-20240304 is the last successful build[2].
Failure seems to have started next-20240305 after which the results are
not uploaded due to the failure.

For future, I asked if we could improve the CI dashboard by alos showing the
failing builds in the CI view. 

However, for now we don't have a reference, I guess.

[1] https://intel-gfx-ci.01.org/tree/linux-next/combined-alt.html?
[2] https://intel-gfx-ci.01.org/tree/linux-next/next-20240304/filelist.html

> 
> > 
> > Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
> > Cc: Chris Wilson <chris.p.wilson@linux.intel.com>
> > Cc: Jani Nikula <jani.nikula@linux.intel.com>
> > Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> > Cc: Tvrtko Ursulin <tursulin@ursulin.net>
> > ---
> >  drivers/gpu/drm/i915/i915_memcpy.c | 2 ++
> >  1 file changed, 2 insertions(+)
> > 
> > diff --git a/drivers/gpu/drm/i915/i915_memcpy.c b/drivers/gpu/drm/i915/i915_memcpy.c
> > index ba82277254b7..cc41974cee74 100644
> > --- a/drivers/gpu/drm/i915/i915_memcpy.c
> > +++ b/drivers/gpu/drm/i915/i915_memcpy.c
> > @@ -25,6 +25,8 @@
> >  #include <linux/kernel.h>
> >  #include <linux/string.h>
> >  #include <linux/cpufeature.h>
> > +#include <linux/bug.h>
> > +#include <linux/build_bug.h>
> 
> git grep BUILD_BUG_ON drivers/gpu/drm/i915/
> output
> 
> vs
> 
> git grep build_bug.h drivers/gpu/drm/i915/
> output
> 
> tells me that we likely need this in many more files...
> 
> but not opposed to move with this faster and come back later with
> other fixes if this unblocks people:

Yeah, I made the same observation.

Are you fine to merge this with the R-b even without the reference?

Regards, Joonas

> 
> Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> 
> >  #include <asm/fpu/api.h>
> >  
> >  #include "i915_memcpy.h"
> > -- 
> > 2.43.2
> >
Rodrigo Vivi March 18, 2024, 12:40 p.m. UTC | #3
On Thu, 2024-03-14 at 14:48 +0200, Joonas Lahtinen wrote:
> Quoting Rodrigo Vivi (2024-03-08 16:58:04)
> > On Fri, Mar 08, 2024 at 04:46:43PM +0200, Joonas Lahtinen wrote:
> > > Add standalone includes for BUG_ON and BUILD_BUG_ON to avoid
> > > build failure
> > > after linux-next include refactoring.
> > 
> > any lore link so we can use with a 'Closes:' tag?
> > and perhaps a reported-by?
> 
> The build failure seems to have happened in intel-gfx-ci.01.org but
> the
> failing build results are not uploaded so it's only visible in the
> background.
> 
> From the CI page[1] we can see next-20240304 is the last successful
> build[2].
> Failure seems to have started next-20240305 after which the results
> are
> not uploaded due to the failure.
> 
> For future, I asked if we could improve the CI dashboard by alos
> showing the
> failing builds in the CI view. 
> 
> However, for now we don't have a reference, I guess.
> 
> [1] https://intel-gfx-ci.01.org/tree/linux-next/combined-alt.html?
> [2] https://intel-gfx-ci.01.org/tree/linux-next/next-
> 20240304/filelist.html
> 
> > 
> > > 
> > > Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
> > > Cc: Chris Wilson <chris.p.wilson@linux.intel.com>
> > > Cc: Jani Nikula <jani.nikula@linux.intel.com>
> > > Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> > > Cc: Tvrtko Ursulin <tursulin@ursulin.net>
> > > ---
> > >  drivers/gpu/drm/i915/i915_memcpy.c | 2 ++
> > >  1 file changed, 2 insertions(+)
> > > 
> > > diff --git a/drivers/gpu/drm/i915/i915_memcpy.c
> > > b/drivers/gpu/drm/i915/i915_memcpy.c
> > > index ba82277254b7..cc41974cee74 100644
> > > --- a/drivers/gpu/drm/i915/i915_memcpy.c
> > > +++ b/drivers/gpu/drm/i915/i915_memcpy.c
> > > @@ -25,6 +25,8 @@
> > >  #include <linux/kernel.h>
> > >  #include <linux/string.h>
> > >  #include <linux/cpufeature.h>
> > > +#include <linux/bug.h>
> > > +#include <linux/build_bug.h>
> > 
> > git grep BUILD_BUG_ON drivers/gpu/drm/i915/
> > output
> > 
> > vs
> > 
> > git grep build_bug.h drivers/gpu/drm/i915/
> > output
> > 
> > tells me that we likely need this in many more files...
> > 
> > but not opposed to move with this faster and come back later with
> > other fixes if this unblocks people:
> 
> Yeah, I made the same observation.
> 
> Are you fine to merge this with the R-b even without the reference?

sorry for having missed this.

yes, the rv-b can be used even without the reference, let's just get
this in and fix the build issue.

> 
> Regards, Joonas
> 
> > 
> > Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> > 
> > >  #include <asm/fpu/api.h>
> > >  
> > >  #include "i915_memcpy.h"
> > > -- 
> > > 2.43.2
> > >
Joonas Lahtinen March 19, 2024, 9:07 a.m. UTC | #4
Pushed this, thanks for the review.

Regards, Joonas

Quoting Vivi, Rodrigo (2024-03-18 14:40:56)
> On Thu, 2024-03-14 at 14:48 +0200, Joonas Lahtinen wrote:
> > Quoting Rodrigo Vivi (2024-03-08 16:58:04)
> > > On Fri, Mar 08, 2024 at 04:46:43PM +0200, Joonas Lahtinen wrote:
> > > > Add standalone includes for BUG_ON and BUILD_BUG_ON to avoid
> > > > build failure
> > > > after linux-next include refactoring.
> > > 
> > > any lore link so we can use with a 'Closes:' tag?
> > > and perhaps a reported-by?
> > 
> > The build failure seems to have happened in intel-gfx-ci.01.org but
> > the
> > failing build results are not uploaded so it's only visible in the
> > background.
> > 
> > From the CI page[1] we can see next-20240304 is the last successful
> > build[2].
> > Failure seems to have started next-20240305 after which the results
> > are
> > not uploaded due to the failure.
> > 
> > For future, I asked if we could improve the CI dashboard by alos
> > showing the
> > failing builds in the CI view. 
> > 
> > However, for now we don't have a reference, I guess.
> > 
> > [1] https://intel-gfx-ci.01.org/tree/linux-next/combined-alt.html?
> > [2] https://intel-gfx-ci.01.org/tree/linux-next/next-
> > 20240304/filelist.html
> > 
> > > 
> > > > 
> > > > Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
> > > > Cc: Chris Wilson <chris.p.wilson@linux.intel.com>
> > > > Cc: Jani Nikula <jani.nikula@linux.intel.com>
> > > > Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> > > > Cc: Tvrtko Ursulin <tursulin@ursulin.net>
> > > > ---
> > > >  drivers/gpu/drm/i915/i915_memcpy.c | 2 ++
> > > >  1 file changed, 2 insertions(+)
> > > > 
> > > > diff --git a/drivers/gpu/drm/i915/i915_memcpy.c
> > > > b/drivers/gpu/drm/i915/i915_memcpy.c
> > > > index ba82277254b7..cc41974cee74 100644
> > > > --- a/drivers/gpu/drm/i915/i915_memcpy.c
> > > > +++ b/drivers/gpu/drm/i915/i915_memcpy.c
> > > > @@ -25,6 +25,8 @@
> > > >  #include <linux/kernel.h>
> > > >  #include <linux/string.h>
> > > >  #include <linux/cpufeature.h>
> > > > +#include <linux/bug.h>
> > > > +#include <linux/build_bug.h>
> > > 
> > > git grep BUILD_BUG_ON drivers/gpu/drm/i915/
> > > output
> > > 
> > > vs
> > > 
> > > git grep build_bug.h drivers/gpu/drm/i915/
> > > output
> > > 
> > > tells me that we likely need this in many more files...
> > > 
> > > but not opposed to move with this faster and come back later with
> > > other fixes if this unblocks people:
> > 
> > Yeah, I made the same observation.
> > 
> > Are you fine to merge this with the R-b even without the reference?
> 
> sorry for having missed this.
> 
> yes, the rv-b can be used even without the reference, let's just get
> this in and fix the build issue.
> 
> > 
> > Regards, Joonas
> > 
> > > 
> > > Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> > > 
> > > >  #include <asm/fpu/api.h>
> > > >  
> > > >  #include "i915_memcpy.h"
> > > > -- 
> > > > 2.43.2
> > > > 
>
diff mbox series

Patch

diff --git a/drivers/gpu/drm/i915/i915_memcpy.c b/drivers/gpu/drm/i915/i915_memcpy.c
index ba82277254b7..cc41974cee74 100644
--- a/drivers/gpu/drm/i915/i915_memcpy.c
+++ b/drivers/gpu/drm/i915/i915_memcpy.c
@@ -25,6 +25,8 @@ 
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/cpufeature.h>
+#include <linux/bug.h>
+#include <linux/build_bug.h>
 #include <asm/fpu/api.h>
 
 #include "i915_memcpy.h"