diff mbox series

drm/i915/display: Add forward declaration for struct seq_file

Message ID 20230626075254.1183894-1-chaitanya.kumar.borah@intel.com (mailing list archive)
State New, archived
Headers show
Series drm/i915/display: Add forward declaration for struct seq_file | expand

Commit Message

Chaitanya Kumar Borah June 26, 2023, 7:52 a.m. UTC
With change [1], visibility of struct seq_file is lost in
intel_display_power.h leading to build errors. Add forward
declaration.

[1] ef104443bffa ("procfs: consolidate arch_report_meminfo declaration")

v2: Use forward declaration instead of headerfile inclusion [Jani]

Signed-off-by: Chaitanya Kumar Borah <chaitanya.kumar.borah@intel.com>
---
 drivers/gpu/drm/i915/display/intel_display_power.h | 1 +
 1 file changed, 1 insertion(+)

Comments

Jani Nikula June 26, 2023, 12:06 p.m. UTC | #1
On Mon, 26 Jun 2023, Chaitanya Kumar Borah <chaitanya.kumar.borah@intel.com> wrote:
> With change [1], visibility of struct seq_file is lost in
> intel_display_power.h leading to build errors. Add forward
> declaration.
>
> [1] ef104443bffa ("procfs: consolidate arch_report_meminfo declaration")
>
> v2: Use forward declaration instead of headerfile inclusion [Jani]
>
> Signed-off-by: Chaitanya Kumar Borah <chaitanya.kumar.borah@intel.com>

