From patchwork Fri Feb 8 12:43:32 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jani Nikula X-Patchwork-Id: 10803033 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 364ED13BF for ; Fri, 8 Feb 2019 12:42:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 279182DE28 for ; Fri, 8 Feb 2019 12:42:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1C2C52DE31; Fri, 8 Feb 2019 12:42:52 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id BFDDA2DE28 for ; Fri, 8 Feb 2019 12:42:51 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 282336EDC1; Fri, 8 Feb 2019 12:42:51 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id A725B6EDC1 for ; Fri, 8 Feb 2019 12:42:49 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 Feb 2019 04:42:49 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.58,347,1544515200"; d="scan'208";a="145226507" Received: from dbalaci-mobl.ger.corp.intel.com (HELO localhost) ([10.252.43.157]) by fmsmga001.fm.intel.com with ESMTP; 08 Feb 2019 04:42:47 -0800 From: Jani Nikula To: intel-gfx@lists.freedesktop.org Date: Fri, 8 Feb 2019 14:43:32 +0200 Message-Id: <20190208124332.886-3-jani.nikula@intel.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190208124332.886-1-jani.nikula@intel.com> References: <20190208124332.886-1-jani.nikula@intel.com> MIME-Version: 1.0 Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo Subject: [Intel-gfx] [PATCH 3/3] HACK: drm/i915/opregion: ICL should have opregion 2.1+ and relative rvda X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: jani.nikula@intel.com Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP Temporary CI workaround before proper opregion version bump propagates to the machines. Cc: Ville Syrjälä Cc: Imre Deak Signed-off-by: Jani Nikula --- 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;