From nobody Thu Apr 9 18:00:24 2026 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.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 CE5C63976B1 for ; Tue, 3 Mar 2026 21:29:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772573396; cv=none; b=nsREk6IRlD/b9UQawWlYnzHZ4AoskBLhq9nhmwTtns1Vas9A5Ch/Whd6WtkAvUy1qM0jOeE9SLWZs3ofbPzjGe3XkkmNAoWss0DSezzbKO7TFJ7n5OO+fKXDmc6zbxkBgN7IvzIUMkybZghGZRYJBjizuynhzOTg7Q6edeDa0VI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772573396; c=relaxed/simple; bh=V5kkiAsAF0K9JNN/2XXGimaBJIRuuI0YOLh7UYMimxY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:To:Cc; b=bMWqtqglm/X0rJ5bs6eeNbirbOMVkyu7/pIY/mBaRPG2HQVulRGYzA4XdfTvdiCnBTKEZhjUp6/ILBMCZpbPahJ2rerVCKsot1pFGe9TqWQchP5CCaa1/rWLRKeZLVPzINiUZQn+3fdPl3h+z2//UxGVPU2rfHUsIrYpSO1rMEg= 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=BSXC5CvN; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=G4Be1FZQ; arc=none smtp.client-ip=170.10.129.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="BSXC5CvN"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="G4Be1FZQ" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1772573393; 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=BSXC5CvNai5Lqt4Fx+LCr1Y1ZQ0XB0oOMNMsxRoHYeMDKJjKnF7E3+PmT2pznozurDrd7B BRGdu+43jcPP/ujUx35/KkUohg2QXddhp8kybw+76L5kvtX6htDngdM29wOIuh7oDBi+YE Dx0mfBKYemk5fmy10GpLTaByQ5s0E9A= 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-393-LkkQUTFyOQ-tPFoguUP-pg-1; Tue, 03 Mar 2026 16:29:53 -0500 X-MC-Unique: LkkQUTFyOQ-tPFoguUP-pg-1 X-Mimecast-MFC-AGG-ID: LkkQUTFyOQ-tPFoguUP-pg_1772573392 Received: by mail-qk1-f199.google.com with SMTP id af79cd13be357-8cb4d191ef1so754857685a.0 for ; Tue, 03 Mar 2026 13:29:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1772573392; x=1773178192; 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=G4Be1FZQ5m2dR0dLwh72V8/AH1Qgcr36xZ9vpgz22Ql53Cya5eY0KtVN2wK6KEIM8C L40kkmFlbI5/o7KmQ7UoLTLtk8cxEfft0SR5bNGX9BWBHI3F0ggs8vvRAbO5c+v4MxLC hpQV+WtTl11CaXiBsDFcWZPdUNzYrpWnhaLdHHryKq/ygsgiio/viBEfMlpTnLVqNLoG 4eUoaDAT3RXGkK8ZaLf6RyjMq9JPT+OHE1dfibSvg23imIa8oDCcig6c9Km1JU4WOWJr 1iXZTdfh7NU8lELmpAtgZbOMbceNcd3/LDeBTKzGVKjJKAes99H1rXwZsZhrc3uF5iS1 yTLg== 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=FiLJlDqUOuYH+Cs65sCCMbiCMZzl+5dHj349rB+GDIBW2dlgoa/Jl0Gq9eTdXRdoJ9 oGzHgto/KidzZmyzt3MhYwlKC2+kgQ6LPz9nlk2MTBWMGbYoU0ePD18+eYAvJKfw7TIm Pioent4BTBoEDUZ/PVQFg4iKx6wEt4W7FGwEtwt113QBMzbs4HxeNOCLSApNTAZ0VFDD 4GBTO35ReuipLQS0nf4aMiz3KE+2Sbhb3uMo9z1LGwHtGmAEF2YCEihMZ2MeTHeABkul tLKxDrk+i0sI7eAbE6azl3j8q+tEnjwBZmigChVBU1yhhpa9GDRffrfcz61oLhhqcIiI CFsA== X-Forwarded-Encrypted: i=1; AJvYcCXFbCh+S4c3xwA5msUj6RilXwdOcNKe6W0/w0n6kfURaxYqSWA4BgA3a5IC/sVPQuNlMlpA8fBWf/GbDM8=@vger.kernel.org X-Gm-Message-State: AOJu0Yz+hWJaEG99GonP23xGieZRcQfyZwK/2OqTJSdmVjWLZLO0+zpu GXKBvR6eVOe8EZbUpaZtzTp/f/EZrnVcdXMpbbvb7yskZJVxsbRV1VSCqVl8ymn9dw2h3l8Sn12 42Yr+utGUG54CMt9WE9jUunk1rcW6CkY3cBS7UIeiSmCr4gqZY3y7qdkY8add5+A6OQ== X-Gm-Gg: ATEYQzyXSmHf+XkkAfJFjGnCnb3ZSLMIF9MkgGBSvCqk7d1DEBnSO4U0bEzz2ZER7CK H2z+8vcpc/7c7+mhJfqVDN0sUnG82dnEvZvwQ7UGhrpzKB7WXmT31H3cBWXKP3B2l2wuqQRm4P3 iTyBGx9KW5OGxFUIXX3V39GvQQehkd1r08xlHdsvdEJIbBsRw6ffnhuIDF0wh216kbCXDnKIepY y/5gDPJHpJO7GBbM7zL2509mTPX8wZyLb5hmnZh85223OtwhcuB0PteWJzw7dYQsA3y73tpg5oM 08ryivNTS5P18pvyox6GBGurkqwLmgSlssluVxAZwe1lHH+T/KaHIe5GK6d1t3BURlrop125r/I iewWENCrDwo7iw8LpCHKpFnUifg== X-Received: by 2002:a05:620a:1981:b0:8c5:2ce6:dae with SMTP id af79cd13be357-8cbc8e98436mr2208240885a.29.1772573392242; 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 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: <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 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