[3/3] HACK: drm/i915/opregion: ICL should have opregion 2.1+ and relative rvda

Submitted by Jani Nikula on Feb. 8, 2019, 12:43 p.m.

Details

Message ID 20190208124332.886-3-jani.nikula@intel.com
State New
Series "Series without cover letter"
Headers show

Commit Message

Jani Nikula Feb. 8, 2019, 12:43 p.m.
Temporary CI workaround before proper opregion version bump propagates
to the machines.

Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Imre Deak <imre.deak@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
 drivers/gpu/drm/i915/intel_opregion.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Patch hide | download patch | download mbox

diff --git a/drivers/gpu/drm/i915/intel_opregion.c b/drivers/gpu/drm/i915/intel_opregion.c
index c7d523da6631..e90be277ac21 100644
--- a/drivers/gpu/drm/i915/intel_opregion.c
+++ b/drivers/gpu/drm/i915/intel_opregion.c
@@ -971,7 +971,8 @@  int intel_opregion_setup(struct drm_i915_private *dev_priv)
 		 * opregion 2.1+: rvda is unsigned, relative offset from
 		 * opregion base, and should never point within opregion.
 		 */
-		if (opregion->header->opregion_ver >= OPREGION_VERSION(2, 1)) {
+		if (opregion->header->opregion_ver >= OPREGION_VERSION(2, 1) ||
+		    IS_ICELAKE(dev_priv)) {
 			WARN_ON(rvda < OPREGION_SIZE);
 
 			rvda += asls;