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 8EF9ECCD187 for ; Thu, 9 Oct 2025 09:32:41 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 2A61010E9A6; Thu, 9 Oct 2025 09:32:41 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="Ds6H1igv"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.12]) by gabe.freedesktop.org (Postfix) with ESMTPS id D8FC310E9A6; Thu, 9 Oct 2025 09:32:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1760002360; x=1791538360; h=from:date:subject:mime-version:content-transfer-encoding: message-id:references:in-reply-to:to:cc; bh=5mO0d1Y1AysZOGgld749dqitAb9XaOT4Peszik4oakc=; b=Ds6H1igviKlMFDIvyx7Ps3Nltgoe9CqItrbLkok8FNRHolQT9HVNnvtx cw+vN9M8q/VgUMZVKz7gWrPr/0/39tt8L9RdwOD/qpiNyg+irBXW7FDvh Cc5Icmuo+Ma3scLwYSyc0C1plg3zuvpKJ/yVtMNeFXBP2M+fQuGDxStyK Vhi8R7y0om0Pv5CfGZ80HQ5kxq7SwvAda0Qja7QhP4PULDQw+Lo3UqW7+ 7Dvoa8rTY0Dz+znLmhA3osyzsAGKxnKLtNoJ2WZ8yIZtFMOh7c3q/78ii zTwmcXcNxDyTkJWYpafO2HTPaZVOBes0Y9/KogSAfpu1fGT8gxkMtephJ A==; X-CSE-ConnectionGUID: Ll4l/iefSv+ZqyhvODDFSw== X-CSE-MsgGUID: Av+fRLrhQFO13hU0nu2zBw== X-IronPort-AV: E=McAfee;i="6800,10657,11576"; a="66060846" X-IronPort-AV: E=Sophos;i="6.19,215,1754982000"; d="scan'208";a="66060846" Received: from orviesa005.jf.intel.com ([10.64.159.145]) by fmvoesa106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Oct 2025 02:32:39 -0700 X-CSE-ConnectionGUID: 2cYKhbC1RrKnmFE00kItKg== X-CSE-MsgGUID: VKz+bg0mR1OoR/WnlUNfCg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.19,215,1754982000"; d="scan'208";a="185789603" Received: from srr4-3-linux-106-armuthy.iind.intel.com ([10.190.238.56]) by orviesa005.jf.intel.com with ESMTP; 09 Oct 2025 02:32:34 -0700 From: Arun R Murthy Date: Thu, 09 Oct 2025 15:02:50 +0530 Subject: [PATCH v6 2/5] drm/atomic: Add error_code element in atomic_state MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20251009-atomic-v6-2-d209709cc3ba@intel.com> References: <20251009-atomic-v6-0-d209709cc3ba@intel.com> In-Reply-To: <20251009-atomic-v6-0-d209709cc3ba@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-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Now that a proper error code will be returned to the user on any failure in atomic_ioctl() via struct drm_mode_atomic, add a new element error_code in the struct drm_atomic_state so as to hold the error code during the atomic_check() and atomic_commit() phases. New function added to print the error message and fill the struct err_code with proper error message and error code. v5: Add a function for printing the error message and filling err_code struct v6: Replace drm_err with drm_dbg_atomic print Signed-off-by: Arun R Murthy --- drivers/gpu/drm/drm_atomic.c | 31 +++++++++++++++++++++++++++++++ include/drm/drm_atomic.h | 10 ++++++++++ 2 files changed, 41 insertions(+) diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c index 0fda567c390057b10bce691d9ddc11308088d92e..52eacb5a109d1c0f5b017e552d9f5169f8d8fea5 100644 --- a/drivers/gpu/drm/drm_atomic.c +++ b/drivers/gpu/drm/drm_atomic.c @@ -1897,6 +1897,37 @@ void drm_state_dump(struct drm_device *dev, struct drm_printer *p) } EXPORT_SYMBOL(drm_state_dump); +/** + * drm_mode_atomic_add_error_msg - function to add error code and error string + * + * @err_code: pointer to struct drm_mode_atomic_err_code that stores the failure + * reason + * @failure_code: failure code in enum drm_mode_atomic_failure_codes + * @failure_string: failure reason string message + * + * Returns: void + */ +void drm_mode_atomic_add_error_msg(struct drm_mode_atomic_err_code *err_code, + __u64 failure_code, const char *format, ...) +{ + struct drm_atomic_state *state = container_of(err_code, + struct drm_atomic_state, + error_code); + va_list varg; + char *failure_string; + + err_code->failure_code = failure_code; + + va_start(varg, format); + failure_string = kvasprintf(GFP_ATOMIC, format, varg); + + drm_dbg_atomic(state->dev, "%s\n", failure_string); + strscpy_pad(err_code->failure_string, failure_string, + sizeof(err_code->failure_string)); + va_end(varg); +} +EXPORT_SYMBOL(drm_mode_atomic_add_error_msg); + #ifdef CONFIG_DEBUG_FS static int drm_state_info(struct seq_file *m, void *data) { diff --git a/include/drm/drm_atomic.h b/include/drm/drm_atomic.h index c8ab2163bf658cd06b12a8dabada7c088a328654..205ce418da22f8cbe10ea353c62471dbb41ae2e8 100644 --- a/include/drm/drm_atomic.h +++ b/include/drm/drm_atomic.h @@ -589,6 +589,13 @@ struct drm_atomic_state { * commit without blocking. */ struct work_struct commit_work; + + /* @error_code: pointer to struct holding failure reason and string + * + * struct to convey user readable error to the user. + * Error codes defined in enum drm_mode_atomic_failure_flags + */ + struct drm_mode_atomic_err_code error_code; }; void __drm_crtc_commit_free(struct kref *kref); @@ -1259,5 +1266,8 @@ drm_atomic_get_old_bridge_state(const struct drm_atomic_state *state, struct drm_bridge_state * drm_atomic_get_new_bridge_state(const struct drm_atomic_state *state, struct drm_bridge *bridge); +__printf(3, 4) +void drm_mode_atomic_add_error_msg(struct drm_mode_atomic_err_code *err_code, + __u64 failure_code, const char *format, ...); #endif /* DRM_ATOMIC_H_ */ -- 2.25.1