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 84154EA3F2A for ; Tue, 10 Feb 2026 09:05:49 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id DF71010E505; Tue, 10 Feb 2026 09:05:48 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="JJJccv6l"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.9]) by gabe.freedesktop.org (Postfix) with ESMTPS id C7CA910E502; Tue, 10 Feb 2026 09:05:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1770714348; x=1802250348; h=from:date:subject:mime-version:content-transfer-encoding: message-id:references:in-reply-to:to:cc; bh=k8KcQizw1EiNdyHN4iPqr5qMyTflmY57Kt5kExxUANA=; b=JJJccv6l/4AZBqB6i8oND1H/QVlmsmOa2Rymsh6zD4hKn184ZZggWtZM juWfNsC8Tmz+KbfYfVSTk3SrjWFNRa1SRGZqGeq973Jv/x/chc5515QeK xP7IcPNvFhzR+v0+qmA2Wpanz3FIDOjOZ3gruAqqb4XP2/1EB0lrhngjt j+5loItB7PtbRQngCHvKEnK9nVIN/T+Yp5v6b9CgjVyK6Wa9qDYG+jCTR zLqkBL7qvFKvomfZ7NwQDYC3ZGntt5Qye1cigk8BJs7EX0eoPxTTacTGe 9fVbpjpzoNeXLWW+8RipgZQAggRI23lJA1xLELHu9FNBb+vfAuogiHb8A A==; X-CSE-ConnectionGUID: ClAEnYVFRl2y7lT4EEdloQ== X-CSE-MsgGUID: KBM6AM9lQh+qzRhoEfWlbA== X-IronPort-AV: E=McAfee;i="6800,10657,11696"; a="94479183" X-IronPort-AV: E=Sophos;i="6.21,283,1763452800"; d="scan'208";a="94479183" 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:48 -0800 X-CSE-ConnectionGUID: tDDJZNXeQey2T4vuYgVXpA== X-CSE-MsgGUID: HpwlbdTZR7+mRCeSW6R1vw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.21,283,1763452800"; d="scan'208";a="242478973" 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:42 -0800 From: Arun R Murthy Date: Tue, 10 Feb 2026 14:33:57 +0530 Subject: [PATCH v9 3/7] drm/atomic: Allocate atomic_state at the beginning of atomic_ioctl MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260210-atomic-v9-3-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" Move atomic_state allocation to the beginning of the atomic_ioctl to accommodate drm_mode_atomic_err_code usage for returning error code on failures. As atomic state is required for drm_mode_atomic_err_code to store the error codes. v7: Reframe commit message (Suraj) v8: Moved the clearing fence change to a different patch (Suraj/Louis) v9: Free allocated atomic_state before return on error, move this change from patch 5 (Suraj) Signed-off-by: Arun R Murthy --- drivers/gpu/drm/drm_atomic_uapi.c | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/drivers/gpu/drm/drm_atomic_uapi.c b/drivers/gpu/drm/drm_atomic_uapi.c index dc013a22bf265512a4fa1edf0ae90931ff0d35e6..c228c9aed75acdb09a80df5dad54440a5c182254 100644 --- a/drivers/gpu/drm/drm_atomic_uapi.c +++ b/drivers/gpu/drm/drm_atomic_uapi.c @@ -1576,6 +1576,14 @@ int drm_mode_atomic_ioctl(struct drm_device *dev, if (!drm_core_check_feature(dev, DRIVER_ATOMIC)) return -EOPNOTSUPP; + state = drm_atomic_state_alloc(dev); + if (!state) + return -ENOMEM; + + drm_modeset_acquire_init(&ctx, DRM_MODESET_ACQUIRE_INTERRUPTIBLE); + state->acquire_ctx = &ctx; + state->allow_modeset = !!(arg->flags & DRM_MODE_ATOMIC_ALLOW_MODESET); + /* 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) @@ -1583,24 +1591,28 @@ int drm_mode_atomic_ioctl(struct drm_device *dev, if (!file_priv->atomic) { drm_dbg_atomic(dev, "commit failed: atomic cap not enabled\n"); - return -EINVAL; + ret = -EINVAL; + goto out; } if (arg->flags & ~DRM_MODE_ATOMIC_FLAGS) { drm_dbg_atomic(dev, "commit failed: invalid flag\n"); - return -EINVAL; + ret = -EINVAL; + goto out; } if (arg->reserved) { drm_dbg_atomic(dev, "commit failed: reserved field set\n"); - return -EINVAL; + 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; + ret = -EINVAL; + goto out; } async_flip = true; @@ -1611,16 +1623,10 @@ int drm_mode_atomic_ioctl(struct drm_device *dev, (arg->flags & DRM_MODE_PAGE_FLIP_EVENT)) { drm_dbg_atomic(dev, "commit failed: page-flip event requested with test-only commit\n"); - return -EINVAL; + ret = -EINVAL; + goto out; } - state = drm_atomic_state_alloc(dev); - if (!state) - return -ENOMEM; - - drm_modeset_acquire_init(&ctx, DRM_MODESET_ACQUIRE_INTERRUPTIBLE); - state->acquire_ctx = &ctx; - state->allow_modeset = !!(arg->flags & DRM_MODE_ATOMIC_ALLOW_MODESET); state->plane_color_pipeline = file_priv->plane_color_pipeline; retry: -- 2.25.1