From nobody Sun Apr 5 16:27:55 2026 Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) (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 0E60E1CAA65 for ; Fri, 20 Feb 2026 02:26:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771554409; cv=none; b=Pnej5DUQ7vkutikM9kGYZivMN4SSFGLBlTU8QDqJ6cMtU29Egi0EvBvBBtTMWDgN7mtK4t19tgLjZZrWnDiXNNwoeOPLUNDSpdUYMAlgYrontgYdYZi+UJYT05QfAVrRbgY58Sh3tHV+rre416a46sqzfVWVWVVWhEtT87ptC8E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771554409; c=relaxed/simple; bh=/B4nvKknrKi3NJZmLJv3aG8mYi+Z/m5WS+UAxTJuONg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=esbWqVMDX7pjBGhaFhmlqLPRiQANgozB5lkYUPVrVLNna5qA4DnZOAmCxmbBHikb+QBGMjJ06WoIB8W/+sJuxlxWTPGXLVBwWwz8ebrG5cWuthpgeRa69xHnUTnJBSip7xplfJcWfehvKBC1Yxsvysg+Saie/UFlccuWUZ7plV8= 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=RtQ0ZVGN; arc=none smtp.client-ip=209.85.221.46 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="RtQ0ZVGN" Received: by mail-wr1-f46.google.com with SMTP id ffacd0b85a97d-43638a3330dso1307833f8f.0 for ; Thu, 19 Feb 2026 18:26:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1771554406; x=1772159206; 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=pJloV9r3ybizJNpOABCJHtRr3/jWkPGIyeA16Sq8DIo=; b=RtQ0ZVGNgA2ReduuObzlG72+rXzWmdX4ca+jWo2Kz/R5E5AoJPhxLa+3SExGLlA1fy xmK06R6xYiKn7R7ZGns6rUSQ1eZ7PUgK5NDScOsF69uvgYMIpfcgBVY/b3ebQDnO/LM2 wz6OcggjOfJb7NqXWkabPHpQeXngz//zGFaoLkf1xlqqK6Lb8jZfJCW+QyKjbBxnEZZd 7GsxmtNoehQmppTKUHPzC/E0ZcvOTqqUz2zCr+u3rfFeayRk4mbZR4ICyreWM1TO2lZd 7dTVxVtQa40KI3wvIx7DZ9WJiPWcRUYFJRbU4EdUOwAKC+TTvzcd4ENVOMca0exDUUN9 9IuQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771554406; x=1772159206; 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=pJloV9r3ybizJNpOABCJHtRr3/jWkPGIyeA16Sq8DIo=; b=hZc1PjZeE6KXBefFPBlLqrQjhYrkplGPzn0Cvyujd/6Ronc12UJE4iheBQ+H5kD+OL DdFyTKXs6S8B/mitE4nbIRK0/lbYqQ5d0FdBwlAai9R/ushQKwWYfYH58igwXewziW3c 3wXYwZxzDRsQXDkz/wDwE3FJk3IgiIxoUeze5nKugSvFr23adiKw5A1csQpfzpG7cyRt hvBycCmtm66eUvj8JupZUTDWVK4pPbxVcaimDTvAkOxkYs15DGV82folVnTK1ORSlTu0 SEx9KY1lw33Xwpv/BFDtXmzJ+s/fUVTxSq0RCGulVillgtTXiqOZU1e02hoJ+Z8U22pO j/4w== X-Forwarded-Encrypted: i=1; AJvYcCXH2F0njhAUoFqvAL55sYqBBuhsBdZ/6hWi3iZeS1eXKlmosarpwya++lleTF6Ag/SsPVFsCIHk3+X8Q80=@vger.kernel.org X-Gm-Message-State: AOJu0YzIEWoAcVqaqaAeR8EtQ0CEqKj/b/DI8+1lAfiZSuXUXE8DQHTK bws6f99X7xO27q5+BY30aM9CZ4PVMKJi3NZXPtyTuqtIiv10nVake6BKUCSQgg== X-Gm-Gg: AZuq6aJK6wmikHOdx2lsrmrDRoNM7DZV0DD43hdh79/gznCDtEDvefFoydLUIBpjFQt n0zn0B0e5YjhNhRvQRvpPxVFHQxcywAJ0HcpJZt/icS+iGoCta3bIOrkIfE7Yt2o2McGTCUVrYJ KCPk8u6bBsF2YYqyDAKG3+8vIcR5cPLDS5QsdePwwGuC5qd6He+cPEY+aSP3QcPCxO7h9mx9OD4 e7OumWobhKou98oAmu0CuWp3YRSXJPRjhZn4XtSPM3m+cew3RSskvcnHgeWA5pHX/Xnl1lVldSu Tz9Jq3u9Zwmdh/vU9NWMGHgVSVFeizllzLToH1O2wBSpBlD7odr6VPpIchOr2Li+vQ0TtnU9PU9 d7X+n/5dqpUi+Qp9DtLtijMnB+ppCWZ96OnxcjlxgQbphm2a7TyTxuTlzmxBNbHTpl/hSVuJJEE swgy+Yx0MpLRN1M62QMQyDX/GaO+bYvls60r+Ksxbg3lPpLgN+RHZolH/1K0tulfss2rPjeAP1x F0rMRM= X-Received: by 2002:a05:6000:2601:b0:436:3707:2bfb with SMTP id ffacd0b85a97d-4379db934a8mr33089800f8f.34.1771554406141; Thu, 19 Feb 2026 18:26:46 -0800 (PST) Received: from Arch-Spectre.dur.ac.uk ([129.234.0.168]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-43796ad0166sm53446975f8f.35.2026.02.19.18.26.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Feb 2026 18:26:45 -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 v2 2/3] drm/syncobj: Add DRM_SYNCOBJ_WAIT_FLAGS_ABORT_ON_ERROR ioctl flag Date: Fri, 20 Feb 2026 02:26:27 +0000 Message-ID: <20260220022631.2205037-3-yiconghui@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260220022631.2205037-1-yiconghui@gmail.com> References: <20260220022631.2205037-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 --- drivers/gpu/drm/drm_syncobj.c | 25 +++++++++++++++++++++---- include/uapi/drm/drm.h | 1 + 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/drm_syncobj.c b/drivers/gpu/drm/drm_syncobj.c index 322f64b72775..fb55fd46fb84 100644 --- a/drivers/gpu/drm/drm_syncobj.c +++ b/drivers/gpu/drm/drm_syncobj.c @@ -1139,6 +1139,13 @@ static signed long drm_syncobj_array_wait_timeout(st= ruct drm_syncobj **syncobjs, if (!fence) continue; =20 + if ((flags & DRM_SYNCOBJ_WAIT_FLAGS_ABORT_ON_ERROR) && fence->error) { + if (idx) + *idx =3D i; + timeout =3D fence->error; + goto done_waiting; + } + if ((flags & DRM_SYNCOBJ_WAIT_FLAGS_WAIT_AVAILABLE) || dma_fence_is_signaled(fence) || (!entries[i].fence_cb.func && @@ -1242,8 +1249,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 +1264,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 +1347,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 +1392,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 2640cc0a09fe..bc958af5a910 100644 --- a/include/uapi/drm/drm.h +++ b/include/uapi/drm/drm.h @@ -977,6 +977,7 @@ 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 */ +#define DRM_SYNCOBJ_WAIT_FLAGS_ABORT_ON_ERROR (1 << 4) /* abort upon any f= ence failure return err */ struct drm_syncobj_wait { __u64 handles; /* absolute timeout */ --=20 2.53.0