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

v2: Rebase

Cc: Ville Syrjälä <[email protected]>
Cc: Imre Deak <[email protected]>
Signed-off-by: Jani Nikula <[email protected]>
---
 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 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;
-- 
2.20.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Reply via email to