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 D2D07CDB47E for ; Fri, 13 Oct 2023 22:02:59 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 60F1B10E071; Fri, 13 Oct 2023 22:02:59 +0000 (UTC) Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id EAD4710E071 for ; Fri, 13 Oct 2023 22:02:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1697234577; x=1728770577; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=hFN+gTFHecvEvF5vMalI/JOUY/c688whFhH8zoxK9pU=; b=PD/l1n69i+nQA8RjaF9UOJcZxE0jWI4EgXBbj5rktBWH8N6x2w2OP2oO ipx4Zg1WWj3rjD8F99igD3cIyX9rDWxW6jI3uD3hxmvExxcMOQqrzgQFs BiRoFS8AtzVaJVunxT+/6ulWCtVfbrYdgavpkk97shFHredIc1H236K2K uk1znQTwbKVLCffCWZZg0xlRZovWJXzOjmwhLgnMIsbbxs8yTcTfsEbsk rQlO+yfrCWhuoIWtPPKP0RZdaiPKCe5OhAc46CxGfDGcGibr3+R9j4WHI ZFrqgLpDg0t7w5uJVV9uj8pBr+A6AIQzPCQfiL/M1x/OAEgxVsgbhBO98 A==; X-IronPort-AV: E=McAfee;i="6600,9927,10862"; a="471505746" X-IronPort-AV: E=Sophos;i="6.03,223,1694761200"; d="scan'208";a="471505746" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Oct 2023 15:02:57 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10862"; a="825212650" X-IronPort-AV: E=Sophos;i="6.03,223,1694761200"; d="scan'208";a="825212650" Received: from mdroper-desk1.fm.intel.com ([10.1.27.131]) by fmsmga004-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Oct 2023 15:02:57 -0700 From: Matt Roper To: intel-xe@lists.freedesktop.org Date: Fri, 13 Oct 2023 15:02:51 -0700 Message-ID: <20231013220250.927876-8-matthew.d.roper@intel.com> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [Intel-xe] [PATCH v2 0/6] LRC debugfs and general instruction tweaks 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: Lucas De Marchi , matthew.d.roper@intel.com Errors-To: intel-xe-bounces@lists.freedesktop.org Sender: "Intel-xe" "LRC workarounds" are those which target registers that are part of the an engine's LRC; the driver programs the registers with the desired updates before triggering creation of the default LRC snapshot, thus ensuring that the necessary settings are inherited by all new contexts that get created. There's an upcoming workaround that will require the driver to emit not only updates to specific registers at driver init, but also some non-register state (e.g., 3DSTATE_* instructions) before snapshotting the default LRC. This is also expected to become necessary for non-workaround initialization on future platforms as well. Before we start making these updates to the initial engine state and default LRC, it's helpful to be able to see exactly what's inside the context image. The changes here add some debugfs entries that dump each engine type's default LRC with some basic instruction header decoding. E.g., $ sudo cat /sys/kernel/debug/dri/0/gt0/default_lrc_ccs [0x00000000] MI_NOOP (1 dwords) [0x1108101d] MI_LOAD_REGISTER_IMM: 15 regs - 0x1a244 = 0xffff0048 - 0x1a034 = 0x000000f8 - 0x1a030 = 0x000000f8 - 0x1a038 = 0x00fa0000 - 0x1a03c = 0x00003001 - 0x1a168 = 0x00000000 - 0x1a140 = 0x00400004 - 0x1a110 = 0x00000000 - 0x1a1c0 = 0x00000000 - 0x1a1c4 = 0x00000000 - 0x1a1c8 = 0x00000000 - 0x1a180 = 0x00000080 - 0x1a2b4 = 0x00000000 - 0x1a120 = 0x00000000 - 0x1a124 = 0x00000000 [0x00000000] MI_NOOP (1 dwords) [0x11081011] MI_LOAD_REGISTER_IMM: 9 regs <...snip...> [0x00000000] MI_NOOP (6 dwords) [0x6904ff02] PIPELINE_SELECT (1 dwords) [0x61010014] STATE_BASE_ADDRESS (22 dwords) [0x61020001] STATE_SIP (3 dwords) [0x61050000] STATE_COMPUTE_MODE (2 dwords) [0x79190002] 3DSTATE_BINDING_TABLE_POOL_ALLOC (4 dwords) [0x79040002] 3DSTATE_CHROMA_KEY (4 dwords) [0x79040002] 3DSTATE_CHROMA_KEY (4 dwords) [0x61060004] 3DSTATE_BTD (6 dwords) [0x00000000] MI_NOOP (114 dwords) [0x05000001] MI_BATCH_BUFFER_END A few other changes are made to the general way GPU instructions are defined in the Xe driver to make the definitions more consistent and easier to re-use in the new dumping logic. v2: - Use "instr" instead of "inst" as the short form of "instruction" everywhere. - Tighten bounds checking while parsing context to ensure we don't overshoot the end if we get instructions with malformed lengths or if we otherwise mis-parse something. - Include raw hex form of instruction header in output. - Add parsing for a couple instructions that the hardware is still generating in the context image, even though they're technically not supposed to exist on these platforms. Cc: Lucas De Marchi Matt Roper (6): drm/xe: Make MI_FLUSH_DW immediate size more explicit drm/xe: Separate number of registers from MI_LRI opcode drm/xe: Clarify number of dwords/qwords stored by MI_STORE_DATA_IMM drm/xe: Extract MI_* instructions to their own header drm/xe/debugfs: Add dump of default LRCs' MI instructions drm/xe/debugfs: Include GFXPIPE commands in LRC dump .../drm/xe/instructions/xe_gfxpipe_commands.h | 108 ++++++++++ .../gpu/drm/xe/instructions/xe_instr_defs.h | 32 +++ .../gpu/drm/xe/instructions/xe_mi_commands.h | 61 ++++++ drivers/gpu/drm/xe/regs/xe_gpu_commands.h | 33 --- drivers/gpu/drm/xe/xe_bb.c | 1 + drivers/gpu/drm/xe/xe_execlist.c | 1 + drivers/gpu/drm/xe/xe_gt.c | 3 +- drivers/gpu/drm/xe/xe_gt_debugfs.c | 46 ++++ drivers/gpu/drm/xe/xe_lrc.c | 201 +++++++++++++++++- drivers/gpu/drm/xe/xe_lrc.h | 5 + drivers/gpu/drm/xe/xe_migrate.c | 10 +- drivers/gpu/drm/xe/xe_ring_ops.c | 21 +- 12 files changed, 470 insertions(+), 52 deletions(-) create mode 100644 drivers/gpu/drm/xe/instructions/xe_gfxpipe_commands.h create mode 100644 drivers/gpu/drm/xe/instructions/xe_instr_defs.h create mode 100644 drivers/gpu/drm/xe/instructions/xe_mi_commands.h -- 2.41.0