From patchwork Mon Apr 15 23:17:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniele Ceraolo Spurio X-Patchwork-Id: 13630788 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 DB952C4345F for ; Mon, 15 Apr 2024 23:18:39 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6C0C81128A8; Mon, 15 Apr 2024 23:18:39 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="CsjixjO/"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.9]) by gabe.freedesktop.org (Postfix) with ESMTPS id 91EA01128A9 for ; Mon, 15 Apr 2024 23:18:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1713223119; x=1744759119; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=vouhi6wA/nNRkrJT5hCSylgpjmc0xrpkgMcLT9uBelk=; b=CsjixjO/IVE04thgiJPlCqSPZ48c9XP2rvXKVE2wR7Uncqqr+ymIQJAf XPkJT0mFVpIaV7XxlOV9GNSIuUjZmsu8J2RSEqqQLDZv9XOEyKYpYc2eF 7MPGeuN5XnRdD8Oym0u24F2dBZ0XnZlb5PSQidrNotAopcHOcDtbuChJA WAtmchAX+cwz/6WsyXn3dZ374RQnHiXGP8iocUvwzUq9fWxr3xQO3jMHw c/KEY68WDjXu5H0aFHvcY2CJpbaS5AOVcYUAHZMZhPvEpNMUDMazWZ+03 7NXv/JdTqZ73/4ZFxAYAKDM3ysMBodPl1oGf8BaJgKazUYC/fey1cPGzO g==; X-CSE-ConnectionGUID: 4/btpwKLRLaxzcKwCfaDzA== X-CSE-MsgGUID: LQqERwf6S4ucQJgatYyARA== X-IronPort-AV: E=McAfee;i="6600,9927,11045"; a="31115482" X-IronPort-AV: E=Sophos;i="6.07,204,1708416000"; d="scan'208";a="31115482" Received: from orviesa010.jf.intel.com ([10.64.159.150]) by orvoesa101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Apr 2024 16:18:08 -0700 X-CSE-ConnectionGUID: pRVVfZQOSaWFNXYBOvteYA== X-CSE-MsgGUID: uSfUvl9kRIaLNLfMC0udKw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,204,1708416000"; d="scan'208";a="21963794" Received: from valcore-skull-1.fm.intel.com ([10.1.39.17]) by orviesa010-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Apr 2024 16:18:07 -0700 From: Daniele Ceraolo Spurio To: intel-gfx@lists.freedesktop.org Cc: Daniele Ceraolo Spurio Subject: [PATCH 1/3] drm/xe/gsc: define GSCCS for LNL Date: Mon, 15 Apr 2024 16:17:44 -0700 Message-ID: <20240415231746.1230684-2-daniele.ceraolospurio@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240415231746.1230684-1-daniele.ceraolospurio@intel.com> References: <20240415231746.1230684-1-daniele.ceraolospurio@intel.com> MIME-Version: 1.0 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: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" LNL has 1 GSCCS, same as MTL. Note that the GSCCS will be disabled until we have a GSC FW defined, but having it in the list of engine is a requirement to add such definition. Signed-off-by: Daniele Ceraolo Spurio --- drivers/gpu/drm/xe/xe_pci.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/xe/xe_pci.c b/drivers/gpu/drm/xe/xe_pci.c index c47ab4b67467..45ed1be584c5 100644 --- a/drivers/gpu/drm/xe/xe_pci.c +++ b/drivers/gpu/drm/xe/xe_pci.c @@ -209,7 +209,8 @@ static const struct xe_media_desc media_xelpmp = { static const struct xe_media_desc media_xe2 = { .name = "Xe2_LPM", .hw_engine_mask = - BIT(XE_HW_ENGINE_VCS0) | BIT(XE_HW_ENGINE_VECS0), /* TODO: GSC0 */ + BIT(XE_HW_ENGINE_VCS0) | BIT(XE_HW_ENGINE_VECS0) | + BIT(XE_HW_ENGINE_GSCCS0) }; static const struct xe_device_desc tgl_desc = { From patchwork Mon Apr 15 23:17:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniele Ceraolo Spurio X-Patchwork-Id: 13630790 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 251E0C04FF8 for ; Mon, 15 Apr 2024 23:18:44 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 74C531128AA; Mon, 15 Apr 2024 23:18:43 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="YcIMODzu"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.9]) by gabe.freedesktop.org (Postfix) with ESMTPS id A740A1128AA for ; Mon, 15 Apr 2024 23:18:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1713223119; x=1744759119; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=UXCZaMnG4A+/6nJ7yL0n/H54LthULPInAMAd68LplC8=; b=YcIMODzusYym5g0HJUXXcnHisjuk2xKJAk3ZpZLLxSVGzQgeyt/fm/II FF7NacHy8faBHLYz11I1DpLPfBsdH9oUlxcbFp3mr+kNe6hJRqoVJu/Ha ror1F/XtH4vZJN6ihyaOe8+Tdg6JoMZYv+tGkdGgcZ9t6XrMWB36BQmIp +33r7kE7PrEKg80yGFrzRQmDSzwGPK09y4TigSI8vYg2Wd0usxBOt3VgO svmLXfxa5DSjHDyPkt9gV8BH9u7J1hKrSa3+vJYfsmQ3nAmK2648x/oTt yIMK62nZUPi7ODBFcgGoZOHz0fIgjz4xmAEiEI2T6q678AbYr5ZO5PC28 w==; X-CSE-ConnectionGUID: TaVRV+NVQJefRSLga+/WdA== X-CSE-MsgGUID: SEmufG9pQ4eMs0QNIzkc7w== X-IronPort-AV: E=McAfee;i="6600,9927,11045"; a="31115485" X-IronPort-AV: E=Sophos;i="6.07,204,1708416000"; d="scan'208";a="31115485" Received: from orviesa010.jf.intel.com ([10.64.159.150]) by orvoesa101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Apr 2024 16:18:11 -0700 X-CSE-ConnectionGUID: 4nuglu5cRaibaZI/BE42Pg== X-CSE-MsgGUID: Zj319yfBTHy6MdzZUlc4ew== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,204,1708416000"; d="scan'208";a="21963807" Received: from valcore-skull-1.fm.intel.com ([10.1.39.17]) by orviesa010-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Apr 2024 16:18:10 -0700 From: Daniele Ceraolo Spurio To: intel-gfx@lists.freedesktop.org Cc: Daniele Ceraolo Spurio Subject: [xe-for-ci 2/3] drm/xe/gsc: Skip GSC proxy init Date: Mon, 15 Apr 2024 16:17:45 -0700 Message-ID: <20240415231746.1230684-3-daniele.ceraolospurio@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240415231746.1230684-1-daniele.ceraolospurio@intel.com> References: <20240415231746.1230684-1-daniele.ceraolospurio@intel.com> MIME-Version: 1.0 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: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" The mei support for LNL hasn't landed yet, so we can't use the GSC proxy component. Note that the lack of the GSC proxy means that the content protection features (PXP, HDCP) won't work. Signed-off-by: Daniele Ceraolo Spurio --- drivers/gpu/drm/xe/xe_gsc_proxy.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/drivers/gpu/drm/xe/xe_gsc_proxy.c b/drivers/gpu/drm/xe/xe_gsc_proxy.c index 35e397b68dfc..3a7ba63b5bf2 100644 --- a/drivers/gpu/drm/xe/xe_gsc_proxy.c +++ b/drivers/gpu/drm/xe/xe_gsc_proxy.c @@ -446,6 +446,15 @@ int xe_gsc_proxy_init(struct xe_gsc *gsc) mutex_init(&gsc->proxy.mutex); + /* + * FIXME: mei support for LNL hasn't been merged yet so we can't use the + * GSC proxy component yet. + */ + if (xe->info.platform == XE_LUNARLAKE) { + xe_gt_info(gt, "skipping GSC proxy init due to missing LNL mei support\n"); + return -ENODEV; + } + if (!IS_ENABLED(CONFIG_INTEL_MEI_GSC_PROXY)) { xe_gt_info(gt, "can't init GSC proxy due to missing mei component\n"); return -ENODEV; From patchwork Mon Apr 15 23:17:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniele Ceraolo Spurio X-Patchwork-Id: 13630789 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 398A8C4345F for ; Mon, 15 Apr 2024 23:18:42 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 939041128A9; Mon, 15 Apr 2024 23:18:41 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="arbAikvj"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.9]) by gabe.freedesktop.org (Postfix) with ESMTPS id B6DD91128AB for ; Mon, 15 Apr 2024 23:18:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1713223119; x=1744759119; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=05VybkSaM0Lx3uX/KGyydTM8GThaKe0SQW4qYAMGItc=; b=arbAikvjgSRLQvUbMIjL1Gtc+t1V7FHRYZs2eNVQe3ifCJQ5qNxzeoKr 5Ya+mumfLiho5M55jo+hoc/DQPleODFvuzVQnL1V6U4n4yMgTOasQTPpo 6S9b8nXJ4XlIwQSDF9cRD0djhhdO1NPi0ee3D1owsAezUW9AZCKbaXEEx xDSQGvflSNuNy3vBbzHuPW85lcn5kuHpV9w/M/8uoqRiyHNvkMGfcZ5d1 mGbTVfLIxM+NufmzYZ299PAtKIjlF5nlotpBIupITURvhogLgo8pBfNbl uKuNCDZAhlHQKR4lJeFwRDb3yLTehW1PzOsAS5gNtuGHf60GcF/3qr8Ar w==; X-CSE-ConnectionGUID: 3ouXXLm7QuK+qTPg2IRgJQ== X-CSE-MsgGUID: SD3dlIWXS4KO34b/9edLGw== X-IronPort-AV: E=McAfee;i="6600,9927,11045"; a="31115486" X-IronPort-AV: E=Sophos;i="6.07,204,1708416000"; d="scan'208";a="31115486" Received: from orviesa010.jf.intel.com ([10.64.159.150]) by orvoesa101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Apr 2024 16:18:11 -0700 X-CSE-ConnectionGUID: zWIifIrYRGm1rbdv55jPFg== X-CSE-MsgGUID: uCubUhveT4WnkCOTHWVEFw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,204,1708416000"; d="scan'208";a="21963811" Received: from valcore-skull-1.fm.intel.com ([10.1.39.17]) by orviesa010-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Apr 2024 16:18:10 -0700 From: Daniele Ceraolo Spurio To: intel-gfx@lists.freedesktop.org Cc: Daniele Ceraolo Spurio Subject: [xe-for-ci 3/3] drm/xe/gsc: define GSC FW for LNL Date: Mon, 15 Apr 2024 16:17:46 -0700 Message-ID: <20240415231746.1230684-4-daniele.ceraolospurio@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240415231746.1230684-1-daniele.ceraolospurio@intel.com> References: <20240415231746.1230684-1-daniele.ceraolospurio@intel.com> MIME-Version: 1.0 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: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Interface and compatibility versions are the same as MTL. Note that the FW is still in development and the current release is for CI only. Theefore, we'll need to keep this patch in the xe-for-ci branch until we get the finalized FW release. Signed-off-by: Daniele Ceraolo Spurio --- drivers/gpu/drm/xe/xe_uc_fw.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/xe/xe_uc_fw.c b/drivers/gpu/drm/xe/xe_uc_fw.c index f27e96c47baa..ae38172b6e0e 100644 --- a/drivers/gpu/drm/xe/xe_uc_fw.c +++ b/drivers/gpu/drm/xe/xe_uc_fw.c @@ -126,6 +126,7 @@ struct fw_blobs_by_type { /* for the GSC FW we match the compatibility version and not the release one */ #define XE_GSC_FIRMWARE_DEFS(fw_def, major_ver) \ + fw_def(LUNARLAKE, major_ver(intel-ci/xe, gsc, lnl, 1, 0, 0)) \ fw_def(METEORLAKE, major_ver(i915, gsc, mtl, 1, 0, 0)) #define MAKE_FW_PATH(dir__, uc__, shortname__, version__) \