From nobody Fri Apr 17 00:29:37 2026 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8CCB8217733 for ; Tue, 24 Feb 2026 17:22:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771953729; cv=none; b=GPCE58eZ1b4+jO95mjRbxe9JHgA2GwDv+8ldFZmgWM9puLZnzszuAbwFI/nUcj2En0SveIFfWRIndc+8TJOPthsLtgn2VZCrd/LteoREw86XbxQYuDf+0/u13AyTgKCKRDCV6VIBDKIbHYbP+i6yJqp4ROns4BzP6nsrUCIZknE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771953729; c=relaxed/simple; bh=V5kkiAsAF0K9JNN/2XXGimaBJIRuuI0YOLh7UYMimxY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:To:Cc; b=fow789Yrx60VuEYNeRkhOIcdSf3z4UNBeGx/jhovolQ6I/6tJKQEXCCSxGCaZt2U3PrRP4ljwVqVdSZtGSx/+O3Ctsvh5dSUWnOWW3JbYjMQk8qUEXIqY1uLVxtbh6XLzrjw0fmtFgQHVWdALfYd4HbRMfinwgGyQCdNTAgptLM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=UzFeM0ps; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=p3ZDxtZW; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="UzFeM0ps"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="p3ZDxtZW" 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-f69.google.com (mail-qv1-f69.google.com [209.85.219.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-686-u7Adgy2JMFSL4KEEdXDx-g-1; Tue, 24 Feb 2026 12:22:06 -0500 X-MC-Unique: u7Adgy2JMFSL4KEEdXDx-g-1 X-Mimecast-MFC-AGG-ID: u7Adgy2JMFSL4KEEdXDx-g_1771953725 Received: by mail-qv1-f69.google.com with SMTP id 6a1803df08f44-8954d426c7dso447509396d6.3 for ; Tue, 24 Feb 2026 09:22:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1771953725; x=1772558525; darn=vger.kernel.org; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:from:to:cc:subject:date:message-id:reply-to; bh=8SD2VoRr+tc5wYI9TVLRWC6aPDSxE2BzY5GPr4tLxmE=; b=p3ZDxtZW6LhTb50ZUdyXeenjT4KQzg2LEjotrnIpEmhVeFvDyFW5swbXIl/Rk90qN6 z1ncXq7a48UcHBB4WSoQ+MBSlpPuygwRKcU0a9YtN9iHFfQWxiSDGq2wE4wZ67AFPkMz DscR0YMHzrMho7vLtEaTn79RL96en7Yr+VIl01NlS/nvMIyg83Dp0Y34pB1Y/VQbh1+v wFnejlq9cytqE58nQmFw+ELI5pW8d/Tqt2NCSSYk6NR7YF0JOimQ0s2XpoKdv2l8SZuN Ljf+hiap05CDf41cZeRIxbxhoW+lP2raENMKLwCkXfaugKMtZH2s2VoP/26/ww6+VMLt ZYTw== 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=Q8lBggaLh2G3PywcwvICXywn8LZ0l2ewj+zsf8d2HMKci5xSFjbQI3OSAIzfyJxSOX l1cQokgMhnexMSUwkRelLACnw7is5/Kk9uViA+bhvuFtY4pNs5qsQkYKJuCzHU9wGke9 t0I14hI+JvS6fCNwd8GarBgPoBj7svmEmw1n76w/x5AhQXpF5ws7Zi7EIkUpTBkYBvnx 19ar4NYr1iXRjM39JYeFAeZ7NEFH6RCg9f28fLnRH3ek+PvMPRi7UiL84g4XVjXlguDl X6yvA/C2bNwEGVJF+/Ll2ehIpDS7jE6PyrCLyrSqwjFVdOHjX9UBpwe/3nDUgt0F+pOV PJig== X-Forwarded-Encrypted: i=1; AJvYcCUvTz2hb+a411WUU7vBjn1vFlXQVeJdiS1ObXZTAosPYZhlZviPC+0HhUoEYaqh2gGo1r15vcsKblZY1NI=@vger.kernel.org X-Gm-Message-State: AOJu0YznqrP1T+5ITh312h0EEmuJiMijGWDqkx2l/bajU9ufTFTxP52k f4vMqYKpclSiILMeMBzpKGFK1HTBSYKJG4JPWGvgwopgEjmSx2w6iytyYDhWkEk0YteINHN+hL9 ne9Z+ab+JCL3LZF86fVy0Y4dz8h1vqGYa59zTo3YHqymcgScIph4uz52Q93kSff9eek550EGdr6 BWSurMZ7RYVZ6lni5AMlyMb54Zrcc5qDQUUZ7sGuxcymLK6l8RpQ== X-Gm-Gg: ATEYQzz4oyz1J1i/yqbeQ8JLdYvZlFjJaZ5RiGqwyoXq5qWu62wftpc62+kD/Pjyc3h FlpDUBrct0V91I0R+cNfobaIBF3h6KA0dbOqLFQSUCQxCf0YuIxY+bePGlHbfzT/HNxdVpDKgEv pFRrrD3YGxVhMHiNemtRUJ4AyDsQjxUctun2prtvdVfKQoTkay7e6wsRph034lkUMwXuYR/v3Op O6v+1Sco7dO5SP//uJMhIfFK4kAvVTSxvqccAlM2jegwh3s5hc1XuBALoZYecWbi2gj24b71VLV 5ZNNIJ30LGgKay6/fERUWhiqEokp8d4XS1zbk3RInkvqAVwBEgO7Jml06VUjgVZZ5oR6R1TyocT iFHPSgb57bla3sq3YwTNwbtuB X-Received: by 2002:a05:6214:485:b0:895:4b79:83a3 with SMTP id 6a1803df08f44-89979c3d88emr159055496d6.8.1771953725069; 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 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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 TTMP11_SCHED_MODE_* are only used if RELAXED_SCHEDULING_IN_TRAP is defined. Fixes: bbcad5a8896b ("drm/amdkfd: gfx12.1 trap handler support for expert s= cheduling 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/drive= rs/gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx12.asm index 456db81998993803a25b32653ad75d529e35931c..3c976a4aac739669a39aebeb97b= b35dfaa1af2f2 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 =3D 4 var BARRIER_STATE_MEMBER_SIZE =3D 7 var BARRIER_STATE_VALID_OFFSET =3D 0 =20 -#if RELAXED_SCHEDULING_IN_TRAP -var TTMP11_SCHED_MODE_SHIFT =3D 26 -var TTMP11_SCHED_MODE_SIZE =3D 2 -var TTMP11_SCHED_MODE_MASK =3D 0xC000000 -#endif - var NAMED_BARRIERS_SR_OFFSET_FROM_HWREG =3D 0x80 var S_BARRIER_INIT_MEMBERCNT_MASK =3D 0x7F0000 var S_BARRIER_INIT_MEMBERCNT_SHIFT =3D 0x10 @@ -134,9 +128,11 @@ var SQ_WAVE_MODE_DST_SRC0_SRC1_VGPR_MSB_SHIFT =3D 12 var SQ_WAVE_MODE_DST_SRC0_SRC1_VGPR_MSB_SIZE =3D 6 #endif =20 +#if RELAXED_SCHEDULING_IN_TRAP var TTMP11_SCHED_MODE_SHIFT =3D 26 var TTMP11_SCHED_MODE_SIZE =3D 2 var TTMP11_SCHED_MODE_MASK =3D 0xC000000 +#endif var TTMP11_DEBUG_TRAP_ENABLED_SHIFT =3D 23 var TTMP11_DEBUG_TRAP_ENABLED_MASK =3D 0x800000 var TTMP11_FIRST_REPLAY_SHIFT =3D 22 --- base-commit: 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f change-id: 20260224-drm-amdkfd-ttmp11-sched-mode-a7a722d96df1 Best regards, --=20 Peter Colberg