diff options
| author |   Ville Syrjälä <ville.syrjala@linux.intel.com> | 2015-12-14 18:23:47 +0200 |
|---|---|---|
| committer | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2016-01-12 16:12:44 +0200 |
| commit | 7244f309b0fc6508ec585e723ae92057f5bd5855 (patch) | |
| tree | 47c61889127e38a8cd445707e54acf3766bee19f /drivers/gpu/drm/i915/intel_bios.c | |
| parent | drm/i915: Allow 27 bytes child_dev for VBT <109 (diff) | |
| download | linux-dev-7244f309b0fc6508ec585e723ae92057f5bd5855.tar.xz linux-dev-7244f309b0fc6508ec585e723ae92057f5bd5855.zip | |
drm/i915: Expect child dev size of 22 bytes for VBT < 106
My 830 has VBT version 105 with child device size of 22 bytes.
Let's assume that's correct and adjust our expectations.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1450110229-30450-9-git-send-email-ville.syrjala@linux.intel.com
Acked-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_bios.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_bios.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/intel_bios.c index 1de16f21121a..12e2f8b8bf9c 100644 --- a/drivers/gpu/drm/i915/intel_bios.c +++ b/drivers/gpu/drm/i915/intel_bios.c @@ -1157,7 +1157,9 @@ parse_device_mapping(struct drm_i915_private *dev_priv, DRM_DEBUG_KMS("No general definition block is found, no devices defined.\n"); return; } - if (bdb->version < 109) { + if (bdb->version < 106) { + expected_size = 22; + } else if (bdb->version < 109) { expected_size = 27; } else if (bdb->version < 195) { BUILD_BUG_ON(sizeof(struct old_child_dev_config) != 33); |