Commit 0e53f472 authored by Jani Nikula's avatar Jani Nikula

drm/i915/opregion: bail out early for systems with no opregion VBT

Reduce indent. No functional changes.
Reviewed-by: default avatarBob Paauwe <bob.j.paauwe@intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1490783578-6065-1-git-send-email-jani.nikula@intel.com
parent 2f075565
...@@ -920,6 +920,8 @@ int intel_opregion_setup(struct drm_i915_private *dev_priv) ...@@ -920,6 +920,8 @@ int intel_opregion_setup(struct drm_i915_private *dev_priv)
char buf[sizeof(OPREGION_SIGNATURE)]; char buf[sizeof(OPREGION_SIGNATURE)];
int err = 0; int err = 0;
void *base; void *base;
const void *vbt = NULL;
u32 vbt_size = 0;
BUILD_BUG_ON(sizeof(struct opregion_header) != 0x100); BUILD_BUG_ON(sizeof(struct opregion_header) != 0x100);
BUILD_BUG_ON(sizeof(struct opregion_acpi) != 0x100); BUILD_BUG_ON(sizeof(struct opregion_acpi) != 0x100);
...@@ -972,9 +974,8 @@ int intel_opregion_setup(struct drm_i915_private *dev_priv) ...@@ -972,9 +974,8 @@ int intel_opregion_setup(struct drm_i915_private *dev_priv)
if (mboxes & MBOX_ASLE_EXT) if (mboxes & MBOX_ASLE_EXT)
DRM_DEBUG_DRIVER("ASLE extension supported\n"); DRM_DEBUG_DRIVER("ASLE extension supported\n");
if (!dmi_check_system(intel_no_opregion_vbt)) { if (dmi_check_system(intel_no_opregion_vbt))
const void *vbt = NULL; goto out;
u32 vbt_size = 0;
if (opregion->header->opregion_ver >= 2 && opregion->asle && if (opregion->header->opregion_ver >= 2 && opregion->asle &&
opregion->asle->rvda && opregion->asle->rvds) { opregion->asle->rvda && opregion->asle->rvds) {
...@@ -992,13 +993,12 @@ int intel_opregion_setup(struct drm_i915_private *dev_priv) ...@@ -992,13 +993,12 @@ int intel_opregion_setup(struct drm_i915_private *dev_priv)
} else { } else {
vbt = base + OPREGION_VBT_OFFSET; vbt = base + OPREGION_VBT_OFFSET;
/* /*
* The VBT specification says that if the ASLE ext * The VBT specification says that if the ASLE ext mailbox is
* mailbox is not used its area is reserved, but * not used its area is reserved, but on some CHT boards the VBT
* on some CHT boards the VBT extends into the * extends into the ASLE ext area. Allow this even though it is
* ASLE ext area. Allow this even though it is * against the spec, so we do not end up rejecting the VBT on
* against the spec, so we do not end up rejecting * those boards (and end up not finding the LCD panel because of
* the VBT on those boards (and end up not finding the * this).
* LCD panel because of this).
*/ */
vbt_size = (mboxes & MBOX_ASLE_EXT) ? vbt_size = (mboxes & MBOX_ASLE_EXT) ?
OPREGION_ASLE_EXT_OFFSET : OPREGION_SIZE; OPREGION_ASLE_EXT_OFFSET : OPREGION_SIZE;
...@@ -1009,8 +1009,8 @@ int intel_opregion_setup(struct drm_i915_private *dev_priv) ...@@ -1009,8 +1009,8 @@ int intel_opregion_setup(struct drm_i915_private *dev_priv)
opregion->vbt_size = vbt_size; opregion->vbt_size = vbt_size;
} }
} }
}
out:
return 0; return 0;
err_out: err_out:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment