diff options
| author | Jani Nikula <jani.nikula@intel.com> | 2015-12-15 13:16:15 +0200 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2015-12-16 11:22:44 +0200 |
| commit | f0067a31e83425d14c448e6846661a9be36761b9 (patch) | |
| tree | 975eb8d41feb9de76526befb6aa9533f537bd084 /drivers/gpu/drm/i915/intel_opregion.c | |
| parent | 8b8e1a8990864023c7d04e8591934229c7af4229 (diff) | |
| download | linux-stable-f0067a31e83425d14c448e6846661a9be36761b9.tar.gz linux-stable-f0067a31e83425d14c448e6846661a9be36761b9.tar.bz2 linux-stable-f0067a31e83425d14c448e6846661a9be36761b9.zip | |
drm/i915: refactor VBT validation
Make the validation function a boolean operating on a buffer of given
size, removing the extra pointer dances.
Move the OpRegion based VBT validation to intel_opregion_setup(), only
initializing opregion->vbt if it's valid.
v2: move logging about valid VBT to opregion setup too (Ville)
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1450178175-27420-1-git-send-email-jani.nikula@intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/intel_opregion.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_opregion.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_opregion.c b/drivers/gpu/drm/i915/intel_opregion.c index 5b9fc790d300..859c9acbee73 100644 --- a/drivers/gpu/drm/i915/intel_opregion.c +++ b/drivers/gpu/drm/i915/intel_opregion.c @@ -986,8 +986,15 @@ int intel_opregion_setup(struct drm_device *dev) if (mboxes & MBOX_ASLE_EXT) DRM_DEBUG_DRIVER("ASLE extension supported\n"); - if (!dmi_check_system(intel_no_opregion_vbt)) - opregion->vbt = base + OPREGION_VBT_OFFSET; + if (!dmi_check_system(intel_no_opregion_vbt)) { + void *vbt = base + OPREGION_VBT_OFFSET; + u32 vbt_size = OPREGION_SIZE - OPREGION_VBT_OFFSET; + + if (intel_bios_is_valid_vbt(vbt, vbt_size)) { + DRM_DEBUG_KMS("Found valid VBT in ACPI OpRegion\n"); + opregion->vbt = vbt; + } + } return 0; |