[PATCH] drm/i915: Silence "unexpected child device config size" for VBT on 845g

[PATCH] drm/i915: Silence "unexpected child device config size" for VBT on 845g

[Chris Wilson]

My old 845g complains that the child_device_size inside its VBT,
version 110, is incorrect. Let's fiddle with the version matching such
that it works with this VBT (i.e. treat BIOS v110 as having the same size
as v108).

Fixes [drm:intel_bios_init] *ERROR* Unexpected child device config
size 27 (expected 33 for VBT version 110)

Whether this is correct, no one knows - but it works for this particular
machine.

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 624e755e451f..e04e03b2da84 100644
--- a/drivers/gpu/drm/i915/intel_bios.c
+++ b/drivers/gpu/drm/i915/intel_bios.c
@@ -1206,7 +1206,7 @@ parse_device_mapping(struct drm_i915_private *dev_priv,
 	}
 	if (bdb->version < 106) {
 		expected_size = 22;
-	} else if (bdb->version < 109) {
+	} else if (bdb->version < 111) {
 		expected_size = 27;
 	} else if (bdb->version < 195) {
 		BUILD_BUG_ON(sizeof(struct old_child_dev_config) != 33);
-- 
2.8.1

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

Re: [PATCH] drm/i915: Silence "unexpected child device config size" for VBT on 845g

[Ville Syrjälä]

On Wed, Jun 01, 2016 at 06:08:43PM +0100, Chris Wilson wrote:
> My old 845g complains that the child_device_size inside its VBT,
> version 110, is incorrect. Let's fiddle with the version matching such
> that it works with this VBT (i.e. treat BIOS v110 as having the same size
> as v108).
> 
> Fixes [drm:intel_bios_init] *ERROR* Unexpected child device config
> size 27 (expected 33 for VBT version 110)
> 
> Whether this is correct, no one knows - but it works for this particular
> machine.
> 
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

Matches how I "fixed" my 830 and 855.

Acked-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

> ---
>  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 624e755e451f..e04e03b2da84 100644
> --- a/drivers/gpu/drm/i915/intel_bios.c
> +++ b/drivers/gpu/drm/i915/intel_bios.c
> @@ -1206,7 +1206,7 @@ parse_device_mapping(struct drm_i915_private *dev_priv,
>  	}
>  	if (bdb->version < 106) {
>  		expected_size = 22;
> -	} else if (bdb->version < 109) {
> +	} else if (bdb->version < 111) {
>  		expected_size = 27;
>  	} else if (bdb->version < 195) {
>  		BUILD_BUG_ON(sizeof(struct old_child_dev_config) != 33);
> -- 
> 2.8.1
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx