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 1E5C0CD0437 for ; Tue, 6 Jan 2026 04:40:13 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D687210E477; Tue, 6 Jan 2026 04:40:12 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="Y8+tFY5M"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.10]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9C66D10E46B; Tue, 6 Jan 2026 04:40:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1767674412; x=1799210412; h=from:date:subject:mime-version:content-transfer-encoding: message-id:references:in-reply-to:to:cc; bh=j8626lkfi8xRX50wmYnEeL5az7+XdywOnC6j/iZT+1o=; b=Y8+tFY5MtWULvVn1dunteAtTRhOT22XazHNguVwsjA8n5WqQ8y8SnUJD tvnAcIVCuSiFRmgrNPJsdmVbMVJ9iQQGBI8wkmT+RE6scpK01Qsh2JRax weoc2IrnMUp4cr8Y2rghCNaHlsSvIFFMxfWVFJoHg6KCh7+cXqc2pqi0M SOhIeNJDrCMJ7LOUimLKnof2l+rcp1EqM4ni3Jwy820Htmy3s1q7PNluh 9EJh3Tk/7V8NfT+8d+MnuEbiPfTz7MpveF2S/Xf/dx3VS60VFX5ABwV/U f8FG32xi66RtRZb40aIblGKaXWXPUIYXgNRNqgYb6rkMtrItkEbmaR3bH A==; X-CSE-ConnectionGUID: xAWQIM/iRKKhDm0vg00N0w== X-CSE-MsgGUID: im09E42VRbuHmFn88+PGkg== X-IronPort-AV: E=McAfee;i="6800,10657,11662"; a="86459352" X-IronPort-AV: E=Sophos;i="6.21,204,1763452800"; d="scan'208";a="86459352" Received: from fmviesa005.fm.intel.com ([10.60.135.145]) by orvoesa102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jan 2026 20:40:11 -0800 X-CSE-ConnectionGUID: uigvFjZbT2Cybmq5am1ssQ== X-CSE-MsgGUID: Y9dqYj2wSJ2oZgqec6kDBQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.21,204,1763452800"; d="scan'208";a="207034409" Received: from srr4-3-linux-106-armuthy.iind.intel.com ([10.190.238.56]) by fmviesa005.fm.intel.com with ESMTP; 05 Jan 2026 20:40:06 -0800 From: Arun R Murthy Date: Tue, 06 Jan 2026 10:07:59 +0530 Subject: [PATCH v7 4/5] 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: <20260106-atomic-v7-4-d51d9a351684@intel.com> References: <20260106-atomic-v7-0-d51d9a351684@intel.com> In-Reply-To: <20260106-atomic-v7-0-d51d9a351684@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 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: intel-xe@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel Xe graphics driver List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-xe-bounces@lists.freedesktop.org Sender: "Intel-xe" Add user readable error codes for failure cases in drm_atomic_ioctl() so that user can decode the error code and take corrective measurements. Signed-off-by: Arun R Murthy --- drivers/gpu/drm/drm_atomic_uapi.c | 71 ++++++++++++++++++++++++++++----------- 1 file changed, 52 insertions(+), 19 deletions(-) diff --git a/drivers/gpu/drm/drm_atomic_uapi.c b/drivers/gpu/drm/drm_atomic_uapi.c index 02029b5d7832eeaf4a225096a94947344083fc0b..909c71bc88122ee57cf82eefe5588c42a5d4a037 100644 --- a/drivers/gpu/drm/drm_atomic_uapi.c +++ b/drivers/gpu/drm/drm_atomic_uapi.c @@ -1180,6 +1180,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; } @@ -1202,6 +1207,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; } @@ -1240,9 +1250,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_ASYNC_NOT_SUPP_PLANE, + "[PLANE:%d:%s] does not support async flip", + obj->id, plane->name); break; } } @@ -1552,6 +1563,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; @@ -1560,6 +1572,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; @@ -1568,31 +1588,35 @@ 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_dbg_atomic(dev, - "commit failed: atomic cap not enabled\n"); - return -EINVAL; + drm_mode_atomic_add_error_msg(&state->error_code, + DRM_MODE_ATOMIC_INVALID_API_USAGE, + "arm atomic capability not enabled"); + ret = -EINVAL; + goto out; } if (arg->flags & ~DRM_MODE_ATOMIC_FLAGS) { - drm_dbg_atomic(dev, "commit failed: invalid flag\n"); - return -EINVAL; - } - - if (arg->reserved) { - drm_dbg_atomic(dev, "commit failed: reserved field set\n"); - return -EINVAL; + 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"); - return -EINVAL; + 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; } async_flip = true; @@ -1601,9 +1625,11 @@ 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"); - return -EINVAL; + 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; } state->plane_color_pipeline = file_priv->plane_color_pipeline; @@ -1704,6 +1730,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