From patchwork Wed May 11 06:02:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matt Roper X-Patchwork-Id: 12845818 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 0DE06C433FE for ; Wed, 11 May 2022 06:02:54 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id CDF1C10EA03; Wed, 11 May 2022 06:02:40 +0000 (UTC) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1B20C10E450; Wed, 11 May 2022 06:02:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1652248959; x=1683784959; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=tuJUJGDYENAMjN2cIdCYuXVg26Q9snwiWfd88zMmZCA=; b=lfx1Sed4+F+G8k4KUhBDLJFTbW3eZpQtimUphIZeu4d0l3z1xqjdrWrT bIH2AHZSRwKL+c6qzu2RIUyhfCk9NyFPq8KjCNjOW4myluaEBXH2UYqVF QS5DDKhY/Fz4nB4XwDQsShLbWIZnPCN7G5DXuyuurzI4WUcZqIgututqr CnJ2S98EJoTY73vwnp+RcWHeUA9oCNg1FyfHPhPEB6hvDHP6zFN9kml43 zw4ozCba+C0tCAgVaYNUh9VzXIVhHi9Hno/gSEngLt/TJROxpjYMoBJda bzJe6YEDj+yKw/BbUf3nHelu9KLXywUjnvgf+XWCZmmUHodfIqMzvnX/V Q==; X-IronPort-AV: E=McAfee;i="6400,9594,10343"; a="332633561" X-IronPort-AV: E=Sophos;i="5.91,216,1647327600"; d="scan'208";a="332633561" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 May 2022 23:02:38 -0700 X-IronPort-AV: E=Sophos;i="5.91,216,1647327600"; d="scan'208";a="520375223" Received: from mdroper-desk1.fm.intel.com ([10.1.27.134]) by orsmga003-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 May 2022 23:02:38 -0700 From: Matt Roper To: intel-gfx@lists.freedesktop.org Date: Tue, 10 May 2022 23:02:28 -0700 Message-Id: <20220511060228.1179450-6-matthew.d.roper@intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220511060228.1179450-1-matthew.d.roper@intel.com> References: <20220511060228.1179450-1-matthew.d.roper@intel.com> MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH v3 5/5] drm/i915/guc: XEHPSDV and PVC do not use HuC X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: dri-devel@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" From: Daniele Ceraolo Spurio Disable HuC loading since it is not used on these platforms. Cc: Stuart Summers Signed-off-by: Daniele Ceraolo Spurio Signed-off-by: Matt Roper Reviewed-by: Matt Atwood --- drivers/gpu/drm/i915/gt/uc/intel_uc.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc.c b/drivers/gpu/drm/i915/gt/uc/intel_uc.c index ecf149c5fdb0..55e1eb8f3612 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_uc.c +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc.c @@ -45,6 +45,10 @@ static void uc_expand_default_options(struct intel_uc *uc) /* Default: enable HuC authentication and GuC submission */ i915->params.enable_guc = ENABLE_GUC_LOAD_HUC | ENABLE_GUC_SUBMISSION; + + /* XEHPSDV and PVC do not use HuC */ + if (IS_XEHPSDV(i915) || IS_PONTEVECCHIO(i915)) + i915->params.enable_guc &= ~ENABLE_GUC_LOAD_HUC; } /* Reset GuC providing us with fresh state for both GuC and HuC.