Hey, thanks for the patch, this would've been fine, but looks like Imre
just pushed commit f4fab137dd2b ("drm/i915: Add missing forward
declarations/includes to display power headers") which adds the forward
declaration among other things.

Sorry for the trouble.

BR,
Jani.

> ---
>  drivers/gpu/drm/i915/display/intel_display_power.h | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_display_power.h b/drivers/gpu/drm/i915/display/intel_display_power.h
> index be1a87bde0c9..0ba268e566b0 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_power.h
> +++ b/drivers/gpu/drm/i915/display/intel_display_power.h
> @@ -16,6 +16,7 @@ enum port;
>  struct drm_i915_private;
>  struct i915_power_well;
>  struct intel_encoder;
> +struct seq_file;
>  
>  /*
>   * Keep the pipe, transcoder, port (DDI_LANES,DDI_IO,AUX) domain instances
Chaitanya Kumar Borah June 26, 2023, 1:44 p.m. UTC | #2
Hello Jani,

> -----Original Message-----
> From: Jani Nikula <jani.nikula@linux.intel.com>
> Sent: Monday, June 26, 2023 5:37 PM
> To: Borah, Chaitanya Kumar <chaitanya.kumar.borah@intel.com>; intel-
> gfx@lists.freedesktop.org
> Cc: Shankar, Uma <uma.shankar@intel.com>; Murthy, Arun R
> <arun.r.murthy@intel.com>; Borah, Chaitanya Kumar
> <chaitanya.kumar.borah@intel.com>
> Subject: Re: [PATCH] drm/i915/display: Add forward declaration for struct
> seq_file
> 
> On Mon, 26 Jun 2023, Chaitanya Kumar Borah
> <chaitanya.kumar.borah@intel.com> wrote:
> > With change [1], visibility of struct seq_file is lost in
> > intel_display_power.h leading to build errors. Add forward
> > declaration.
> >
> > [1] ef104443bffa ("procfs: consolidate arch_report_meminfo
> > declaration")
> >
> > v2: Use forward declaration instead of headerfile inclusion [Jani]
> >
> > Signed-off-by: Chaitanya Kumar Borah <chaitanya.kumar.borah@intel.com>
> 
> Hey, thanks for the patch, this would've been fine, but looks like Imre just
> pushed commit f4fab137dd2b ("drm/i915: Add missing forward
> declarations/includes to display power headers") which adds the forward
> declaration among other things.
> 
> Sorry for the trouble.
> 

No problem, Thank you for the info.

Sorry for my ignorance but will this patch eventually find its way to linux-next or do we need to do something special here?

Regards

Chaitanya

> BR,
> Jani.
> 
> > ---
> >  drivers/gpu/drm/i915/display/intel_display_power.h | 1 +
> >  1 file changed, 1 insertion(+)
> >
> > diff --git a/drivers/gpu/drm/i915/display/intel_display_power.h
> > b/drivers/gpu/drm/i915/display/intel_display_power.h
> > index be1a87bde0c9..0ba268e566b0 100644
> > --- a/drivers/gpu/drm/i915/display/intel_display_power.h
> > +++ b/drivers/gpu/drm/i915/display/intel_display_power.h
> > @@ -16,6 +16,7 @@ enum port;
> >  struct drm_i915_private;
> >  struct i915_power_well;
> >  struct intel_encoder;
> > +struct seq_file;
> >
> >  /*
> >   * Keep the pipe, transcoder, port (DDI_LANES,DDI_IO,AUX) domain
> > instances
> 
> --
> Jani Nikula, Intel Open Source Graphics Center
Jani Nikula June 26, 2023, 2:35 p.m. UTC | #3
On Mon, 26 Jun 2023, "Borah, Chaitanya Kumar" <chaitanya.kumar.borah@intel.com> wrote:
> Hello Jani,
>
>> -----Original Message-----
>> From: Jani Nikula <jani.nikula@linux.intel.com>
>> Sent: Monday, June 26, 2023 5:37 PM
>> To: Borah, Chaitanya Kumar <chaitanya.kumar.borah@intel.com>; intel-
>> gfx@lists.freedesktop.org
>> Cc: Shankar, Uma <uma.shankar@intel.com>; Murthy, Arun R
>> <arun.r.murthy@intel.com>; Borah, Chaitanya Kumar
>> <chaitanya.kumar.borah@intel.com>
>> Subject: Re: [PATCH] drm/i915/display: Add forward declaration for struct
>> seq_file
>> 
>> On Mon, 26 Jun 2023, Chaitanya Kumar Borah
>> <chaitanya.kumar.borah@intel.com> wrote:
>> > With change [1], visibility of struct seq_file is lost in
>> > intel_display_power.h leading to build errors. Add forward
>> > declaration.
>> >
>> > [1] ef104443bffa ("procfs: consolidate arch_report_meminfo
>> > declaration")
>> >
>> > v2: Use forward declaration instead of headerfile inclusion [Jani]
>> >
>> > Signed-off-by: Chaitanya Kumar Borah <chaitanya.kumar.borah@intel.com>
>> 
>> Hey, thanks for the patch, this would've been fine, but looks like Imre just
>> pushed commit f4fab137dd2b ("drm/i915: Add missing forward
>> declarations/includes to display power headers") which adds the forward
>> declaration among other things.
>> 
>> Sorry for the trouble.
>> 
>
> No problem, Thank you for the info.
>
> Sorry for my ignorance but will this patch eventually find its way to
> linux-next or do we need to do something special here?

It'll show up in linux-next once -rc1 is out. But I'm not sure that's
the *question* you want the answer to, really.

BR,
Jani.


>
> Regards
>
> Chaitanya
>
>> BR,
>> Jani.
>> 
>> > ---
>> >  drivers/gpu/drm/i915/display/intel_display_power.h | 1 +
>> >  1 file changed, 1 insertion(+)
>> >
>> > diff --git a/drivers/gpu/drm/i915/display/intel_display_power.h
>> > b/drivers/gpu/drm/i915/display/intel_display_power.h
>> > index be1a87bde0c9..0ba268e566b0 100644
>> > --- a/drivers/gpu/drm/i915/display/intel_display_power.h
>> > +++ b/drivers/gpu/drm/i915/display/intel_display_power.h
>> > @@ -16,6 +16,7 @@ enum port;
>> >  struct drm_i915_private;
>> >  struct i915_power_well;
>> >  struct intel_encoder;
>> > +struct seq_file;
>> >
>> >  /*
>> >   * Keep the pipe, transcoder, port (DDI_LANES,DDI_IO,AUX) domain
>> > instances
>> 
>> --
>> Jani Nikula, Intel Open Source Graphics Center
Chaitanya Kumar Borah June 27, 2023, 8:04 a.m. UTC | #4
Hello Jani,

> -----Original Message-----
> From: Jani Nikula <jani.nikula@linux.intel.com>
> Sent: Monday, June 26, 2023 8:05 PM
> To: Borah, Chaitanya Kumar <chaitanya.kumar.borah@intel.com>; intel-
> gfx@lists.freedesktop.org
> Cc: Shankar, Uma <uma.shankar@intel.com>; Murthy, Arun R
> <arun.r.murthy@intel.com>
> Subject: RE: [PATCH] drm/i915/display: Add forward declaration for struct
> seq_file
> 
> On Mon, 26 Jun 2023, "Borah, Chaitanya Kumar"
> <chaitanya.kumar.borah@intel.com> wrote:
> > Hello Jani,
> >
> >> -----Original Message-----
> >> From: Jani Nikula <jani.nikula@linux.intel.com>
> >> Sent: Monday, June 26, 2023 5:37 PM
> >> To: Borah, Chaitanya Kumar <chaitanya.kumar.borah@intel.com>; intel-
> >> gfx@lists.freedesktop.org
> >> Cc: Shankar, Uma <uma.shankar@intel.com>; Murthy, Arun R
> >> <arun.r.murthy@intel.com>; Borah, Chaitanya Kumar
> >> <chaitanya.kumar.borah@intel.com>
> >> Subject: Re: [PATCH] drm/i915/display: Add forward declaration for
> >> struct seq_file
> >>
> >> On Mon, 26 Jun 2023, Chaitanya Kumar Borah
> >> <chaitanya.kumar.borah@intel.com> wrote:
> >> > With change [1], visibility of struct seq_file is lost in
> >> > intel_display_power.h leading to build errors. Add forward
> >> > declaration.
> >> >
> >> > [1] ef104443bffa ("procfs: consolidate arch_report_meminfo
> >> > declaration")
> >> >
> >> > v2: Use forward declaration instead of headerfile inclusion [Jani]
> >> >
> >> > Signed-off-by: Chaitanya Kumar Borah
> >> > <chaitanya.kumar.borah@intel.com>
> >>
> >> Hey, thanks for the patch, this would've been fine, but looks like
> >> Imre just pushed commit f4fab137dd2b ("drm/i915: Add missing forward
> >> declarations/includes to display power headers") which adds the
> >> forward declaration among other things.
> >>
> >> Sorry for the trouble.
> >>
> >
> > No problem, Thank you for the info.
> >
> > Sorry for my ignorance but will this patch eventually find its way to
> > linux-next or do we need to do something special here?
> 
> It'll show up in linux-next once -rc1 is out. But I'm not sure that's the
> *question* you want the answer to, really.
> 

If I understand correctly, the patch will get merged with linux-next
along with the release of 6.4-rc1.

The pertinent question is when will linux-next builds be fixed?
We are missing out on regression tracking because of the build failures.

Regards

Chaitanya

> BR,
> Jani.
> 
> 
> >
> > Regards
> >
> > Chaitanya
> >
> >> BR,
> >> Jani.
> >>
> >> > ---
> >> >  drivers/gpu/drm/i915/display/intel_display_power.h | 1 +
> >> >  1 file changed, 1 insertion(+)
> >> >
> >> > diff --git a/drivers/gpu/drm/i915/display/intel_display_power.h
> >> > b/drivers/gpu/drm/i915/display/intel_display_power.h
> >> > index be1a87bde0c9..0ba268e566b0 100644
> >> > --- a/drivers/gpu/drm/i915/display/intel_display_power.h
> >> > +++ b/drivers/gpu/drm/i915/display/intel_display_power.h
> >> > @@ -16,6 +16,7 @@ enum port;
> >> >  struct drm_i915_private;
> >> >  struct i915_power_well;
> >> >  struct intel_encoder;
> >> > +struct seq_file;
> >> >
> >> >  /*
> >> >   * Keep the pipe, transcoder, port (DDI_LANES,DDI_IO,AUX) domain
> >> > instances
> >>
> >> --
> >> Jani Nikula, Intel Open Source Graphics Center
> 
> --
> Jani Nikula, Intel Open Source Graphics Center
Jani Nikula June 27, 2023, 9:47 a.m. UTC | #5
On Tue, 27 Jun 2023, "Borah, Chaitanya Kumar" <chaitanya.kumar.borah@intel.com> wrote:
> Hello Jani,
>
>> -----Original Message-----
>> From: Jani Nikula <jani.nikula@linux.intel.com>
>> Sent: Monday, June 26, 2023 8:05 PM
>> To: Borah, Chaitanya Kumar <chaitanya.kumar.borah@intel.com>; intel-
>> gfx@lists.freedesktop.org
>> Cc: Shankar, Uma <uma.shankar@intel.com>; Murthy, Arun R
>> <arun.r.murthy@intel.com>
>> Subject: RE: [PATCH] drm/i915/display: Add forward declaration for struct
>> seq_file
>> 
>> On Mon, 26 Jun 2023, "Borah, Chaitanya Kumar"
>> <chaitanya.kumar.borah@intel.com> wrote:
>> > Hello Jani,
>> >
>> >> -----Original Message-----
>> >> From: Jani Nikula <jani.nikula@linux.intel.com>
>> >> Sent: Monday, June 26, 2023 5:37 PM
>> >> To: Borah, Chaitanya Kumar <chaitanya.kumar.borah@intel.com>; intel-
>> >> gfx@lists.freedesktop.org
>> >> Cc: Shankar, Uma <uma.shankar@intel.com>; Murthy, Arun R
>> >> <arun.r.murthy@intel.com>; Borah, Chaitanya Kumar
>> >> <chaitanya.kumar.borah@intel.com>
>> >> Subject: Re: [PATCH] drm/i915/display: Add forward declaration for
>> >> struct seq_file
>> >>
>> >> On Mon, 26 Jun 2023, Chaitanya Kumar Borah
>> >> <chaitanya.kumar.borah@intel.com> wrote:
>> >> > With change [1], visibility of struct seq_file is lost in
>> >> > intel_display_power.h leading to build errors. Add forward
>> >> > declaration.
>> >> >
>> >> > [1] ef104443bffa ("procfs: consolidate arch_report_meminfo
>> >> > declaration")
>> >> >
>> >> > v2: Use forward declaration instead of headerfile inclusion [Jani]
>> >> >
>> >> > Signed-off-by: Chaitanya Kumar Borah
>> >> > <chaitanya.kumar.borah@intel.com>
>> >>
>> >> Hey, thanks for the patch, this would've been fine, but looks like
>> >> Imre just pushed commit f4fab137dd2b ("drm/i915: Add missing forward
>> >> declarations/includes to display power headers") which adds the
>> >> forward declaration among other things.
>> >>
>> >> Sorry for the trouble.
>> >>
>> >
>> > No problem, Thank you for the info.
>> >
>> > Sorry for my ignorance but will this patch eventually find its way to
>> > linux-next or do we need to do something special here?
>> 
>> It'll show up in linux-next once -rc1 is out. But I'm not sure that's the
>> *question* you want the answer to, really.
>> 
>
> If I understand correctly, the patch will get merged with linux-next
> along with the release of 6.4-rc1.
>
> The pertinent question is when will linux-next builds be fixed?
> We are missing out on regression tracking because of the build failures.

I've asked Tvrtko to pick this up to drm-intel-next-fixes, which should
show up in linux-next when it's next generated (it's daily).

BR,
Jani.

>
> Regards
>
> Chaitanya
>
>> BR,
>> Jani.
>> 
>> 
>> >
>> > Regards
>> >
>> > Chaitanya
>> >
>> >> BR,
>> >> Jani.
>> >>
>> >> > ---
>> >> >  drivers/gpu/drm/i915/display/intel_display_power.h | 1 +
>> >> >  1 file changed, 1 insertion(+)
>> >> >
>> >> > diff --git a/drivers/gpu/drm/i915/display/intel_display_power.h
>> >> > b/drivers/gpu/drm/i915/display/intel_display_power.h
>> >> > index be1a87bde0c9..0ba268e566b0 100644
>> >> > --- a/drivers/gpu/drm/i915/display/intel_display_power.h
>> >> > +++ b/drivers/gpu/drm/i915/display/intel_display_power.h
>> >> > @@ -16,6 +16,7 @@ enum port;
>> >> >  struct drm_i915_private;
>> >> >  struct i915_power_well;
>> >> >  struct intel_encoder;
>> >> > +struct seq_file;
>> >> >
>> >> >  /*
>> >> >   * Keep the pipe, transcoder, port (DDI_LANES,DDI_IO,AUX) domain
>> >> > instances
>> >>
>> >> --
>> >> Jani Nikula, Intel Open Source Graphics Center
>> 
>> --
>> Jani Nikula, Intel Open Source Graphics Center
Chaitanya Kumar Borah June 27, 2023, 9:50 a.m. UTC | #6
> -----Original Message-----
> From: Jani Nikula <jani.nikula@linux.intel.com>
> Sent: Tuesday, June 27, 2023 3:17 PM
> To: Borah, Chaitanya Kumar <chaitanya.kumar.borah@intel.com>; intel-
> gfx@lists.freedesktop.org
> Cc: Shankar, Uma <uma.shankar@intel.com>; Murthy, Arun R
> <arun.r.murthy@intel.com>
> Subject: RE: [PATCH] drm/i915/display: Add forward declaration for struct
> seq_file
> 
> On Tue, 27 Jun 2023, "Borah, Chaitanya Kumar"
> <chaitanya.kumar.borah@intel.com> wrote:
> > Hello Jani,
> >
> >> -----Original Message-----
> >> From: Jani Nikula <jani.nikula@linux.intel.com>
> >> Sent: Monday, June 26, 2023 8:05 PM
> >> To: Borah, Chaitanya Kumar <chaitanya.kumar.borah@intel.com>; intel-
> >> gfx@lists.freedesktop.org
> >> Cc: Shankar, Uma <uma.shankar@intel.com>; Murthy, Arun R
> >> <arun.r.murthy@intel.com>
> >> Subject: RE: [PATCH] drm/i915/display: Add forward declaration for
> >> struct seq_file
> >>
> >> On Mon, 26 Jun 2023, "Borah, Chaitanya Kumar"
> >> <chaitanya.kumar.borah@intel.com> wrote:
> >> > Hello Jani,
> >> >
> >> >> -----Original Message-----
> >> >> From: Jani Nikula <jani.nikula@linux.intel.com>
> >> >> Sent: Monday, June 26, 2023 5:37 PM
> >> >> To: Borah, Chaitanya Kumar <chaitanya.kumar.borah@intel.com>;
> >> >> intel- gfx@lists.freedesktop.org
> >> >> Cc: Shankar, Uma <uma.shankar@intel.com>; Murthy, Arun R
> >> >> <arun.r.murthy@intel.com>; Borah, Chaitanya Kumar
> >> >> <chaitanya.kumar.borah@intel.com>
> >> >> Subject: Re: [PATCH] drm/i915/display: Add forward declaration for
> >> >> struct seq_file
> >> >>
> >> >> On Mon, 26 Jun 2023, Chaitanya Kumar Borah
> >> >> <chaitanya.kumar.borah@intel.com> wrote:
> >> >> > With change [1], visibility of struct seq_file is lost in
> >> >> > intel_display_power.h leading to build errors. Add forward
> >> >> > declaration.
> >> >> >
> >> >> > [1] ef104443bffa ("procfs: consolidate arch_report_meminfo
> >> >> > declaration")
> >> >> >
> >> >> > v2: Use forward declaration instead of headerfile inclusion
> >> >> > [Jani]
> >> >> >
> >> >> > Signed-off-by: Chaitanya Kumar Borah
> >> >> > <chaitanya.kumar.borah@intel.com>
> >> >>
> >> >> Hey, thanks for the patch, this would've been fine, but looks like
> >> >> Imre just pushed commit f4fab137dd2b ("drm/i915: Add missing
> >> >> forward declarations/includes to display power headers") which
> >> >> adds the forward declaration among other things.
> >> >>
> >> >> Sorry for the trouble.
> >> >>
> >> >
> >> > No problem, Thank you for the info.
> >> >
> >> > Sorry for my ignorance but will this patch eventually find its way
> >> > to linux-next or do we need to do something special here?
> >>
> >> It'll show up in linux-next once -rc1 is out. But I'm not sure that's
> >> the
> >> *question* you want the answer to, really.
> >>
> >
> > If I understand correctly, the patch will get merged with linux-next
> > along with the release of 6.4-rc1.
> >
> > The pertinent question is when will linux-next builds be fixed?
> > We are missing out on regression tracking because of the build failures.
> 
> I've asked Tvrtko to pick this up to drm-intel-next-fixes, which should show up
> in linux-next when it's next generated (it's daily).
> 

Thanks a lot, Jani!

Best Regards

Chaitanya

> BR,
> Jani.
> 
> >
> > Regards
> >
> > Chaitanya
> >
> >> BR,
> >> Jani.
> >>
> >>
> >> >
> >> > Regards
> >> >
> >> > Chaitanya
> >> >
> >> >> BR,
> >> >> Jani.
> >> >>
> >> >> > ---
> >> >> >  drivers/gpu/drm/i915/display/intel_display_power.h | 1 +
> >> >> >  1 file changed, 1 insertion(+)
> >> >> >
> >> >> > diff --git a/drivers/gpu/drm/i915/display/intel_display_power.h
> >> >> > b/drivers/gpu/drm/i915/display/intel_display_power.h
> >> >> > index be1a87bde0c9..0ba268e566b0 100644
> >> >> > --- a/drivers/gpu/drm/i915/display/intel_display_power.h
> >> >> > +++ b/drivers/gpu/drm/i915/display/intel_display_power.h
> >> >> > @@ -16,6 +16,7 @@ enum port;
> >> >> >  struct drm_i915_private;
> >> >> >  struct i915_power_well;
> >> >> >  struct intel_encoder;
> >> >> > +struct seq_file;
> >> >> >
> >> >> >  /*
> >> >> >   * Keep the pipe, transcoder, port (DDI_LANES,DDI_IO,AUX)
> >> >> > domain instances
> >> >>
> >> >> --
> >> >> Jani Nikula, Intel Open Source Graphics Center
> >>
> >> --
> >> Jani Nikula, Intel Open Source Graphics Center
> 
> --
> Jani Nikula, Intel Open Source Graphics Center
diff mbox series

Patch

diff --git a/drivers/gpu/drm/i915/display/intel_display_power.h b/drivers/gpu/drm/i915/display/intel_display_power.h
index be1a87bde0c9..0ba268e566b0 100644
--- a/drivers/gpu/drm/i915/display/intel_display_power.h
+++ b/drivers/gpu/drm/i915/display/intel_display_power.h
@@ -16,6 +16,7 @@  enum port;
 struct drm_i915_private;
 struct i915_power_well;
 struct intel_encoder;
+struct seq_file;
 
 /*
  * Keep the pipe, transcoder, port (DDI_LANES,DDI_IO,AUX) domain instances