[PATCH] drm/i915: intel_overlay_print_error_state() only needed for debugfs

[PATCH] drm/i915: intel_overlay_print_error_state() only needed for debugfs

[Tobias Doerffel]

The function intel_overlay_print_error_state() is called from within
i915_error_state() in i915_debufs.c which is only built if
CONFIG_DEBUG_FS is set. When building without this option, seq_printf()
is not declared in intel_overlay.c and the file fails to compile.
Furthermore the whole function is superfluous in this case. Therefore
only build it if CONFIG_DEBUG_FS is set.
---
 drivers/gpu/drm/i915/intel_overlay.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_overlay.c b/drivers/gpu/drm/i915/intel_overlay.c
index 4f00390..74feb89 100644
--- a/drivers/gpu/drm/i915/intel_overlay.c
+++ b/drivers/gpu/drm/i915/intel_overlay.c
@@ -1461,6 +1461,7 @@ err:
 	return NULL;
 }
 
+#ifdef CONFIG_DEBUG_FS
 void
 intel_overlay_print_error_state(struct seq_file *m, struct intel_overlay_error_state *error)
 {
@@ -1513,3 +1514,4 @@ intel_overlay_print_error_state(struct seq_file *m, struct intel_overlay_error_s
 	P(UVSCALEV);
 #undef P
 }
+#endif	/* CONFIG_DEBUG_FS */
-- 
1.7.1

Re: [PATCH] drm/i915: intel_overlay_print_error_state() only needed for debugfs

[Paul Menzel]

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

Am Mittwoch, den 25.08.2010, 23:54 +0200 schrieb Tobias Doerffel:
> The function intel_overlay_print_error_state() is called from within
> i915_error_state() in i915_debufs.c which is only built if
> CONFIG_DEBUG_FS is set. When building without this option, seq_printf()
> is not declared in intel_overlay.c and the file fails to compile.
> Furthermore the whole function is superfluous in this case. Therefore
> only build it if CONFIG_DEBUG_FS is set.

Signed-off-by is missing. Please resent as v2.

[…]


Thanks,

Paul

[-- Attachment #1.2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 198 bytes --]

[-- Attachment #2: Type: text/plain, Size: 159 bytes --]

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

[PATCH] drm/i915: intel_overlay_print_error_state() only needed for debugfs (v2)

[Tobias Doerffel]

The function intel_overlay_print_error_state() is called from within
i915_error_state() in i915_debufs.c which is only built if
CONFIG_DEBUG_FS is set. When building without this option, seq_printf()
is not declared in intel_overlay.c and the file fails to compile.
Furthermore the whole function is superfluous in this case. Therefore
only build it if CONFIG_DEBUG_FS is set.

Signed-off-by: Tobias Doerffel <tobias.doerffel@gmail.com>
---
 drivers/gpu/drm/i915/intel_overlay.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_overlay.c b/drivers/gpu/drm/i915/intel_overlay.c
index 4f00390..74feb89 100644
--- a/drivers/gpu/drm/i915/intel_overlay.c
+++ b/drivers/gpu/drm/i915/intel_overlay.c
@@ -1461,6 +1461,7 @@ err:
 	return NULL;
 }
 
+#ifdef CONFIG_DEBUG_FS
 void
 intel_overlay_print_error_state(struct seq_file *m, struct intel_overlay_error_state *error)
 {
@@ -1513,3 +1514,4 @@ intel_overlay_print_error_state(struct seq_file *m, struct intel_overlay_error_s
 	P(UVSCALEV);
 #undef P
 }
+#endif	/* CONFIG_DEBUG_FS */
-- 
1.7.1

Re: [PATCH] drm/i915: intel_overlay_print_error_state() only needed for debugfs (v2)

[Tobias Doerffel]

[-- Attachment #1.1: Type: Text/Plain, Size: 1906 bytes --]

Hi,

Am Donnerstag, 26. August 2010, um 08:41:13 schrieb Andre Müller:
> On 08/26/10 01:52, Tobias Doerffel wrote:
> > The function intel_overlay_print_error_state() is called from within
> > i915_error_state() in i915_debufs.c which is only built if
> > CONFIG_DEBUG_FS is set. When building without this option, seq_printf()
> > is not declared in intel_overlay.c and the file fails to compile.
> > Furthermore the whole function is superfluous in this case. Therefore
> > only build it if CONFIG_DEBUG_FS is set.
> > 
> > Signed-off-by: Tobias Doerffel <tobias.doerffel@gmail.com>
> 
> You may want to refer to
> https://bugzilla.kernel.org/show_bug.cgi?id=16811
> in the description.
> Andrew Morton has a different fix for the failure
> applied to -mm, which just adds an (unconditional)
> #include <linux/seq_file.h>.

Yes, that works as well however the affected function is not required at all 
without debugfs so we can leave it out completely (like done with all the 
other functions in i915_debufs.c) and save some bytes.

Regards

Toby

> Regards,
> Andre
> 
> > ---
> > 
> >  drivers/gpu/drm/i915/intel_overlay.c |    2 ++
> >  1 files changed, 2 insertions(+), 0 deletions(-)
> > 
> > diff --git a/drivers/gpu/drm/i915/intel_overlay.c
> > b/drivers/gpu/drm/i915/intel_overlay.c index 4f00390..74feb89 100644
> > --- a/drivers/gpu/drm/i915/intel_overlay.c
> > +++ b/drivers/gpu/drm/i915/intel_overlay.c
> > 
> > @@ -1461,6 +1461,7 @@ err:
> >  	return NULL;
> >  
> >  }
> > 
> > +#ifdef CONFIG_DEBUG_FS
> > 
> >  void
> >  intel_overlay_print_error_state(struct seq_file *m, struct
> >  intel_overlay_error_state *error) {
> > 
> > @@ -1513,3 +1514,4 @@ intel_overlay_print_error_state(struct seq_file *m,
> > struct intel_overlay_error_s
> > 
> >  	P(UVSCALEV);
> >  
> >  #undef P
> >  }
> > 
> > +#endif	/* CONFIG_DEBUG_FS */


[-- Attachment #1.2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 198 bytes --]

[-- Attachment #2: Type: text/plain, Size: 159 bytes --]

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] drm/i915: intel_overlay_print_error_state() only needed for debugfs (v2)

[Chris Wilson]

On Thu, 26 Aug 2010 01:52:16 +0200, Tobias Doerffel <tobias.doerffel@gmail.com> wrote:
> The function intel_overlay_print_error_state() is called from within
> i915_error_state() in i915_debufs.c which is only built if
> CONFIG_DEBUG_FS is set. When building without this option, seq_printf()
> is not declared in intel_overlay.c and the file fails to compile.
> Furthermore the whole function is superfluous in this case. Therefore
> only build it if CONFIG_DEBUG_FS is set.
> 
> Signed-off-by: Tobias Doerffel <tobias.doerffel@gmail.com>
I've already posted a better patch to remove the compile warnings as well.

The simple inclusion of seq_file.h is the best patch to go into mainline
atm, with the more complete patch coming in via drm-intel-next.

-- 
Chris Wilson, Intel Open Source Technology Centre