From mboxrd@z Thu Jan 1 00:00:00 1970 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 87799F4BB63 for ; Tue, 24 Feb 2026 17:22:11 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0270110E5F4; Tue, 24 Feb 2026 17:22:10 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="UzFeM0ps"; dkim-atps=neutral Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4FF1E10E5F4 for ; Tue, 24 Feb 2026 17:22:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1771953727; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8SD2VoRr+tc5wYI9TVLRWC6aPDSxE2BzY5GPr4tLxmE=; b=UzFeM0psOx2Ig+VSpBD99VcyZwXqQmrvUjRUjzruVV21q74rMIfnmNw6g/zpFmLXvD+VZh Ir/AjY0B5Dwjvcru0VApc6YfmIjX+kB4zwkRprxRzHvIoDk7Jnv0T4IOv3WlRpeMXOTdi5 h+qFyDH4SY0BaWY3AaTPlJQ8FguxBgo= Received: from mail-qv1-f72.google.com (mail-qv1-f72.google.com [209.85.219.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-397-yS6gOc8TN7a8zYrwwMuWGQ-1; Tue, 24 Feb 2026 12:22:05 -0500 X-MC-Unique: yS6gOc8TN7a8zYrwwMuWGQ-1 X-Mimecast-MFC-AGG-ID: yS6gOc8TN7a8zYrwwMuWGQ_1771953725 Received: by mail-qv1-f72.google.com with SMTP id 6a1803df08f44-8954d426c7dso447509196d6.3 for ; Tue, 24 Feb 2026 09:22:05 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771953725; x=1772558525; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=8SD2VoRr+tc5wYI9TVLRWC6aPDSxE2BzY5GPr4tLxmE=; b=LbONtbIMmq/wSyA5lY3D2A+/tYw2SLAsy+Wj8yz7W+sP4oTnhQhKqPfqab2WJoHJH4 dq2kOY1AOgXGABXzq2Q2j/1smOf7gm04IhzpS++9IV88nxtehe/4Rp6wqgTfBmvsxJpU e04k77v2EzdzYi3J3+9mP9zsvLCQ51gxvXOkC27rKcJLO+m+juzhbJGmuCIwaC+X+kJB NXrqDaZwJHtAQ7o4aat6C67Tp/L2OrH3AG+oVH5wcNhqOndxk9AKPeNz4TpqXj6a2Qy1 tAWS4Tkw9m5mgW3tlrU0MkdjJUeMQBg81k5siDqn3G+s65U3mPTPmG5AEVIjVVZx4zJC Mkgg== X-Forwarded-Encrypted: i=1; AJvYcCXDDJbcsNkRrlsjThtGNvA+s5PbFsPnR4WBIAeVpvg0P9no9HATyfGY9uKFwWEmop0KxZAqGzBREBQ=@lists.freedesktop.org X-Gm-Message-State: AOJu0YzvSKMM40xBaq0RkadCm5H4Ovnsm6vYOkgp+9lFseWE35zksBsP Xv3x34aCf86Po5ad0LDngOMLi4nT9K6r1eszogoe5eRkwCYwLdbwVERs47iobvOl/hi/lqNOdG2 8g73iV9exypxSFpT4x0VF+JIorMlXBeCHAbef7rvaJmSLA0RquWFTDAS8eHHQ0hdHsLPmmg== X-Gm-Gg: ATEYQzwHi1d9mM9AxAKHJfYKD5EOBxIQXcfxDV166bC7GZYktETlrGysuUpatJ+DiqD RQ4L+6nggbk36DCnKk/rAizkiqVAse9lVSeOspZzJ72hXQigfffETEbOWZtgwrp+O0DoMzl5tff iEEvqcYSVwkNr3SEJUVwEx6SjIm65+14fKHynzr6pX7zWG0NMIwVUquMBPtuzCHsf4Lu5GcGowE FpzRYKfczxU+dM/ODj42y8YtN9qHkV558VmEItGKfqHM1rmLA9SqqLpIwJZ8u1ilS93xzpDvV24 rhGwSZ7gSf7MLEpb0Avu/qTRGYLKWul4vJzHfMih4Oma9yY96cQWaG2+AEH5Ymo0qFmfA8cWtXe 2FnI7Bs7SFPhiMZgzOztOTYyS X-Received: by 2002:a05:6214:485:b0:895:4b79:83a3 with SMTP id 6a1803df08f44-89979c3d88emr159055416d6.8.1771953725002; Tue, 24 Feb 2026 09:22:05 -0800 (PST) X-Received: by 2002:a05:6214:485:b0:895:4b79:83a3 with SMTP id 6a1803df08f44-89979c3d88emr159054966d6.8.1771953724466; Tue, 24 Feb 2026 09:22:04 -0800 (PST) Received: from [172.16.1.8] ([2607:f2c0:b1e3:9a00:3c7:56c2:f819:96d2]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-8997e62fd3dsm102044536d6.39.2026.02.24.09.22.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Feb 2026 09:22:04 -0800 (PST) From: Peter Colberg Date: Tue, 24 Feb 2026 12:21:45 -0500 Subject: [PATCH] drm/amdkfd: remove duplicate ttmp11 scheduling mode definitions MIME-Version: 1.0 Message-Id: <20260224-drm-amdkfd-ttmp11-sched-mode-v1-1-4254ff8952c4@redhat.com> X-B4-Tracking: v=1; b=H4sIACjenWkC/x3MMQqAMAwAwK9IZgNtEEW/Ig7FpDZIVVoRQfy7x fGWeyBLUskwVA8kuTTrvhXYuoI5uG0RVC4GMtQaogY5RXSRV894nvGwFvMchDHuLOg61xFx37K 3UIojidf778fpfT//tTBobgAAAA== X-Change-ID: 20260224-drm-amdkfd-ttmp11-sched-mode-a7a722d96df1 To: Felix Kuehling , Alex Deucher , =?utf-8?q?Christian_K=C3=B6nig?= , David Airlie , Simona Vetter , Jay Cornwall , Lancelot Six Cc: amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Peter Colberg X-Mailer: b4 0.14.2 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: kG-kfbRm7nHfveZDVnxBcCfRnPUeIPp5Mb9H0OZcbKc_1771953725 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit 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" TTMP11_SCHED_MODE_* are only used if RELAXED_SCHEDULING_IN_TRAP is defined. Fixes: bbcad5a8896b ("drm/amdkfd: gfx12.1 trap handler support for expert scheduling mode") Signed-off-by: Peter Colberg --- drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx12.asm | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx12.asm b/drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx12.asm index 456db81998993803a25b32653ad75d529e35931c..3c976a4aac739669a39aebeb97bb35dfaa1af2f2 100644 --- a/drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx12.asm +++ b/drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx12.asm @@ -112,12 +112,6 @@ var BARRIER_STATE_MEMBER_OFFSET = 4 var BARRIER_STATE_MEMBER_SIZE = 7 var BARRIER_STATE_VALID_OFFSET = 0 -#if RELAXED_SCHEDULING_IN_TRAP -var TTMP11_SCHED_MODE_SHIFT = 26 -var TTMP11_SCHED_MODE_SIZE = 2 -var TTMP11_SCHED_MODE_MASK = 0xC000000 -#endif - var NAMED_BARRIERS_SR_OFFSET_FROM_HWREG = 0x80 var S_BARRIER_INIT_MEMBERCNT_MASK = 0x7F0000 var S_BARRIER_INIT_MEMBERCNT_SHIFT = 0x10 @@ -134,9 +128,11 @@ var SQ_WAVE_MODE_DST_SRC0_SRC1_VGPR_MSB_SHIFT = 12 var SQ_WAVE_MODE_DST_SRC0_SRC1_VGPR_MSB_SIZE = 6 #endif +#if RELAXED_SCHEDULING_IN_TRAP var TTMP11_SCHED_MODE_SHIFT = 26 var TTMP11_SCHED_MODE_SIZE = 2 var TTMP11_SCHED_MODE_MASK = 0xC000000 +#endif var TTMP11_DEBUG_TRAP_ENABLED_SHIFT = 23 var TTMP11_DEBUG_TRAP_ENABLED_MASK = 0x800000 var TTMP11_FIRST_REPLAY_SHIFT = 22 --- base-commit: 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f change-id: 20260224-drm-amdkfd-ttmp11-sched-mode-a7a722d96df1 Best regards, -- Peter Colberg