From patchwork Mon Apr 22 16:27:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andi Shyti X-Patchwork-Id: 13638670 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 47400C07C79 for ; Mon, 22 Apr 2024 16:28:37 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 73D92112C55; Mon, 22 Apr 2024 16:28:36 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="GBA25N0F"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.9]) by gabe.freedesktop.org (Postfix) with ESMTPS id 399791128E0; Mon, 22 Apr 2024 16:28:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1713803315; x=1745339315; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=iI9+fsDttnwDV+Cgw9szBZo3sU8D2AaT2Y2f9mjuGJA=; b=GBA25N0FVW3fpyqPyfsEfPVlY+KesFhsi2wneKnvVoiRE5hdDmVK7SoU kChDqMUKLs5+fWGYTQD2W2XX69U9B4YNonS9orYqbfYDPI7P4NNcm/WMB j1jTRWVoqvcKK3GvV9tiDO+Ed/vTpoSE1SnfBxLXMze4nn7L7qN5ml71Z n07jJOat1ezzB/K5l+QNlBtZwt61Yphz0MqIqDjIdVm8UoAe05cXvObHJ mHLj9NgX22Hvd67E5bymLCs5iSdipUq1FxkxiaKxq4eWTlQvjn7xBfP4V /p/S1bDTrWph97hKMaDyAas7UTH5i6vwjtriEaPhviZyVDtdpiwDtMQDn Q==; X-CSE-ConnectionGUID: SxGsqgP+RX26ufxGNESzEg== X-CSE-MsgGUID: 5gPs7n6rST+8QIeX+Y6VyA== X-IronPort-AV: E=McAfee;i="6600,9927,11052"; a="20046798" X-IronPort-AV: E=Sophos;i="6.07,221,1708416000"; d="scan'208";a="20046798" Received: from fmviesa008.fm.intel.com ([10.60.135.148]) by fmvoesa103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Apr 2024 09:28:34 -0700 X-CSE-ConnectionGUID: yJ3AgElWTeqwxetbOCD1SQ== X-CSE-MsgGUID: 1sKmmOrQRHuUkEQSQm0XaA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,221,1708416000"; d="scan'208";a="24142613" Received: from unknown (HELO intel.com) ([10.247.119.74]) by fmviesa008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Apr 2024 09:28:19 -0700 From: Andi Shyti To: intel-gfx , dri-devel Cc: Joonas Lahtinen , Andi Shyti Subject: [CI 1/2] Revert "drm/i915/gt: Do not generate the command streamer for all the CCS" Date: Mon, 22 Apr 2024 18:27:30 +0200 Message-ID: <20240422162731.7046-2-andi.shyti@linux.intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240422162731.7046-1-andi.shyti@linux.intel.com> References: <20240422162731.7046-1-andi.shyti@linux.intel.com> MIME-Version: 1.0 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: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" This reverts commit ea315f98e5d6d3191b74beb0c3e5fc16081d517c. --- drivers/gpu/drm/i915/gt/intel_engine_cs.c | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/drivers/gpu/drm/i915/gt/intel_engine_cs.c b/drivers/gpu/drm/i915/gt/intel_engine_cs.c index 8c44af1c3451..476651bd0a21 100644 --- a/drivers/gpu/drm/i915/gt/intel_engine_cs.c +++ b/drivers/gpu/drm/i915/gt/intel_engine_cs.c @@ -874,23 +874,6 @@ static intel_engine_mask_t init_engine_mask(struct intel_gt *gt) info->engine_mask &= ~BIT(GSC0); } - /* - * Do not create the command streamer for CCS slices beyond the first. - * All the workload submitted to the first engine will be shared among - * all the slices. - * - * Once the user will be allowed to customize the CCS mode, then this - * check needs to be removed. - */ - if (IS_DG2(gt->i915)) { - u8 first_ccs = __ffs(CCS_MASK(gt)); - - /* Mask off all the CCS engine */ - info->engine_mask &= ~GENMASK(CCS3, CCS0); - /* Put back in the first CCS engine */ - info->engine_mask |= BIT(_CCS(first_ccs)); - } - return info->engine_mask; } From patchwork Mon Apr 22 16:27:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andi Shyti X-Patchwork-Id: 13638671 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 6FDC5C4345F for ; Mon, 22 Apr 2024 16:28:59 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C0840112C59; Mon, 22 Apr 2024 16:28:58 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="SYNwGcOX"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.11]) by gabe.freedesktop.org (Postfix) with ESMTPS id 376B0112C59; Mon, 22 Apr 2024 16:28:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1713803338; x=1745339338; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=wZ/2/oyjSTOKxjDP7J7CQRzKasV07S7HKUDBvq/K1Lg=; b=SYNwGcOX2V4MovTTIhOhr7UCJuGhwyVczgw/cAhHCxbscPLSA03yZT6j CaTG8PBNJ3YWmhVgOuBQlNZhqMCXow5/fNDVCEbhBgSJD1cbRCYC1clyc Je52pmHdtmfKwjY97TRJ+OJ7uOfWWYxPlPKYMRgmAh6eq9r87IBXwkB+K NV0aBPvB906esc695cia21TeUH72Npq/4ORjqJM1C6cP9XCUajHVQ1c5A VtBxd9bmLliSwx6lfxYPzmR4av8JmML/zYOs4wcaDjoEG0x/+jMrTCf7W lGV9YFHeG7t3dDHMmIzcgDBuHqzvgsaGpE5O6XVOjnYH8PPdnsD0y4Xuo A==; X-CSE-ConnectionGUID: gl53+043SvWNdxrE0RHDqA== X-CSE-MsgGUID: QC27d9efS3u4IiHJNthBKA== X-IronPort-AV: E=McAfee;i="6600,9927,11052"; a="19959107" X-IronPort-AV: E=Sophos;i="6.07,221,1708416000"; d="scan'208";a="19959107" Received: from fmviesa004.fm.intel.com ([10.60.135.144]) by fmvoesa105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Apr 2024 09:28:58 -0700 X-CSE-ConnectionGUID: Ea6s723yQ1yVzOTv4kGAOA== X-CSE-MsgGUID: +LH2wVSoQYiLiSGPb8WfcQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,221,1708416000"; d="scan'208";a="28727253" Received: from unknown (HELO intel.com) ([10.247.119.74]) by fmviesa004-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Apr 2024 09:28:50 -0700 From: Andi Shyti To: intel-gfx , dri-devel Cc: Joonas Lahtinen , Andi Shyti Subject: [CI 2/2] drm/i915/gt: Force ccs_mode 4 Date: Mon, 22 Apr 2024 18:27:31 +0200 Message-ID: <20240422162731.7046-3-andi.shyti@linux.intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240422162731.7046-1-andi.shyti@linux.intel.com> References: <20240422162731.7046-1-andi.shyti@linux.intel.com> MIME-Version: 1.0 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: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Signed-off-by: Andi Shyti --- drivers/gpu/drm/i915/gt/intel_gt_ccs_mode.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/i915/gt/intel_gt_ccs_mode.c b/drivers/gpu/drm/i915/gt/intel_gt_ccs_mode.c index 044219c5960a..d0f181a8e73e 100644 --- a/drivers/gpu/drm/i915/gt/intel_gt_ccs_mode.c +++ b/drivers/gpu/drm/i915/gt/intel_gt_ccs_mode.c @@ -10,29 +10,33 @@ void intel_gt_apply_ccs_mode(struct intel_gt *gt) { + unsigned long ccs_mask = CCS_MASK(gt); int cslice; u32 mode = 0; - int first_ccs = __ffs(CCS_MASK(gt)); + int first_ccs = __ffs(ccs_mask); if (!IS_DG2(gt->i915)) return; /* Build the value for the fixed CCS load balancing */ for (cslice = 0; cslice < I915_MAX_CCS; cslice++) { - if (CCS_MASK(gt) & BIT(cslice)) + if (CCS_MASK(gt) & BIT(cslice)) { /* * If available, assign the cslice * to the first available engine... */ mode |= XEHP_CCS_MODE_CSLICE(cslice, first_ccs); - - else + first_ccs = find_next_bit(&ccs_mask, + I915_MAX_CCS, + first_ccs + 1); + } else { /* * ... otherwise, mark the cslice as * unavailable if no CCS dispatches here */ mode |= XEHP_CCS_MODE_CSLICE(cslice, XEHP_CCS_MODE_CSLICE_MASK); + } } intel_uncore_write(gt->uncore, XEHP_CCS_MODE, mode);