From patchwork Tue Aug 16 14:20:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip Cox X-Patchwork-Id: 1666883 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=uQ6A0fJJ; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4M6YHk1M4Bz1ygQ for ; Wed, 17 Aug 2022 00:21:52 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1oNxRs-0000lC-Dj; Tue, 16 Aug 2022 14:21:40 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1oNxRr-0000kn-AQ for kernel-team@lists.ubuntu.com; Tue, 16 Aug 2022 14:21:39 +0000 Received: from mail-qt1-f200.google.com (mail-qt1-f200.google.com [209.85.160.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id B232C3F1A1 for ; Tue, 16 Aug 2022 14:21:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1660659698; bh=k8nZqyJQPFkukF4JIvB/DCXFxhS+V7a489pE+F5sz+E=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=uQ6A0fJJ3QqFD4lAuO1lBCwmBu7uNuYMBimFPbpEXfF1zGA31OxV5kSY/GkV5UYsZ yhnLZimkDfGa4OWZAY8ml5XPxiomjORl63FD7FXLGc2r6gp+l1z5hNmGQyJWQboQQr vO9jEYhsjcLIbbnoTWIau1TcQZsIp4HJBb2PmgWIE0kn5LAwMMiYDJ8Eo7vv7qZ4ka 1+XjM4SuJFGQfI+mBCgNUZQUie+eBbD3dBf87Vve7oOdL8bSxCtg6ZMI63io+jcXCS 6L3en4+HHTeoG3h6qjh0YRzf4ayImk+sSS7K9LAN2LQ1UXf+X2YOuVAFrpyesywWEg sdqTuWTI9DQlg== Received: by mail-qt1-f200.google.com with SMTP id z6-20020ac875c6000000b0034454b14c91so6266514qtq.15 for ; Tue, 16 Aug 2022 07:21:38 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=k8nZqyJQPFkukF4JIvB/DCXFxhS+V7a489pE+F5sz+E=; b=okqok4IrfsrHHPxUO+7O3PtYaBlUq+TcusENEK5KbCk+rWrcTdz9pmaxnJrVizXDJ8 JLYWHJYjpfUiQPxZH1wjTrKOCjLvLLE92QTovgoFSkU9kCusa/GPJ0s2UykpUM+9+8lB g6HThVJycC0gT7VjxIgpphxgAGc/QUGjaTBvJg8/VFZ7PIw+h/MZYx7lF8ai7STKortB O4bubbv2zkAJ9Mrsr/VWLSL6QTgdykkiazRWj39QBs0BNG7aD9WT1PdEr8Tl/gT0pXWq Y0MPSyAwsyH+HCyQyknv3vRoL94tNKTk+cuDOei9aFN7U3YfQ+nGWKf/nN0HialNJb64 Nu6w== X-Gm-Message-State: ACgBeo0DNshRIawhmoE8x/3aWdRTpYexsVaLJzM5bJ+xPDBDv63W+llX C0Y/jEVrTISfbdIpMjt4vYNYt/BYr8XYZ3Ev2pwhV7k41iAr+ahnkUHkCCg8QVyN6LKTT/rR0MZ EXG19m2QUJbEbIvu0LvDyDNplfxa1oUgN4vrfF1hZgg== X-Received: by 2002:ac8:5e4c:0:b0:343:423:e736 with SMTP id i12-20020ac85e4c000000b003430423e736mr18724871qtx.490.1660659697402; Tue, 16 Aug 2022 07:21:37 -0700 (PDT) X-Google-Smtp-Source: AA6agR5gXp56WgLYisjpMpJYBKB4TO8AINgyMIb4J6jGngB7EvxhQqV1YUT2yEUvfr2oKyl4IBHUBQ== X-Received: by 2002:ac8:5e4c:0:b0:343:423:e736 with SMTP id i12-20020ac85e4c000000b003430423e736mr18724851qtx.490.1660659697136; Tue, 16 Aug 2022 07:21:37 -0700 (PDT) Received: from localhost.localdomain ([104.247.231.135]) by smtp.gmail.com with ESMTPSA id c75-20020a379a4e000000b006bae6f73e41sm9782754qke.5.2022.08.16.07.21.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Aug 2022 07:21:36 -0700 (PDT) From: Philip Cox To: kernel-team@lists.ubuntu.com Subject: [PATCH v3 2/2] UBUNTU: SAUCE: (no-up) drm/i915: set enable_guc=2 for EHL, ICL, ADL-S platforms. Date: Tue, 16 Aug 2022 10:20:56 -0400 Message-Id: <20220816142056.1222020-3-philip.cox@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220816142056.1222020-1-philip.cox@canonical.com> References: <20220816142056.1222020-1-philip.cox@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/1981971 The Elkhart Lake, Ice Lake, and Alder Lake S platforms need i915.enable_guc=2/ENABLE_GUC_LOAD_HUC to be set for them to work with the current version of the i915 driver we have in the linux-intel-iotg kernel. v2: Removed magic number. v3: changes to the cover letter and patch set's commit messages Signed-off-by: Philip Cox --- drivers/gpu/drm/i915/gt/uc/intel_uc.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc.c b/drivers/gpu/drm/i915/gt/uc/intel_uc.c index 86c318516e14..0c46a7c4d30f 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_uc.c +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc.c @@ -22,7 +22,18 @@ static void uc_expand_default_options(struct intel_uc *uc) if (i915->params.enable_guc != -1) return; - /* Don't enable GuC/HuC on pre-Gen12 */ + /* The parameter i915.enable_guc=2 is needed for EHL, ICL and ADL-S + to enable HuC authentication but not explicitly required for ADL-P + since HuC is default enabled. This check needs to be before the other + conditions are checked because the gen11 gfx platforms would return + out of the function and not get set. + */ + if (IS_JSL_EHL(i915) || IS_ICELAKE(i915) || IS_ALDERLAKE_S(i915)) { + i915->params.enable_guc = ENABLE_GUC_LOAD_HUC; + return; + } + + /* Don't enable GuC/HuC on non-ICL and non-EHL pre-Gen12 platforms */ if (GRAPHICS_VER(i915) < 12) { i915->params.enable_guc = 0; return; @@ -35,7 +46,7 @@ static void uc_expand_default_options(struct intel_uc *uc) } /* Intermediate platforms are HuC authentication only */ - if (IS_DG1(i915) || IS_ALDERLAKE_S(i915)) { + if (IS_DG1(i915)) { i915->params.enable_guc = ENABLE_GUC_LOAD_HUC; return; }