From mboxrd@z Thu Jan 1 00:00:00 1970 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 B694ECA1013 for ; Thu, 18 Sep 2025 21:13:31 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 782CC10E908; Thu, 18 Sep 2025 21:13:31 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="X96z3aQE"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.17]) by gabe.freedesktop.org (Postfix) with ESMTPS id B3C7410E908 for ; Thu, 18 Sep 2025 21:13:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1758230010; x=1789766010; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=EnrUjLUS3FzFbU4ml42kMUgpI67CMkxVOSAa5vQpNjg=; b=X96z3aQEuNyxKFEhOLRzElk0NVmgLSzGc9V8eKG68FrnpkwkNttmh32X Fa4b6gcn754mZA6h8yIGW+FRJ/PVYbTX+8A7/aggmtTHhNUQ96hAJ3rn9 ZsefoqH5OcL+Re0945xi3HpEwzPZKTZPIFJ5JsJzwuzFsm228QTnEdl9e Bb2kIG6jY7J1X6p/Bh1vezXnBCPbNdeSv8qKjTRKchrsm/KViQqS/+FtG 6sa6JT5XWHJlmqKNhq2LtwS2OL0vvMnW0yfmCJa2enKDsS/mlp70JscE/ 2adaMJSEB4yBWhn7y5s3MwHLtzyouN70XXlbb6oGWyhbX6YnV1FTHSVUt Q==; X-CSE-ConnectionGUID: ZkOwK6ydR4KDYizD2wVuNA== X-CSE-MsgGUID: DuzF0aWbRSCcy7/bwJT7xw== X-IronPort-AV: E=McAfee;i="6800,10657,11557"; a="60506102" X-IronPort-AV: E=Sophos;i="6.18,276,1751266800"; d="scan'208";a="60506102" Received: from orviesa001.jf.intel.com ([10.64.159.141]) by fmvoesa111.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Sep 2025 14:13:29 -0700 X-CSE-ConnectionGUID: +n3VsB11TPeziP2LfiE5xQ== X-CSE-MsgGUID: lV/THI9DR8C/IbDMndrcrA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.18,276,1751266800"; d="scan'208";a="212809521" Received: from mdroper-desk1.fm.intel.com ([10.1.39.133]) by smtpauth.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Sep 2025 14:13:30 -0700 From: Matt Roper To: intel-xe@lists.freedesktop.org Cc: matthew.d.roper@intel.com, Daniele Ceraolo Spurio Subject: [PATCH 1/2] drm/xe/huc: Adjust HuC check on primary GT Date: Thu, 18 Sep 2025 14:13:18 -0700 Message-ID: <20250918211319.603324-5-matthew.d.roper@intel.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250918211319.603324-4-matthew.d.roper@intel.com> References: <20250918211319.603324-4-matthew.d.roper@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: intel-xe@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel Xe graphics driver List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-xe-bounces@lists.freedesktop.org Sender: "Intel-xe" The HuC initialization code determines whether a platform can have a HuC on the primary GT by checking whether tile->media_gt is NULL; old Xe1 platforms that combined render+media into a single GT will always have a NULL media_gt pointer. However once we allow media to be disabled via configfs, there will also be cases where tile->media_gt is NULL on more modern platforms, causing this condition to behave incorrectly. To handle cases where media gets disabled via configfs (or theoretical cases where media is truly fused off in hardware), change the condition to consider the graphics version of the primary GT; only the old Xe1 platforms with graphics versions 12.55 or earlier should try to initialize a HuC on the primary GT. Cc: Daniele Ceraolo Spurio Signed-off-by: Matt Roper --- drivers/gpu/drm/xe/xe_huc.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/xe/xe_huc.c b/drivers/gpu/drm/xe/xe_huc.c index 7e43b2dd6a32..0a70c8924582 100644 --- a/drivers/gpu/drm/xe/xe_huc.c +++ b/drivers/gpu/drm/xe/xe_huc.c @@ -66,14 +66,18 @@ static int huc_alloc_gsc_pkt(struct xe_huc *huc) int xe_huc_init(struct xe_huc *huc) { struct xe_gt *gt = huc_to_gt(huc); - struct xe_tile *tile = gt_to_tile(gt); struct xe_device *xe = gt_to_xe(gt); int ret; huc->fw.type = XE_UC_FW_TYPE_HUC; - /* On platforms with a media GT the HuC is only available there */ - if (tile->media_gt && (gt != tile->media_gt)) { + /* + * The HuC is only available on the media GT on most platforms. The + * exception to that rule are the old Xe1 platforms where there was + * no separate GT for media IP, so the HuC was part of the primary + * GT. Such platforms have graphics versions 12.55 and earlier. + */ + if (!xe_gt_is_media_type(gt) && GRAPHICS_VERx100(xe) > 1255) { xe_uc_fw_change_status(&huc->fw, XE_UC_FIRMWARE_NOT_SUPPORTED); return 0; } -- 2.51.0