All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jani Nikula <jani.nikula@intel.com>
To: intel-gfx@lists.freedesktop.org
Cc: jani.nikula@intel.com
Subject: [PATCH 3/3] HACK: drm/i915/opregion: ICL should have opregion 2.1+ and relative rvda
Date: Fri,  8 Feb 2019 14:43:32 +0200	[thread overview]
Message-ID: <20190208124332.886-3-jani.nikula@intel.com> (raw)
In-Reply-To: <20190208124332.886-1-jani.nikula@intel.com>

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(-)

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

  parent reply	other threads:[~2019-02-08 12:42 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-02-08 12:43 [PATCH 1/3] drm/i915/opregion: fix version check Jani Nikula
2019-02-08 12:43 ` [PATCH 2/3] drm/i915/opregion: rvda is relative from opregion base in opregion 2.1+ Jani Nikula
2019-02-08 12:43 ` Jani Nikula [this message]
2019-02-08 14:08 ` ✗ Fi.CI.CHECKPATCH: warning for series starting with [1/3] drm/i915/opregion: fix version check Patchwork
2019-02-08 14:29 ` ✗ Fi.CI.BAT: failure " Patchwork
2019-02-08 15:09 ` [PATCH 1/3] " Jani Nikula
2019-02-08 15:11   ` Imre Deak
2019-02-08 15:57   ` Ville Syrjälä
2019-02-08 16:12     ` Ville Syrjälä
2019-02-08 18:02       ` Jani Nikula
2019-02-08 18:18         ` Jani Nikula
2019-02-08 16:23 ` Ville Syrjälä
2019-02-08 17:54   ` Jani Nikula

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190208124332.886-3-jani.nikula@intel.com \
    --to=jani.nikula@intel.com \
    --cc=intel-gfx@lists.freedesktop.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.