From nobody Fri Apr 3 11:02:26 2026 Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 53EC23921D2 for ; Wed, 25 Feb 2026 12:46:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772023578; cv=none; b=j2foXwPLsWgqPZLJziU9+uc+xptOz/jvl40NqLwzLno/t4nhg9c/xN8CAZSQnDl6iIA37e4df4ohBACo80mZ7fS/AFftKc+jLnG4ycKEZyxz/3wvkT99cpMaU7As3F0wOi5NX58hnXR1z56mbKthBK5qkXtpVOlDKKgMvBR290E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772023578; c=relaxed/simple; bh=hOix4V1pd2Hvn+oW5lBTHNEtcWhJXZUb9vL3WrcFgvs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=OYBaf9/xCeBMbu1oWqSEKjyyRSTqPcni1nAU+zqDbdvXa9797y6PYGr7oxwPEH3ABowRYxQJURajfyiu/ULHQ+aCttzpJU42pm/yt3iAiVE7IB9gAPQSqwXhUTtx0kuKj9FcfL+aRblx5tbkjy5Ip+I14t7Tlf7MiAo1LBHWBnk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=dw+GfYYE; arc=none smtp.client-ip=209.85.128.42 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="dw+GfYYE" Received: by mail-wm1-f42.google.com with SMTP id 5b1f17b1804b1-48378136adcso39926315e9.1 for ; Wed, 25 Feb 2026 04:46:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1772023576; x=1772628376; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=q97leBUZ6iXO6Mof7p/W19wcP1ASx9yxVnD9x21iO8o=; b=dw+GfYYEe3xyjJ9SNqOGf40jSbsn8q1rnjky0EinJ6u6hbkkwJ6PbjvA1N8HdxOvpE AQqzDF9YOy3oTgvibEvuWgoqkPXR+wNXRc3P6YELepk6+7wvC53yFEcXEgHzpIcLHHty 7Fq2HkCIkcAL5psJHt3ol7xT53YFDYtgouw14OGxlcgbKHvSi3cv83J3QL2/i9zN+r3I 2uSDSXTeLplDUCY41ChP0vYLl67HgCE53holhdb7TFuG6RhYQsz2BC8BUs5DM2Mrqpaf VcGr0QUJNSFWKsk4vlK2js0MPNfxzX6c8YYF8uACLz+Y/96N9/DbEPT0dpDdtJvAPdzB N+kg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772023576; x=1772628376; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=q97leBUZ6iXO6Mof7p/W19wcP1ASx9yxVnD9x21iO8o=; b=xQXv1W77HSNw8Ibo8/1kLPzjWpJcjOSC0bYpU+0f3FJzVbPc/0nX6CafN6mJv7TS01 i67flojdEZfprGmzPAu6T6FCovsfXPQt4q4ViKUKKEeiNg0pqA6qDuoWz1LSXL5rRWG4 8DB/4L3mH/y9Ov+DGd5tjM9PuRsng0cDlCpUTp1JpArMiYWea11GFhC8LD40HfrpIvJN FfJf/AFis+fL7c0pmK1eyqeT2AEpWZUqjlOhObcEe179usWNX7sqoENecuZnVXCKE9pE x5AeyHDShAWdM97oiw197EUkYXI+gpkklEVAuTmy+zzSJtKXg2CzLv5S5Ta0NVt7gFPg fl4Q== X-Forwarded-Encrypted: i=1; AJvYcCXFf0GnPD2a5VDhqU/tz4XSn7JqkNDQXRLIRX6DrLiyQU2AA/Fi1QTob6myQ+uVqUwUXcK6WMzRWWs/9us=@vger.kernel.org X-Gm-Message-State: AOJu0YztbXPaBIAPRpMLZEx282XQwYM0tFwobiG/+CuwdHoi9W6f3TIM OGo431iDoWtiaLx/027f03XsX5XJZwiRVxi8bHNX9eOgVeOpBps+qbeQUJMgc124 X-Gm-Gg: ATEYQzzdDXq4eYclgIdyVJ9CEBKoBfcl+7t0dPFvShEFbV7Wevhi6mvPI/CxD1OjLz8 GX9oOHzdsfYGxLDhWEDc4m2lmkU8j2e9maD8nZd32YIctF4haZ44HV4T6FgZYN1W94KLGd7qEMS HMSg/qJhWTmUIfUaBcQUxZlga//vbXwMKqhGZrAupuG6XP2cTP8K1xV1IRjHkBwPRuZsSA8mqh3 lIKBo6abRLPhg0Z/YDkM5a1X3xnGUDhgcaDzu+f72FRbp8uIkJDgqzkrnTaCFdA5Hs3r35Tcs61 e8ViFBuyBZ0LKDXZ9lgT88TfiyPrC5g/QSrhWfrtWAmzlYD+8JtiQsRhpZlvddLA2mrlq3rZx/c MY56UstxLkaFa286CGsSKQAeCbsHrAszvG3DGXTpiiHgFIhCPfZ683l7l2ARWSlLqZaiw7BM4ga XoIASJ808n5vKed+AoBEDYkuaEeXOwSodjKpTLN8LeS8bFc8sWtvaU+/uDwdHn7ij7RPgb X-Received: by 2002:a05:600c:1381:b0:483:7783:5373 with SMTP id 5b1f17b1804b1-483c21a5835mr4391115e9.23.1772023575661; Wed, 25 Feb 2026 04:46:15 -0800 (PST) Received: from Arch-Spectre.dur.ac.uk ([129.234.0.168]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-483bfcb9b97sm18419995e9.7.2026.02.25.04.46.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Feb 2026 04:46:15 -0800 (PST) From: Yicong Hui To: christian.koenig@amd.com, michel.daenzer@mailbox.org Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, skhan@linuxfoundation.org, david.hunter.linux@gmail.com, Yicong Hui Subject: [RFC PATCH v3 2/3] drm/syncobj: Add DRM_SYNCOBJ_WAIT_FLAGS_ABORT_ON_ERROR ioctl flag Date: Wed, 25 Feb 2026 12:46:08 +0000 Message-ID: <20260225124609.968505-3-yiconghui@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260225124609.968505-1-yiconghui@gmail.com> References: <20260225124609.968505-1-yiconghui@gmail.com> 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 Add DRM_SYNCOBJ_WAIT_FLAGS_ABORT_ON_ERROR ioctl flag for the ioctls DRM_IOCTL_SYNCOBJ_WAIT and DRM_IOCTL_SYNCOBJ_TIMELINE_WAIT, which will make them abort their wait and return the error code and its associated syncobj. Suggested-by: Christian K=C3=B6nig Suggested-by: Michel D=C3=A4nzer Signed-off-by: Yicong Hui --- Changes in v3: * Fixed inline comments by converting to multi-line comments in accordance to kernel style guidelines. * Used dma_fence_get_status to query error instead of getting it directly. drivers/gpu/drm/drm_syncobj.c | 27 +++++++++++++++++++++++---- include/uapi/drm/drm.h | 6 ++++++ 2 files changed, 29 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/drm_syncobj.c b/drivers/gpu/drm/drm_syncobj.c index b74e491f9d8b..2b23f638c1cc 100644 --- a/drivers/gpu/drm/drm_syncobj.c +++ b/drivers/gpu/drm/drm_syncobj.c @@ -1042,6 +1042,7 @@ static signed long drm_syncobj_array_wait_timeout(str= uct drm_syncobj **syncobjs, struct dma_fence *fence; uint64_t *points; uint32_t signaled_count, i; + int status; =20 if (flags & (DRM_SYNCOBJ_WAIT_FLAGS_WAIT_FOR_SUBMIT | DRM_SYNCOBJ_WAIT_FLAGS_WAIT_AVAILABLE)) { @@ -1139,6 +1140,14 @@ static signed long drm_syncobj_array_wait_timeout(st= ruct drm_syncobj **syncobjs, if (!fence) continue; =20 + status =3D dma_fence_get_status(fence); + if ((flags & DRM_SYNCOBJ_WAIT_FLAGS_ABORT_ON_ERROR) && status < 0) { + if (idx) + *idx =3D i; + timeout =3D status; + goto done_waiting; + } + if ((flags & DRM_SYNCOBJ_WAIT_FLAGS_WAIT_AVAILABLE) || dma_fence_is_signaled(fence) || (!entries[i].fence_cb.func && @@ -1242,8 +1251,12 @@ static int drm_syncobj_array_wait(struct drm_device = *dev, wait->flags, timeout, &first, deadline); - if (timeout < 0) + if (timeout < 0) { + if (wait->flags & DRM_SYNCOBJ_WAIT_FLAGS_ABORT_ON_ERROR) + wait->first_signaled =3D first; + return timeout; + } wait->first_signaled =3D first; } else { timeout =3D drm_timeout_abs_to_jiffies(timeline_wait->timeout_nsec); @@ -1253,8 +1266,12 @@ static int drm_syncobj_array_wait(struct drm_device = *dev, timeline_wait->flags, timeout, &first, deadline); - if (timeout < 0) + if (timeout < 0) { + if (timeline_wait->flags & DRM_SYNCOBJ_WAIT_FLAGS_ABORT_ON_ERROR) + timeline_wait->first_signaled =3D first; + return timeout; + } timeline_wait->first_signaled =3D first; } return 0; @@ -1332,7 +1349,8 @@ drm_syncobj_wait_ioctl(struct drm_device *dev, void *= data, =20 possible_flags =3D DRM_SYNCOBJ_WAIT_FLAGS_WAIT_ALL | DRM_SYNCOBJ_WAIT_FLAGS_WAIT_FOR_SUBMIT | - DRM_SYNCOBJ_WAIT_FLAGS_WAIT_DEADLINE; + DRM_SYNCOBJ_WAIT_FLAGS_WAIT_DEADLINE | + DRM_SYNCOBJ_WAIT_FLAGS_ABORT_ON_ERROR; =20 if (args->flags & ~possible_flags) return -EINVAL; @@ -1376,7 +1394,8 @@ drm_syncobj_timeline_wait_ioctl(struct drm_device *de= v, void *data, possible_flags =3D DRM_SYNCOBJ_WAIT_FLAGS_WAIT_ALL | DRM_SYNCOBJ_WAIT_FLAGS_WAIT_FOR_SUBMIT | DRM_SYNCOBJ_WAIT_FLAGS_WAIT_AVAILABLE | - DRM_SYNCOBJ_WAIT_FLAGS_WAIT_DEADLINE; + DRM_SYNCOBJ_WAIT_FLAGS_WAIT_DEADLINE | + DRM_SYNCOBJ_WAIT_FLAGS_ABORT_ON_ERROR; =20 if (args->flags & ~possible_flags) return -EINVAL; diff --git a/include/uapi/drm/drm.h b/include/uapi/drm/drm.h index 213b4dc9b612..e998d9351525 100644 --- a/include/uapi/drm/drm.h +++ b/include/uapi/drm/drm.h @@ -977,6 +977,12 @@ struct drm_syncobj_transfer { #define DRM_SYNCOBJ_WAIT_FLAGS_WAIT_FOR_SUBMIT (1 << 1) #define DRM_SYNCOBJ_WAIT_FLAGS_WAIT_AVAILABLE (1 << 2) /* wait for time po= int to become available */ #define DRM_SYNCOBJ_WAIT_FLAGS_WAIT_DEADLINE (1 << 3) /* set fence deadlin= e to deadline_nsec */ +/* + * As soon as any of the fences in the set have an error, + * abort waiting and return its error code. Index of this + * first failed fence is returned in first_signaled. + */ +#define DRM_SYNCOBJ_WAIT_FLAGS_ABORT_ON_ERROR (1 << 4) struct drm_syncobj_wait { __u64 handles; /* absolute timeout */ --=20 2.53.0