From patchwork Wed Apr 27 16:55:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Harrison X-Patchwork-Id: 12829216 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 9D720C433EF for ; Wed, 27 Apr 2022 16:55:56 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3C63C10F697; Wed, 27 Apr 2022 16:55:52 +0000 (UTC) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTPS id 666A910F697; Wed, 27 Apr 2022 16:55:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1651078551; x=1682614551; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=DmljEI6E94UXA/VYOIrFha99X/lxbRzNReQc/Kow9MA=; b=TAI1u7+bPwnXyD8JnCgLdY2NzVByF+IoWgJkJr5ozuUKnd2GKLZDixWM fXmrodl6arDgPTfItvVsiWlr9VAOXVYpIVWQQ2Y0bRKknj2DN5G7RKkVS 5qpppdb1lj+ofxbH1oIDr3eZ+DYd1zChm36pBL3i9M/Z4H5Dxx4YCa8oZ bRsRYfwD5Drcg26fbN5hJzFkog+x5d8Z7faZvGOhWSTMTr37f9twhzcUI WjSPRJS2dGVheJFprKQI0BhZvdrpwW+88QN6Co5btulzL7Nrfyj/huB1G vEOx96xz7CapVHH1GapZV3B6twfomS0E+TbIrWhmD5CQlzOtydxuBcFyN g==; X-IronPort-AV: E=McAfee;i="6400,9594,10330"; a="265812198" X-IronPort-AV: E=Sophos;i="5.90,293,1643702400"; d="scan'208";a="265812198" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Apr 2022 09:55:50 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.90,293,1643702400"; d="scan'208";a="540186180" Received: from relo-linux-5.jf.intel.com ([10.165.21.134]) by orsmga002.jf.intel.com with ESMTP; 27 Apr 2022 09:55:50 -0700 From: John.C.Harrison@Intel.com To: Intel-GFX@Lists.FreeDesktop.Org Subject: [PATCH 1/2] Revert "drm/i915/dg2: Define GuC firmware version for DG2" Date: Wed, 27 Apr 2022 09:55:49 -0700 Message-Id: <20220427165550.3636686-2-John.C.Harrison@Intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220427165550.3636686-1-John.C.Harrison@Intel.com> References: <20220427165550.3636686-1-John.C.Harrison@Intel.com> MIME-Version: 1.0 Organization: Intel Corporation (UK) Ltd. - Co. Reg. #1134945 - Pipers Way, Swindon SN3 1RJ X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: John Harrison , DRI-Devel@Lists.FreeDesktop.Org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: John Harrison This reverts commit 55c7f980e48e56861496526e02ed5bbfdac49ede. The CI topic branch within drm-top contains an old patch for supporting GuC on DG2. That needs to be dropped and an updated patch merged to drm-gt-next. Hence this patch reverts it so the new patch can be sent in it's correct form for CI testing. Signed-off-by: John Harrison --- drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c index cb5dd16421d0..a876d39e6bcf 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c @@ -53,7 +53,6 @@ void intel_uc_fw_change_status(struct intel_uc_fw *uc_fw, * firmware as TGL. */ #define INTEL_GUC_FIRMWARE_DEFS(fw_def, guc_def) \ - fw_def(DG2, 0, guc_def(dg2, 70, 1, 1)) \ fw_def(ALDERLAKE_P, 0, guc_def(adlp, 70, 1, 1)) \ fw_def(ALDERLAKE_S, 0, guc_def(tgl, 70, 1, 1)) \ fw_def(DG1, 0, guc_def(dg1, 70, 1, 1)) \ From patchwork Wed Apr 27 16:55:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Harrison X-Patchwork-Id: 12829217 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 90F4BC433FE for ; Wed, 27 Apr 2022 16:56:02 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B325610F6A7; Wed, 27 Apr 2022 16:55:53 +0000 (UTC) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9AFEC10F231; Wed, 27 Apr 2022 16:55:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1651078551; x=1682614551; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=r90TKfO1OHSggETbIDsuFi/QeiBT5xlqhshgbfieOAE=; b=ExhIX3ynRnOIkB6BPGKti+08UaxAk46/QGQpQu1SFlqBaOSvxgv9uqVH Wsw69e7weazpH+pXTHWS8YqlfpPI/JSraVBx0mVZx3xUsFCL1+rFAd8Ro 1Zl8QWfxY5JVUEcJq7KuCEipo75TReE8FhOgPzWITuN3TDonC0gi7vNjw zR6/EbvqgzXXkxg/oqZJ0Bx8/QYhv5fGf9XX0zra4tFK2taZEkv5P3eHE p2Kwk5ngZ8lGupqtNTwXw9vb09/ZdejGBkgf7Tge4wWn1FP5I6Ld2H5QJ 1VJk1hkN8sO8FbBCAt1RiAO1m7a5LB7Wm/4zh84zELTQ7hyRbW5iChVPE A==; X-IronPort-AV: E=McAfee;i="6400,9594,10330"; a="265812199" X-IronPort-AV: E=Sophos;i="5.90,293,1643702400"; d="scan'208";a="265812199" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Apr 2022 09:55:50 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.90,293,1643702400"; d="scan'208";a="540186185" Received: from relo-linux-5.jf.intel.com ([10.165.21.134]) by orsmga002.jf.intel.com with ESMTP; 27 Apr 2022 09:55:50 -0700 From: John.C.Harrison@Intel.com To: Intel-GFX@Lists.FreeDesktop.Org Subject: [PATCH 2/2] drm/i915/dg2: Define GuC firmware version for DG2 Date: Wed, 27 Apr 2022 09:55:50 -0700 Message-Id: <20220427165550.3636686-3-John.C.Harrison@Intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220427165550.3636686-1-John.C.Harrison@Intel.com> References: <20220427165550.3636686-1-John.C.Harrison@Intel.com> MIME-Version: 1.0 Organization: Intel Corporation (UK) Ltd. - Co. Reg. #1134945 - Pipers Way, Swindon SN3 1RJ X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Tomasz Mistat , Daniele Ceraolo Spurio , John Harrison , DRI-Devel@Lists.FreeDesktop.Org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: John Harrison First release of GuC for DG2. Signed-off-by: John Harrison CC: Tomasz Mistat CC: Ramalingam C CC: Daniele Ceraolo Spurio Reviewed-by: Daniele Ceraolo Spurio --- drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c index a876d39e6bcf..d078f884b5e3 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c @@ -53,6 +53,7 @@ void intel_uc_fw_change_status(struct intel_uc_fw *uc_fw, * firmware as TGL. */ #define INTEL_GUC_FIRMWARE_DEFS(fw_def, guc_def) \ + fw_def(DG2, 0, guc_def(dg2, 70, 1, 2)) \ fw_def(ALDERLAKE_P, 0, guc_def(adlp, 70, 1, 1)) \ fw_def(ALDERLAKE_S, 0, guc_def(tgl, 70, 1, 1)) \ fw_def(DG1, 0, guc_def(dg1, 70, 1, 1)) \