Temporary CI workaround before proper opregion version bump propagates
to the machines.

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

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;
-- 
2.20.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Reply via email to