From mboxrd@z Thu Jan 1 00:00:00 1970 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 483582D8DA8 for ; Tue, 23 Jun 2026 13:08:48 +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=1782220130; cv=none; b=n9sDUJzPcoRS64MSHtWAkStiNqwBGsBXamB73ZRbJfmosAa8kq6aUaKaeMQW0HcLerI8C9iHL8I18Mfwl9wB5LWvCXSxYg06EBDDsuRZpYMrSbFcdDjY4UurTmWGKu/yCiZ529r6IC9foBgR//h274TQnv6JScB74lb7OSPlc7E= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782220130; c=relaxed/simple; bh=xhV+fQg4GhL+/RFHqkId8dIHE/BQEiUCFDOj1bTyuBw=; h=Message-ID:Subject:From:To:Cc:Date:In-Reply-To:References: Content-Type:MIME-Version; b=tFLq6HncAyudaFwzdxno1VvFLnSgBR8ixnA7cMzli6iMdrLbZWB0HjcpNKjcH0hga9AcUCJGHkv1drbpAT9nme4fNQSHfEvF4PzL3Fe9CWNPiYi/BoB0+9e2pQKr+PGsDYYDHc78bmoThf2KABOlmOGTACzH8gUu/R6J0DGND9I= 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=R6E1u/fg; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=Oy1F+KBi; 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="R6E1u/fg"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="Oy1F+KBi" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1782220127; 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: in-reply-to:in-reply-to:references:references; bh=xhV+fQg4GhL+/RFHqkId8dIHE/BQEiUCFDOj1bTyuBw=; b=R6E1u/fgtlQkbFZh5oRVKZpC8gvkop9Mv9FNC2iUduk6j7013FfmiT+/Js2Yl1LnQNNU/i L5gAVdEmdsqySf10CFMlDeh+ONAqE6BlwY/gEuN6s0wK7WbOUg1RpfsV8av3zQ+rfSiHA/ yg+kmYEqCd7JxF3qO7MONqIjPkGbv+M= Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-284-WTWnEe-PMpqrgc2blvhKDA-1; Tue, 23 Jun 2026 09:08:43 -0400 X-MC-Unique: WTWnEe-PMpqrgc2blvhKDA-1 X-Mimecast-MFC-AGG-ID: WTWnEe-PMpqrgc2blvhKDA_1782220122 Received: by mail-ej1-f71.google.com with SMTP id a640c23a62f3a-c0853e3bd08so413925266b.0 for ; Tue, 23 Jun 2026 06:08:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1782220122; x=1782824922; darn=vger.kernel.org; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=xhV+fQg4GhL+/RFHqkId8dIHE/BQEiUCFDOj1bTyuBw=; b=Oy1F+KBigSJSJKc3smSHeKgzYmz5agbu3a/115IOAUEXfOFKEFK/nY4HbTkVmMNGfY TTVtyR5JINe/5ON1UzpmfhN2q6NoduNd5ZpZt6CK51/8VarBJSAp8mHRlj/5hN9STuio kJx0Rdmo7juo1T1YmAGYEiNNAlx9I1ZTzo5+mguLPIw+0nCE+zBVcdA0KFgrPvwrv6aE ovlNkL13pYHQjKtR4ix3tezvbJPHv4zKrLzD6oS7p1TwAXcCdVYbHc3KxLM+H5v6P6rZ b9MjZx7xfS7liHLGT2xr8tXuFXGZDausg+biRlu42QQoRLARjMD5blCPkAMYxyjNjfO0 Z5gA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782220122; x=1782824922; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=xhV+fQg4GhL+/RFHqkId8dIHE/BQEiUCFDOj1bTyuBw=; b=eS0ciIknftKzO+9f8QGo434yVWRG3VEsZHZ49jHZW9AZ/Vr4B7puNguJjVJ6pA2sdW mhczMpgftoHl+5y89RinjJj5kbiV0yazlZBOOixq6DkjcHgF6VsBKR3bLWkiXTlyrCKO 2JT9p3DphUJqd0NmoxBoAYHnIGyo/3SmQ78L2Yg+MK+IIa9BMjvrA6+9h+g8xnmoWzW8 KuzGo23+mCYKzt69jfYmqvBOYE15Et5uixNgayAMC24VSf2hJ5Qe6TKUhO5BBlitrR8F chTQri5Avl8Ay3vJq2eXrPw9f1LcVgWZdBGxCtRS05qwAZ8NOGss2gbkVmMcrhCJvnOS rdYg== X-Forwarded-Encrypted: i=1; AFNElJ/QunvhEL+NDCnBYfdReJE1cthjSO3zR8NWieDeMr/iwxRBc1PnYE57EDY5B0+xNbwM/if61cVz4CL3FGc=@vger.kernel.org X-Gm-Message-State: AOJu0YxxNssR732NhRFAKci4BeRoalw3RkV0yS2CMN5QV4Tg6YekOrEw kUfNMTMJumeP9w5Kiq6OOK9GXoF2Jv9KMnUpseDb1sh1njjpjsvJ431xOjg23fVIdbSBuCR5tV9 zFb3MNlFAS8Vum2cFkO1jkunKHwYLvp1R0xh+++GvlKmXrgftlpMSY0DEGMdasbbVhF/2ZBznK5 63 X-Gm-Gg: AfdE7cnK+tc7wKdFyRaIgFLTIkoGQktXjzacFlkkQkkITyEjBGM3z+MzkgRY03eXDXb 6edw51XFeW5JomQqeZKLFSHvW5vXFAixcsTC0t1IqzbmyjCDmXrB/Uf/Dm5OU/RYKBnbttZ623d gJ99T1XsYe2xzvBQ1aaRH6tHQ1Ou9SNjnSjVJtY8qBYLSVAmWMyK0mJfXwvXP44TRGDoMWQQFkq d8Ygewws2bnWHgOsAZkdbkFu9wZi1jSIOqE/WE1nma2nnkbA3VStFvWaiutD/LV4lRMmQIoe3jR wryA+Mtzkyd9ZGdG0ZPCUtqC9mHfHQyydgxklUhBsVOCeNZIYKR3+1ly8IADtsC8ASmITwyNbFP k+nGkYis+A0WHRS3Oh6cX0P1wM+pz9rwBwH5y X-Received: by 2002:a17:907:c0f:b0:bfb:13b8:2ac4 with SMTP id a640c23a62f3a-c0c643a9322mr732716666b.13.1782220122310; Tue, 23 Jun 2026 06:08:42 -0700 (PDT) X-Received: by 2002:a17:907:c0f:b0:bfb:13b8:2ac4 with SMTP id a640c23a62f3a-c0c643a9322mr732709866b.13.1782220121644; Tue, 23 Jun 2026 06:08:41 -0700 (PDT) Received: from [10.32.64.70] (nat-pool-muc-t.redhat.com. [149.14.88.26]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-c0c616175c2sm511061966b.61.2026.06.23.06.08.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Jun 2026 06:08:40 -0700 (PDT) Message-ID: Subject: Re: [PATCH] dma-fence: use correct callback in dma_fence_timeline_name() From: "pstanner@redhat.com" To: Tvrtko Ursulin , Christian =?ISO-8859-1?Q?K=F6nig?= , =?ISO-8859-1?Q?Andr=E9?= Draszik , Sumit Semwal , Tvrtko Ursulin Cc: linux-media@vger.kernel.org, dri-devel@lists.freedesktop.org, linaro-mm-sig@lists.linaro.org, linux-kernel@vger.kernel.org, Peter Griffin , Tudor Ambarus , Juan Yescas , kernel-team@android.com Date: Tue, 23 Jun 2026 15:08:39 +0200 In-Reply-To: <27f54324-94ac-4bbc-ba58-642a314197d7@igalia.com> References: <20260618-linux-drm_crtc_fix-v1-1-801f29c9853d@linaro.org> <099959fa-3a41-4166-8c10-4e5c2b9fdf19@amd.com> <27f54324-94ac-4bbc-ba58-642a314197d7@igalia.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.60.1 (3.60.1-1.fc44) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 On Thu, 2026-06-18 at 20:30 +0200, Tvrtko Ursulin wrote: >=20 > On 18/06/2026 14:46, Christian K=C3=B6nig wrote: > > On 6/18/26 14:00, Andr=C3=A9 Draszik wrote: > > > dma_fence_timeline_name() is a wrapper around > > > dma_fence_ops::get_timeline_name(). Since the blamed commit below, it > > > calls an incorrect callback. > > >=20 > > > Update it to restore functionality by calling the intended callback. > > >=20 > > > Fixes: 62918542b7bf ("dma-fence: Fix sparse warnings due __rcu annota= tions") > > > Signed-off-by: Andr=C3=A9 Draszik Reviewed-by: Philipp Stanner > > I'm like 99% sure we had that already fixed weeks ago, but somehow it l= ooks like that was never merged to drm-misc-fixes. I'm also very sure that we had shot that bug down not too long in the past. > >=20 > > Anyway Reviewed-by: Christian K=C3=B6nig >=20 > I was also perplexed and took me some digging to realise what had happene= d. >=20 > The copy-and-paste bug was indeed originally fixed in: >=20 > commit 033559473dd3b55558b535aa37b8848c207b5cbb > Author:=C2=A0 =C2=A0 =C2=A0Akash Goel > AuthorDate: Tue Oct 21 17:09:51 2025 +0100 > Commit:=C2=A0 =C2=A0 =C2=A0Tvrtko Ursulin > CommitDate: Fri Oct 24 16:56:37 2025 +0100 >=20 > =C2=A0=C2=A0 =C2=A0 dma-fence: Fix safe access wrapper to call timeline n= ame method >=20 >=20 > But waaay before that I sent a fix for something else which touched=20 > those lines not noticing the copy-and-paste, fixing a different issue.= =20 > That one however was not merged until earlier this year: >=20 > commit 62918542b7bf08860a60ebbde7654486e0ac0776 > Author:=C2=A0 =C2=A0 =C2=A0Tvrtko Ursulin > AuthorDate: Mon Jun 16 16:59:52 2025 +0100 > Commit:=C2=A0 =C2=A0 =C2=A0Christian K=C3=B6nig > CommitDate: Mon Feb 9 14:05:20 2026 +0100 >=20 > =C2=A0=C2=A0 =C2=A0 dma-fence: Fix sparse warnings due __rcu annotations >=20 > Notice the authored vs commited dates. >=20 > I guess it was a silent conflict which overwrote the earlier fix and=20 > restore the copy-and-paste bug. silent conflict? If that can happen with our git workflow, how is it that we don't see things like that more often? P.