diff mbox

drm/i915: set FDI translations to NULL on SKL

Message ID 1435937490-1633-1-git-send-email-przanoni@gmail.com (mailing list archive)
State New, archived
Headers show

Commit Message

Paulo Zanoni July 3, 2015, 3:31 p.m. UTC
From: Paulo Zanoni <paulo.r.zanoni@intel.com>

drivers/gpu/drm/i915/intel_ddi.c: In function ‘intel_prepare_ddi’:
drivers/gpu/drm/i915/intel_ddi.c:517:6: warning:
‘ddi_translations_fdi’ may be used uninitialized in this function
[-Wmaybe-uninitialized]
   if (ddi_translations_fdi)
      ^
drivers/gpu/drm/i915/intel_ddi.c:446:30: note: ‘ddi_translations_fdi’
was declared here
  const struct ddi_buf_trans *ddi_translations_fdi;
                              ^

This line used to be there, but was removed by:

commit f8896f5d58e64bfd3c2b5f7c5ba5c3f3967e93c7
Author: David Weinehall <david.weinehall@linux.intel.com>
Date:   Thu Jun 25 11:11:03 2015 +030
    drm/i915/skl: Buffer translation improvements

Cc: David Weinehall <david.weinehall@linux.intel.com>
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
---
 drivers/gpu/drm/i915/intel_ddi.c | 1 +
 1 file changed, 1 insertion(+)

Comments

Daniel Vetter July 6, 2015, 9:33 a.m. UTC | #1
On Fri, Jul 03, 2015 at 12:31:30PM -0300, Paulo Zanoni wrote:
> From: Paulo Zanoni <paulo.r.zanoni@intel.com>
> 
> drivers/gpu/drm/i915/intel_ddi.c: In function ‘intel_prepare_ddi’:
> drivers/gpu/drm/i915/intel_ddi.c:517:6: warning:
> ‘ddi_translations_fdi’ may be used uninitialized in this function
> [-Wmaybe-uninitialized]
>    if (ddi_translations_fdi)
>       ^
> drivers/gpu/drm/i915/intel_ddi.c:446:30: note: ‘ddi_translations_fdi’
> was declared here
>   const struct ddi_buf_trans *ddi_translations_fdi;
>                               ^
> 
> This line used to be there, but was removed by:
> 
> commit f8896f5d58e64bfd3c2b5f7c5ba5c3f3967e93c7
> Author: David Weinehall <david.weinehall@linux.intel.com>
> Date:   Thu Jun 25 11:11:03 2015 +030
>     drm/i915/skl: Buffer translation improvements
> 
> Cc: David Weinehall <david.weinehall@linux.intel.com>
> Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>

Queued for -next, thanks for the patch.
-Daniel

> ---
>  drivers/gpu/drm/i915/intel_ddi.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
> index 15fc66a..782310f 100644
> --- a/drivers/gpu/drm/i915/intel_ddi.c
> +++ b/drivers/gpu/drm/i915/intel_ddi.c
> @@ -458,6 +458,7 @@ static void intel_prepare_ddi_buffers(struct drm_device *dev, enum port port,
>  					INTEL_OUTPUT_HDMI);
>  		return;
>  	} else if (IS_SKYLAKE(dev)) {
> +		ddi_translations_fdi = NULL;
>  		ddi_translations_dp =
>  				skl_get_buf_trans_dp(dev, &n_dp_entries);
>  		ddi_translations_edp =
> -- 
> 2.1.4
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
David Weinehall July 6, 2015, 10:47 a.m. UTC | #2
On Fri, Jul 03, 2015 at 12:31:30PM -0300, Paulo Zanoni wrote:
> From: Paulo Zanoni <paulo.r.zanoni@intel.com>
> 
> drivers/gpu/drm/i915/intel_ddi.c: In function ‘intel_prepare_ddi’:
> drivers/gpu/drm/i915/intel_ddi.c:517:6: warning:
> ‘ddi_translations_fdi’ may be used uninitialized in this function
> [-Wmaybe-uninitialized]
>    if (ddi_translations_fdi)
>       ^
> drivers/gpu/drm/i915/intel_ddi.c:446:30: note: ‘ddi_translations_fdi’
> was declared here
>   const struct ddi_buf_trans *ddi_translations_fdi;

Thanks for noticing!  Weird -- and embarassing -- that I missed this :S


Kind regards, David
Daniel Vetter July 6, 2015, 12:40 p.m. UTC | #3
On Mon, Jul 06, 2015 at 01:47:44PM +0300, David Weinehall wrote:
> On Fri, Jul 03, 2015 at 12:31:30PM -0300, Paulo Zanoni wrote:
> > From: Paulo Zanoni <paulo.r.zanoni@intel.com>
> > 
> > drivers/gpu/drm/i915/intel_ddi.c: In function ‘intel_prepare_ddi’:
> > drivers/gpu/drm/i915/intel_ddi.c:517:6: warning:
> > ‘ddi_translations_fdi’ may be used uninitialized in this function
> > [-Wmaybe-uninitialized]
> >    if (ddi_translations_fdi)
> >       ^
> > drivers/gpu/drm/i915/intel_ddi.c:446:30: note: ‘ddi_translations_fdi’
> > was declared here
> >   const struct ddi_buf_trans *ddi_translations_fdi;
> 
> Thanks for noticing!  Weird -- and embarassing -- that I missed this :S

Create a personal public git repo somewhere, tell the 0-day folks about it
and just wait a few hours before hitting send. You _will_ reliable get
reports about this stuff before I get them when I apply the patch ;-)
-Daniel
diff mbox

Patch

diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
index 15fc66a..782310f 100644
--- a/drivers/gpu/drm/i915/intel_ddi.c
+++ b/drivers/gpu/drm/i915/intel_ddi.c
@@ -458,6 +458,7 @@  static void intel_prepare_ddi_buffers(struct drm_device *dev, enum port port,
 					INTEL_OUTPUT_HDMI);
 		return;
 	} else if (IS_SKYLAKE(dev)) {
+		ddi_translations_fdi = NULL;
 		ddi_translations_dp =
 				skl_get_buf_trans_dp(dev, &n_dp_entries);
 		ddi_translations_edp =