drm/i915: Tone done *ERROR* for an expected VBT condition
diff mbox

Message ID 1438337727-9057-1-git-send-email-chris@chris-wilson.co.uk
State New
Headers show

Commit Message

Chris Wilson July 31, 2015, 10:15 a.m. UTC
Older VBT (e.g. gen2) have smaller child block defintions, so do not cry
wolf over an error that is outside of our control and is not an error
anyway.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
 drivers/gpu/drm/i915/intel_bios.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Daniel Vetter Aug. 5, 2015, 8:34 a.m. UTC | #1
On Fri, Jul 31, 2015 at 11:15:27AM +0100, Chris Wilson wrote:
> Older VBT (e.g. gen2) have smaller child block defintions, so do not cry
> wolf over an error that is outside of our control and is not an error
> anyway.
> 
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> ---
>  drivers/gpu/drm/i915/intel_bios.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/intel_bios.c
> index 2ff9eb00fdec..f8afbafa8e02 100644
> --- a/drivers/gpu/drm/i915/intel_bios.c
> +++ b/drivers/gpu/drm/i915/intel_bios.c
> @@ -1023,7 +1023,7 @@ parse_device_mapping(struct drm_i915_private *dev_priv,
>  		return;
>  	}
>  	if (p_defs->child_dev_size < sizeof(*p_child)) {

This line was added in

commit 90e4f1592bb6e82f6690f0e05a8aadcf04d7bce7
Author: Ville Syrjälä <ville.syrjala@linux.intel.com>
Date:   Wed Mar 25 18:45:58 2015 +0200

    drm/i915: Fix the VBT child device parsing for BSW

Since vbt is complete pain I started requiring that we match expected
sizes with vbt versions. Can some one please fix this?

Or we can just revert the old patch.
-Daniel

> -		DRM_ERROR("General definiton block child device size is too small.\n");
> +		DRM_DEBUG_KMS("General definiton block child device size is too small.\n");
>  		return;
>  	}
>  	/* get the block size of general definitions */
> -- 
> 2.5.0
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Chris Wilson Aug. 5, 2015, 8:48 a.m. UTC | #2
On Wed, Aug 05, 2015 at 10:34:07AM +0200, Daniel Vetter wrote:
> On Fri, Jul 31, 2015 at 11:15:27AM +0100, Chris Wilson wrote:
> > Older VBT (e.g. gen2) have smaller child block defintions, so do not cry
> > wolf over an error that is outside of our control and is not an error
> > anyway.
> > 
> > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> > ---
> >  drivers/gpu/drm/i915/intel_bios.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/intel_bios.c
> > index 2ff9eb00fdec..f8afbafa8e02 100644
> > --- a/drivers/gpu/drm/i915/intel_bios.c
> > +++ b/drivers/gpu/drm/i915/intel_bios.c
> > @@ -1023,7 +1023,7 @@ parse_device_mapping(struct drm_i915_private *dev_priv,
> >  		return;
> >  	}
> >  	if (p_defs->child_dev_size < sizeof(*p_child)) {
> 
> This line was added in
> 
> commit 90e4f1592bb6e82f6690f0e05a8aadcf04d7bce7
> Author: Ville Syrjälä <ville.syrjala@linux.intel.com>
> Date:   Wed Mar 25 18:45:58 2015 +0200
> 
>     drm/i915: Fix the VBT child device parsing for BSW
> 
> Since vbt is complete pain I started requiring that we match expected
> sizes with vbt versions. Can some one please fix this?

I hope id:20150804135552.GC6150@boom does.
-Chris

Patch
diff mbox

diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/intel_bios.c
index 2ff9eb00fdec..f8afbafa8e02 100644
--- a/drivers/gpu/drm/i915/intel_bios.c
+++ b/drivers/gpu/drm/i915/intel_bios.c
@@ -1023,7 +1023,7 @@  parse_device_mapping(struct drm_i915_private *dev_priv,
 		return;
 	}
 	if (p_defs->child_dev_size < sizeof(*p_child)) {
-		DRM_ERROR("General definiton block child device size is too small.\n");
+		DRM_DEBUG_KMS("General definiton block child device size is too small.\n");
 		return;
 	}
 	/* get the block size of general definitions */