From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 67876EA3F28 for ; Tue, 10 Feb 2026 09:06:01 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id BCAAC10E50D; Tue, 10 Feb 2026 09:06:00 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="kYfmKpMY"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.9]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9BD6510E500; Tue, 10 Feb 2026 09:05:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1770714359; x=1802250359; h=from:date:subject:mime-version:content-transfer-encoding: message-id:references:in-reply-to:to:cc; bh=EDqCut6760o59/mhBlcAikvdozOxp/5OiFVbJhPaJTQ=; b=kYfmKpMYjWu/z84e2aJnW78ZE3kgByM4O7+fPTazW15ytSLED1kGCzs3 SrzGphbrVqKE3pCSROge9Zt0dul8jvrnRV7TcE5ga7thXoDTIsPqKvFIl ftei3Sy3KagwuefUKsM83V3muCiZB3PARjsqz355veGFV6PLMOGgHf186 c9t5NvhNL/GIlR3k7ch6AGSGO02hVkWVCSQQGfkBlbTn0D3SGiQ4UcQBk kU6Hsc6R937BhlD4QlfmUD+5J3FfQOF3tVNuTp+MVrA0Im2AbOl04aTbo n4cn1ui4N7yOLWH+nCx5CQ5o8Rw/3akeqAZLlCmPrCCnsDGbHZ9fkOfoS w==; X-CSE-ConnectionGUID: 4H+HAlOfRuqji7gwQKL2aA== X-CSE-MsgGUID: 8HwwwH+mSUasTS7kpCTfVg== X-IronPort-AV: E=McAfee;i="6800,10657,11696"; a="94479207" X-IronPort-AV: E=Sophos;i="6.21,283,1763452800"; d="scan'208";a="94479207" Received: from orviesa002.jf.intel.com ([10.64.159.142]) by orvoesa101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Feb 2026 01:05:58 -0800 X-CSE-ConnectionGUID: IR0nQ4BpTia2fF1oeiy0RA== X-CSE-MsgGUID: E50hL+GWTsiq2Spfgku+1A== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.21,283,1763452800"; d="scan'208";a="242479019" Received: from srr4-3-linux-106-armuthy.iind.intel.com ([10.190.238.56]) by orviesa002.jf.intel.com with ESMTP; 10 Feb 2026 01:05:53 -0800 From: Arun R Murthy Date: Tue, 10 Feb 2026 14:33:59 +0530 Subject: [PATCH v9 5/7] drm/atomic: Return user readable error in atomic_ioctl MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260210-atomic-v9-5-525c88fd2402@intel.com> References: <20260210-atomic-v9-0-525c88fd2402@intel.com> In-Reply-To: <20260210-atomic-v9-0-525c88fd2402@intel.com> To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Jani Nikula , Rodrigo Vivi , Joonas Lahtinen , Tvrtko Ursulin , xaver.hugl@kde.org, harry.wentland@amd.com, uma.shankar@intel.com, louis.chauvet@bootlin.com, naveen1.kumar@intel.com, ramya.krishna.yella@intel.com Cc: dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org, Arun R Murthy X-Mailer: b4 0.15-dev X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Add user readable error codes for failure cases in drm_atomic_ioctl() so that user can decode the error code and take corrective measurements. v8: Replaced DRM_MODE_ATOMIC_ASYNC_NOT_SUPP_PLANE, DRM_MODE_ATOMIC_ASYNC_MODIFIER_NOT_SUPP with INVALID_API_USAGE (Xaver) v9: Move free atomic_state on error to patch 3 (Suraj) Signed-off-by: Arun R Murthy --- drivers/gpu/drm/drm_atomic_uapi.c | 58 +++++++++++++++++++++++++++++---------- 1 file changed, 44 insertions(+), 14 deletions(-) diff --git a/drivers/gpu/drm/drm_atomic_uapi.c b/drivers/gpu/drm/drm_atomic_uapi.c index bcd12b6eac4f497d2edb8581d9fb0fd54cbef827..f0c3f080f5d66c733dfbfa23f38a22132193adec 100644 --- a/drivers/gpu/drm/drm_atomic_uapi.c +++ b/drivers/gpu/drm/drm_atomic_uapi.c @@ -1196,6 +1196,11 @@ int drm_atomic_set_property(struct drm_atomic_state *state, ret = drm_atomic_connector_get_property(connector, connector_state, prop, &old_val); ret = drm_atomic_check_prop_changes(ret, old_val, prop_value, prop); + if (ret) { + drm_mode_atomic_add_error_msg(&state->error_code, + DRM_MODE_ATOMIC_ASYNC_PROP_CHANGED, + "property change not allowed in async flip"); + } break; } @@ -1218,6 +1223,11 @@ int drm_atomic_set_property(struct drm_atomic_state *state, ret = drm_atomic_crtc_get_property(crtc, crtc_state, prop, &old_val); ret = drm_atomic_check_prop_changes(ret, old_val, prop_value, prop); + if (ret) { + drm_mode_atomic_add_error_msg(&state->error_code, + DRM_MODE_ATOMIC_ASYNC_PROP_CHANGED, + "property change not allowed in async flip"); + } break; } @@ -1256,9 +1266,10 @@ int drm_atomic_set_property(struct drm_atomic_state *state, ret = plane_funcs->atomic_async_check(plane, state, true); if (ret) { - drm_dbg_atomic(prop->dev, - "[PLANE:%d:%s] does not support async flips\n", - obj->id, plane->name); + drm_mode_atomic_add_error_msg(&state->error_code, + DRM_MODE_ATOMIC_INVALID_API_USAGE, + "[PLANE:%d:%s] does not support async flip", + obj->id, plane->name); break; } } @@ -1568,6 +1579,7 @@ int drm_mode_atomic_ioctl(struct drm_device *dev, struct drm_atomic_state *state; struct drm_modeset_acquire_ctx ctx; struct drm_out_fence_state *fence_state; + struct drm_mode_atomic_err_code __user *error_code_ptr; int ret = 0; unsigned int i, j, num_fences = 0; bool async_flip = false; @@ -1576,6 +1588,14 @@ int drm_mode_atomic_ioctl(struct drm_device *dev, if (!drm_core_check_feature(dev, DRIVER_ATOMIC)) return -EOPNOTSUPP; + if (!arg->reserved) + drm_dbg_atomic(dev, + "memory not allocated for drm_atomic error reporting\n"); + else + /* Update the error code if any error to allow user handling it */ + error_code_ptr = (struct drm_mode_atomic_err_code __user *) + (unsigned long)arg->reserved; + state = drm_atomic_state_alloc(dev); if (!state) return -ENOMEM; @@ -1584,11 +1604,16 @@ int drm_mode_atomic_ioctl(struct drm_device *dev, state->acquire_ctx = &ctx; state->allow_modeset = !!(arg->flags & DRM_MODE_ATOMIC_ALLOW_MODESET); + memset(&state->error_code, 0, sizeof(*error_code_ptr)); + /* disallow for userspace that has not enabled atomic cap (even * though this may be a bit overkill, since legacy userspace * wouldn't know how to call this ioctl) */ if (!file_priv->atomic) { + drm_mode_atomic_add_error_msg(&state->error_code, + DRM_MODE_ATOMIC_INVALID_API_USAGE, + "drm atomic capability not enabled"); drm_dbg_atomic(dev, "commit failed: atomic cap not enabled\n"); ret = -EINVAL; @@ -1596,21 +1621,18 @@ int drm_mode_atomic_ioctl(struct drm_device *dev, } if (arg->flags & ~DRM_MODE_ATOMIC_FLAGS) { - drm_dbg_atomic(dev, "commit failed: invalid flag\n"); - ret = -EINVAL; - goto out; - } - - if (arg->reserved) { - drm_dbg_atomic(dev, "commit failed: reserved field set\n"); + drm_mode_atomic_add_error_msg(&state->error_code, + DRM_MODE_ATOMIC_INVALID_API_USAGE, + "invalid flag"); ret = -EINVAL; goto out; } if (arg->flags & DRM_MODE_PAGE_FLIP_ASYNC) { if (!dev->mode_config.async_page_flip) { - drm_dbg_atomic(dev, - "commit failed: DRM_MODE_PAGE_FLIP_ASYNC not supported\n"); + drm_mode_atomic_add_error_msg(&state->error_code, + DRM_MODE_ATOMIC_INVALID_API_USAGE, + "DRM_MODE_PAGE_FLIP_ASYNC not supported with ATOMIC ioctl"); ret = -EINVAL; goto out; } @@ -1621,8 +1643,9 @@ int drm_mode_atomic_ioctl(struct drm_device *dev, /* can't test and expect an event at the same time. */ if ((arg->flags & DRM_MODE_ATOMIC_TEST_ONLY) && (arg->flags & DRM_MODE_PAGE_FLIP_EVENT)) { - drm_dbg_atomic(dev, - "commit failed: page-flip event requested with test-only commit\n"); + drm_mode_atomic_add_error_msg(&state->error_code, + DRM_MODE_ATOMIC_INVALID_API_USAGE, + "page-flip event requested with test-only commit"); ret = -EINVAL; goto out; } @@ -1725,6 +1748,13 @@ int drm_mode_atomic_ioctl(struct drm_device *dev, } out: + /* Update the error code if any error to allow user handling it */ + if (ret < 0 && arg->reserved) { + if (copy_to_user(error_code_ptr, &state->error_code, + sizeof(state->error_code))) + return -EFAULT; + } + if (num_fences) complete_signaling(dev, state, fence_state, num_fences, !ret); -- 2.25.1