drm/i915/opregion: handle VBT sizes bigger than 6 KB

The RVDA and RVDS (raw VBT data address and size) fields of the ASLE
mailbox may specify an alternate location for VBT instead of mailbox #4.
Use the alternate location if available and valid, falling back to
mailbox #4 otherwise.

v2: Update debug logging (Ville)

Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Tested-by: Mika Kahola <mika.kahola@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1450178280-28020-1-git-send-email-jani.nikula@intel.com

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 18be127f567898cd107986d02273d7c0254befc0..b9739d10e9b4fdc9523f3db48703b6fc9457db03 100644 (file)
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -458,6 +458,7 @@ struct intel_opregion {
        u32 swsci_gbda_sub_functions;
        u32 swsci_sbcb_sub_functions;
        struct opregion_asle *asle;
+       void *rvda;
        const void *vbt;
        u32 vbt_size;
        u32 *lid_state;

diff --git a/drivers/gpu/drm/i915/intel_opregion.c b/drivers/gpu/drm/i915/intel_opregion.c
index 96dbd71124a30738ecf85d8ef477b69c2f7cd862..c15718b4862a193e0a54abf82e3eebd02c99cd4c 100644 (file)
--- a/drivers/gpu/drm/i915/intel_opregion.c
+++ b/drivers/gpu/drm/i915/intel_opregion.c
@@ -837,6 +837,10 @@ void intel_opregion_fini(struct drm_device *dev)
 
        /* just clear all opregion memory pointers now */
        memunmap(opregion->header);
+       if (opregion->rvda) {
+               memunmap(opregion->rvda);
+               opregion->rvda = NULL;
+       }
        opregion->header = NULL;
        opregion->acpi = NULL;
        opregion->swsci = NULL;
@@ -987,13 +991,30 @@ int intel_opregion_setup(struct drm_device *dev)
                DRM_DEBUG_DRIVER("ASLE extension supported\n");
 
        if (!dmi_check_system(intel_no_opregion_vbt)) {
-               const void *vbt = base + OPREGION_VBT_OFFSET;
-               u32 vbt_size = OPREGION_ASLE_EXT_OFFSET - OPREGION_VBT_OFFSET;
+               const void *vbt = NULL;
+               u32 vbt_size = 0;
+
+               if (opregion->header->opregion_ver >= 2 && opregion->asle &&
+                   opregion->asle->rvda && opregion->asle->rvds) {
+                       opregion->rvda = memremap(opregion->asle->rvda,
+                                                 opregion->asle->rvds,
+                                                 MEMREMAP_WB);
+                       vbt = opregion->rvda;
+                       vbt_size = opregion->asle->rvds;
+               }
 
                if (intel_bios_is_valid_vbt(vbt, vbt_size)) {
-                       DRM_DEBUG_KMS("Found valid VBT in ACPI OpRegion\n");
+                       DRM_DEBUG_KMS("Found valid VBT in ACPI OpRegion (RVDA)\n");
                        opregion->vbt = vbt;
                        opregion->vbt_size = vbt_size;
+               } else {
+                       vbt = base + OPREGION_VBT_OFFSET;
+                       vbt_size = OPREGION_ASLE_EXT_OFFSET - OPREGION_VBT_OFFSET;
+                       if (intel_bios_is_valid_vbt(vbt, vbt_size)) {
+                               DRM_DEBUG_KMS("Found valid VBT in ACPI OpRegion (Mailbox #4)\n");
+                               opregion->vbt = vbt;
+                               opregion->vbt_size = vbt_size;
+                       }
                }
        }