Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 04ebaadb authored by Jani Nikula's avatar Jani Nikula
Browse files

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: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Tested-by: default avatarMika Kahola <mika.kahola@intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1450178280-28020-1-git-send-email-jani.nikula@intel.com
parent ffc85dab

drivers/gpu/drm/i915/i915_drv.h

+1 −0
Original line number Diff line number Diff line
@@ -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;

drivers/gpu/drm/i915/intel_opregion.c

+24 −3
Original line number Diff line number Diff line
@@ -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;

			}

		}

	}