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 9E080CCA471 for ; Tue, 30 Sep 2025 22:56:35 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 095B410E2E1; Tue, 30 Sep 2025 22:56:35 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="cpucRh30"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.12]) by gabe.freedesktop.org (Postfix) with ESMTPS id 73B8C10E2E1 for ; Tue, 30 Sep 2025 22:56:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1759272993; x=1790808993; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=tyxLl+ijl0BKlq/pr2uYEsVHvC8UsbQB4ucvCrZLkso=; b=cpucRh308ldGfluk1t3i/kpoD/X0CiwZP3TR/tnDsFpaxZDEfE0L+vCg RcWDtamdTHGUdxHb5x56+3109pKfxrAkRnoRa5FSWlaxiQryxFg9PerV0 XK1NXx8i380FRPhtrtROybmbOyYElrl7NaMyxkPa0DbJdtDVTIHAHRu2V pHrljc0H+MFjACYOE6YREFCzeCcE2n92MNxdRmZUQ8W8DfUbm7kpdUwhV +BVtfO0/2f4k3mXST3T/BffVIWP5liQBA8NlrJFQt8IiV3wh1MbHJd/eH b7pDlNpWbYRxIqhRMlMdvsPDCvlb2xwIxLSLTWd+oaicvHiZVFQCiB+Bo Q==; X-CSE-ConnectionGUID: um4ceHFDRNu41N8ydzM3qg== X-CSE-MsgGUID: EulaizlwRJGrBvHJUxdGlA== X-IronPort-AV: E=McAfee;i="6800,10657,11569"; a="65397757" X-IronPort-AV: E=Sophos;i="6.18,305,1751266800"; d="scan'208";a="65397757" Received: from fmviesa007.fm.intel.com ([10.60.135.147]) by fmvoesa106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Sep 2025 15:56:33 -0700 X-CSE-ConnectionGUID: ixSHgGZgSpOWKoV4+2sFHg== X-CSE-MsgGUID: ownCNP1bT9iuYK9NscCYhw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.18,305,1751266800"; d="scan'208";a="178229488" Received: from mdroper-desk1.fm.intel.com ([10.1.39.133]) by fmviesa007-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Sep 2025 15:56:32 -0700 From: Matt Roper To: intel-xe@lists.freedesktop.org Cc: matthew.d.roper@intel.com, Tejas Upadhyay Subject: [PATCH v3 19/23] drm/xe: Check that GT is not NULL before testing Wa_16023588340 Date: Tue, 30 Sep 2025 15:56:36 -0700 Message-ID: <20250930225618.140071-44-matthew.d.roper@intel.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250930225618.140071-25-matthew.d.roper@intel.com> References: <20250930225618.140071-25-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" If the primary GT is disabled, skip the check for this workaround (which only applies to dgpu platforms where the primary GT cannot be NULL). Signed-off-by: Matt Roper Reviewed-by: Tejas Upadhyay --- drivers/gpu/drm/xe/display/xe_display_wa.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/xe/display/xe_display_wa.c b/drivers/gpu/drm/xe/display/xe_display_wa.c index 8ada1cbcb16c..2aa1b8c03411 100644 --- a/drivers/gpu/drm/xe/display/xe_display_wa.c +++ b/drivers/gpu/drm/xe/display/xe_display_wa.c @@ -13,6 +13,7 @@ bool intel_display_needs_wa_16023588340(struct intel_display *display) { struct xe_device *xe = to_xe_device(display->drm); + struct xe_gt *wa_gt = xe_root_mmio_gt(xe); - return XE_GT_WA(xe_root_mmio_gt(xe), 16023588340); + return wa_gt && XE_GT_WA(wa_gt, 16023588340); } -- 2.51.0