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 2CE07EDEBF1 for ; Tue, 3 Mar 2026 21:29:56 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 95D4810E8DE; Tue, 3 Mar 2026 21:29:55 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="SfGla0rl"; 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 0931310E8DE for ; Tue, 3 Mar 2026 21:29:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1772573394; 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=SfGla0rl5MtypagclwtOm+ixhYiLImGhR76+j6J1GgU3/KZos910C2/1bSg3KP3abfe29J GEC/Cu2yKMjCI+tbMVC0EbvzX8z9m5wqLhWKjtkzN3ozZr9fbbrM+XFjFUIUuwKjLEPQjI 555hBiF1iIZEvJQ/dq/AgU2KogWLVVc= Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-513-1_jCXgfHMxGlDJ08Z2xL8A-1; Tue, 03 Mar 2026 16:29:53 -0500 X-MC-Unique: 1_jCXgfHMxGlDJ08Z2xL8A-1 X-Mimecast-MFC-AGG-ID: 1_jCXgfHMxGlDJ08Z2xL8A_1772573392 Received: by mail-qk1-f199.google.com with SMTP id af79cd13be357-8c71500f274so626787685a.1 for ; Tue, 03 Mar 2026 13:29:52 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772573392; x=1773178192; 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=GyWWrldu//aGA5odkWtQuD7Y3y7HoHPTkdox9zJ5PrE+orZANAv0pnLc7AiZ5+zVlN lmiMMw8U6vg1peW7vRjui6nfK/telmoDAr84f2ZCieXcYllBbGhwohYgyxfORWJhdo+8 DELawXpHgSGdBVbyzxfs2yLUr/FXYH1HJv93VhEuwrmxjsOIA+lHyqV3m8DpFTjTaFNH yC4szg2+fUIqsEl80ahnVNz7oHwz8GjsaH5a3UnO+dZ73+qbDdCxsbqBtbyJDh3RlUo4 hUuyV5uM1qExdgnHroheYwO8WngBTCf9Y1hLybAt08q4MOG0QV9wziqk9BYr2WpuvbFA 04Bg== X-Forwarded-Encrypted: i=1; AJvYcCXR8Eby7apgRF2i8DvMndrW4jYGDzSDnV/GtGOJCeGvXW4awoRYGB90OL3tkSDWENMmoiyxHH/FSpM=@lists.freedesktop.org X-Gm-Message-State: AOJu0YyyrZHuNW51cM4ac6Hq0LVYQd4vy55+6NMdnVWpTb7wtd7RQnfR re4RKO1+u+O868wZeTHlS0PalOTPXu3aIkgCckZvsvsKi9QmmZ4w+FWhBqOW+Tte8UeYGHjq6Op 4F15m+XdvJgRo0ETZLlxk7jJJbYbC9fevZsGQin6LPt+rGKRBQFRR5laqGSxF3F73Rkt1Mw== X-Gm-Gg: ATEYQzxzCyGxpJQaWTtASIc7tjV5NJAtM5Dwe1ZLVbPRPY/5dtDCUj7nWw5UnG65Ncu EUfC9OAkk4uBtJ1E27f4aLjF4k6dAi7jbngqfM/qa+6p3A1ZNOmzl6Znnk+1v4FhfkP2B0OZvG1 rxhgTXdRW076xjzZrq9LI4YDjbIj4jIhhwCZALseu1O+oWkGFgV1d0RP2OJ9LNC69a3s+ezxnpS UA+vshwUKTmi40O6YvbCFnKcucHVW0LxHj04U2CCmEprCmte6XW788fy3c8gw4a37Bh7kHYCUYL IM3wiZ7Vu0PUv5hODXW4OwyCu5WV8Uiy8b1gzatOxwRNbspdiyiXnRVRJB2+PVk2VY5p89bT4Ra njybvFc6XpLhOijEbGBoGe6x/5A== X-Received: by 2002:a05:620a:1981:b0:8c5:2ce6:dae with SMTP id af79cd13be357-8cbc8e98436mr2208241185a.29.1772573392246; Tue, 03 Mar 2026 13:29:52 -0800 (PST) X-Received: by 2002:a05:620a:1981:b0:8c5:2ce6:dae with SMTP id af79cd13be357-8cbc8e98436mr2208235685a.29.1772573391510; Tue, 03 Mar 2026 13:29:51 -0800 (PST) Received: from [172.16.1.8] ([2607:f2c0:b1e3:9a00:3c7:56c2:f819:96d2]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-50744990e15sm133781341cf.10.2026.03.03.13.29.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Mar 2026 13:29:50 -0800 (PST) From: Peter Colberg Date: Tue, 03 Mar 2026 16:29:44 -0500 Subject: [PATCH RESEND] drm/amdkfd: remove duplicate ttmp11 scheduling mode definitions MIME-Version: 1.0 Message-Id: <20260303-drm-amdkfd-ttmp11-sched-mode-v1-1-8130e3e6fcae@redhat.com> 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: pALD6D6ipBANYVmZ1UCu4_AWRCZ1hEmaBdBMfvSO4B0_1772573392 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