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 830DECAC598 for ; Tue, 16 Sep 2025 07:18:20 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3663210E6B8; Tue, 16 Sep 2025 07:18:20 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="Tl92A/sO"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.11]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0636310E6B2; Tue, 16 Sep 2025 07:18:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1758007099; x=1789543099; h=from:date:subject:mime-version:content-transfer-encoding: message-id:references:in-reply-to:to:cc; bh=spY0WVM8M/bc3DCWkWz1OrPF6vy0XFYM/+ppkartCvU=; b=Tl92A/sORhdVOFc/Zla1r1wBqEFd1VU+8bFbORakDRAJzgcxdM5AH8g5 nouXqeOjiMNEp/mCIXv8x/Rp6vPcujq3mm5EF9mZfgZmtNnfxcPtL/Rex 7elOvfpYPq6LBGq5nl+yhSW1P2XMXF4fjAKynMPdRbuc7IEM2F4TnOWmE uXqN6InYNkdWVJLenSUZdqIdDb8C+iFxT3EHY5hE1CKwF+d/PuWct6+zD Qw24zDFRoV3crIGiwMbIsvTWxLe3DtGct5tmsmPqa+4MkiOqvltKv/LRO CnQR1fFvdXx6/qkMCBoMZwJp9e0JSwu0Nst811P5aIDFHWQWo0XCas96p w==; X-CSE-ConnectionGUID: E3jpemvwR26nN8DU7Z4u9g== X-CSE-MsgGUID: ltKxRIeMQ+yhc53a8mvU0A== X-IronPort-AV: E=McAfee;i="6800,10657,11554"; a="70526989" X-IronPort-AV: E=Sophos;i="6.18,268,1751266800"; d="scan'208";a="70526989" Received: from fmviesa010.fm.intel.com ([10.60.135.150]) by orvoesa103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Sep 2025 00:18:18 -0700 X-CSE-ConnectionGUID: Z7aJFicPSpCKGxpLI2DTdw== X-CSE-MsgGUID: BdMpruHCQO+K2GcuAAXE0Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.18,268,1751266800"; d="scan'208";a="175650839" Received: from srr4-3-linux-106-armuthy.iind.intel.com ([10.190.238.56]) by fmviesa010.fm.intel.com with ESMTP; 16 Sep 2025 00:18:13 -0700 From: Arun R Murthy Date: Tue, 16 Sep 2025 12:48:14 +0530 Subject: [PATCH v5 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: <20250916-atomic-v5-4-821525cfbf25@intel.com> References: <20250916-atomic-v5-0-821525cfbf25@intel.com> In-Reply-To: <20250916-atomic-v5-0-821525cfbf25@intel.com> To: David Airlie , Simona Vetter , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Jani Nikula , Rodrigo Vivi , Joonas Lahtinen , Tvrtko Ursulin , xaver.hugl@kde.org, harry.wentland@amd.com, uma.shankar@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: 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 3ef478e717bec917d1b8803c72bbcc8d6409d745..3d4e9709e8e289cf302413e171b1336812d65c1c 100644 --- a/drivers/gpu/drm/drm_atomic_uapi.c +++ b/drivers/gpu/drm/drm_atomic_uapi.c @@ -1036,6 +1036,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; } @@ -1058,6 +1063,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; } @@ -1096,9 +1106,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; } } @@ -1393,6 +1404,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; @@ -1401,6 +1413,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; @@ -1409,31 +1429,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(struct drm_mode_atomic_err_code)); + /* 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, + "DRM_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; @@ -1442,9 +1466,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; } retry: @@ -1543,6 +1569,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