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 5A5F8C77B7F for ; Wed, 3 May 2023 16:30:35 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id F1CCA10E0CE; Wed, 3 May 2023 16:30:34 +0000 (UTC) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTPS id DEB1910E0CE for ; Wed, 3 May 2023 16:30:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1683131432; x=1714667432; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=pR4E5BTLwHbK2qBCEaSxh3x7BRqZTKpsPmWMhPPFWtg=; b=IhXjDBDbDweOH8IAuPT+z1eHBg5lx7ZT+KgOaX4R8N+/LaJaH8JHQFlj x1WsQkILlHw/FfghctbFK38GAr4GRFOFfSpo2LujwdUYcFvCXmanGygDC MpGjWrovtKaGpBcEZCHHkEkcnffWbOfjgdXrLInW57vHtelEjfiRtVMfs +kLKdhGOUEmX3ES2dq8gqvIVB8vjK2Vq0nDtp63UVwFqmUss9XoB0C8cI KC1bnUjEDcJvge9s5fXZn7uYrI15bEmnvoRJPIiE7zQUr8JldoZ5HvoRD hV224XUI7lIgUk2is/CAcRMw5mnAKVrLwgJ/5kBV8+/WvmT6aXOqEDaUo Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10699"; a="347518619" X-IronPort-AV: E=Sophos;i="5.99,247,1677571200"; d="scan'208";a="347518619" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 May 2023 09:30:24 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10699"; a="942901558" X-IronPort-AV: E=Sophos;i="5.99,247,1677571200"; d="scan'208";a="942901558" Received: from josouza-mobl2.fso.intel.com ([10.230.18.148]) by fmsmga006-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 May 2023 09:30:23 -0700 From: =?UTF-8?q?Jos=C3=A9=20Roberto=20de=20Souza?= To: intel-xe@lists.freedesktop.org Date: Wed, 3 May 2023 09:30:13 -0700 Message-Id: <20230503163013.50231-2-jose.souza@intel.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230503163013.50231-1-jose.souza@intel.com> References: <20230503163013.50231-1-jose.souza@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Intel-xe] [PATCH v3 2/2] drm/xe: Set default MOCS value for copy cs instructions 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: , Cc: Matt Roper Errors-To: intel-xe-bounces@lists.freedesktop.org Sender: "Intel-xe" copy cs instructions that dont have a explict MOCS field will use this default MOCS value. This was mainly copied from i915 source code. v2: - move to xe_hw_engine.c - remove BLIT_CCTL auxiliary macros - removed MASKED_REG v3: - rebased BSpec: 45807 Cc: Matt Roper Signed-off-by: José Roberto de Souza --- drivers/gpu/drm/xe/regs/xe_engine_regs.h | 6 ++++++ drivers/gpu/drm/xe/xe_hw_engine.c | 16 ++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/drivers/gpu/drm/xe/regs/xe_engine_regs.h b/drivers/gpu/drm/xe/regs/xe_engine_regs.h index 717d560626cec..b0ba56342773a 100644 --- a/drivers/gpu/drm/xe/regs/xe_engine_regs.h +++ b/drivers/gpu/drm/xe/regs/xe_engine_regs.h @@ -58,6 +58,12 @@ #define RING_BBADDR(base) XE_REG((base) + 0x140) #define RING_BBADDR_UDW(base) XE_REG((base) + 0x168) + +/* Same handling MOCS value handling done in RING_CMD_CCTL */ +#define BLIT_CCTL(base) XE_REG((base) + 0x204) +#define BLIT_CCTL_DST_MOCS_MASK REG_GENMASK(14, 9) +#define BLIT_CCTL_SRC_MOCS_MASK REG_GENMASK(6, 1) + #define RING_EXECLIST_STATUS_LO(base) XE_REG((base) + 0x234) #define RING_EXECLIST_STATUS_HI(base) XE_REG((base) + 0x234 + 4) diff --git a/drivers/gpu/drm/xe/xe_hw_engine.c b/drivers/gpu/drm/xe/xe_hw_engine.c index d497f0289c372..284b153cd30b5 100644 --- a/drivers/gpu/drm/xe/xe_hw_engine.c +++ b/drivers/gpu/drm/xe/xe_hw_engine.c @@ -277,6 +277,8 @@ hw_engine_setup_default_state(struct xe_hw_engine *hwe) const u8 mocs_read_idx = gt->mocs.uc_index; u32 ring_cmd_cctl_val = REG_FIELD_PREP(CMD_CCTL_WRITE_OVERRIDE_MASK, mocs_write_idx) | REG_FIELD_PREP(CMD_CCTL_READ_OVERRIDE_MASK, mocs_read_idx); + u32 blit_cctl_val = REG_FIELD_PREP(BLIT_CCTL_DST_MOCS_MASK, mocs_write_idx) | + REG_FIELD_PREP(BLIT_CCTL_SRC_MOCS_MASK, mocs_read_idx); const struct xe_rtp_entry engine_was[] = { /* * RING_CMD_CCTL specifies the default MOCS entry that will be @@ -295,6 +297,20 @@ hw_engine_setup_default_state(struct xe_hw_engine *hwe) ring_cmd_cctl_val, XE_RTP_ACTION_FLAG(ENGINE_BASE))) }, + /* + * Some blitter commands do not have a field for MOCS, those + * commands will use MOCS index pointed by BLIT_CCTL. + * BLIT_CCTL registers are needed to be programmed to un-cached. + */ + { XE_RTP_NAME("BLIT_CCTL_default_MOCS"), + XE_RTP_RULES(GRAPHICS_VERSION_RANGE(1200, XE_RTP_END_VERSION_UNDEFINED), + ENGINE_CLASS(COPY)), + XE_RTP_ACTIONS(FIELD_SET(BLIT_CCTL(0), + BLIT_CCTL_DST_MOCS_MASK | + BLIT_CCTL_SRC_MOCS_MASK, + blit_cctl_val, + XE_RTP_ACTION_FLAG(ENGINE_BASE))) + }, {} }; -- 2.40.1