[v3,3/3] HACK: drm/i915/opregion: ICL should have opregion 2.1+ and relative rvda
diff mbox series

Message ID 20190208184254.24123-3-jani.nikula@intel.com
State New
Headers show
Series
  • [v3,1/3] drm/i915/opregion: fix version check
Related show

Commit Message

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

v2: Rebase

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
diff mbox series

diff --git a/drivers/gpu/drm/i915/intel_opregion.c b/drivers/gpu/drm/i915/intel_opregion.c
index 5e00ee9270b5..5437effcb396 100644
--- a/drivers/gpu/drm/i915/intel_opregion.c
+++ b/drivers/gpu/drm/i915/intel_opregion.c
@@ -974,7 +974,8 @@  int intel_opregion_setup(struct drm_i915_private *dev_priv)
 		 * opregion base, and should never point within opregion.
 		 */
 		if (opregion->header->over.major > 2 ||
-		    opregion->header->over.minor >= 1) {
+		    opregion->header->over.minor >= 1 ||
+		    IS_ICELAKE(dev_priv)) {
 			WARN_ON(rvda < OPREGION_SIZE);
 
 			rvda += asls;