From nobody Wed Feb 5 17:09:44 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1F0D41DAC95 for ; Wed, 15 Jan 2025 21:05:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736975145; cv=none; b=Zpww/IsQMD265AOk8u8ku6pCTCJRSUbNDJ0IRXPIAwYMl3d8MHkb4F0YLWV3CGvS8/H88mqT6P6LQz3R9rU/5ylGIB/UQUHg9nfCQ7xVPgqZXprh/RAnGMaAEZPVcgdtacjs1QiKTaSDzTl35+RLab2xwHAX05fN4HP8ZekWGrU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736975145; c=relaxed/simple; bh=6ckx9CZvlTSjCbDIC22eA0KmGebnaJfAaI11J96XgL8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=G0RlWN+jBiCZ6QOIXJ9Fk4TicArwpxyKn0McuXweEDVgF1jW6Dv6mPsTXHhGKx6sk5X+RglXcWbpwKHYK35OnEBLmr7Pofr6rPkJpUXcudxXSh+HXl1hpzpeHNXgTdLlTwnlDfYWZIE30/Y59MRxiTmwdRVpfIcVJCUuDzmNjnw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=X7oDNsbM; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="X7oDNsbM" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 40E4FC4CEE1; Wed, 15 Jan 2025 21:05:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1736975144; bh=6ckx9CZvlTSjCbDIC22eA0KmGebnaJfAaI11J96XgL8=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=X7oDNsbMUqOZ2nxr1qXnWSQw7tTXhewLgar4NWvbIae+PH/3Z7FpRpijNxQac1RRQ MNr1OBnYuCfwVDcuOuyf+KZKAuZ4IR6K8qDF2nvyqH7raxb66LI7UkYXUVrvCCV70Y NPSqVXylaN+c3OotEuvR0BdiPA0kbRNdTuGXzKEoevH5CdN/6Eqmqcl3WUrcbcswNf QPVENMDuUp9WmBixya1VTl2Nw/Fn3ZXBMd7NFA0MVcBKBGaEat/uGbC3TWjFv8VL7r eIScfZ0UBoczeaLhFl2MaKGWUYlTLt25lP0N7mh/fbLsaJMCfzhgBv9qPgp9wk+q3m oIdFYm2ddEPPg== From: Maxime Ripard Date: Wed, 15 Jan 2025 22:05:08 +0100 Subject: [PATCH 01/29] drm/atomic-helper: Fix commit_tail state variable name Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250115-bridge-connector-v1-1-9a2fecd886a6@kernel.org> References: <20250115-bridge-connector-v1-0-9a2fecd886a6@kernel.org> In-Reply-To: <20250115-bridge-connector-v1-0-9a2fecd886a6@kernel.org> To: Maarten Lankhorst , Thomas Zimmermann , David Airlie , Simona Vetter , Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , Douglas Anderson Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Maxime Ripard X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=3025; i=mripard@kernel.org; h=from:subject:message-id; bh=6ckx9CZvlTSjCbDIC22eA0KmGebnaJfAaI11J96XgL8=; b=owGbwMvMwCmsHn9OcpHtvjLG02pJDOkdyqLs60OP2j15q3Fr1oPYCRf+OW0omv2BP+lSok9Ia 6SZ+APOjqksDMKcDLJiiixPZMJOL29fXOVgv/IHzBxWJpAhDFycAjARy1DG+uKC563zLOaW/z4m f0jCJne567pv3DP+phy1CEsQOmQmePJwmNW6KyznLr//oGH0jdfiAWM1u3LH6bpiEd+/C7fNiJR ecP35R7uY8jPzp7T/CtzR3Zf1PtC6kfuW4NUPJxwFWl6JulsCAA== X-Developer-Key: i=mripard@kernel.org; a=openpgp; fpr=BE5675C37E818C8B5764241C254BCFC56BF6CE8D Even though the commit_tail () drm_atomic_state parameter is called old_state, it's actually the state being committed which is confusing. It's even more confusing since the atomic_commit_tail hook being called by commit_tail() parameter is called state. Let's rename the variable from old_state to state to make it less confusing. Signed-off-by: Maxime Ripard --- drivers/gpu/drm/drm_atomic_helper.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atom= ic_helper.c index 40e4e1b6c9110677c1c4981eeb15dc93966f4cf6..913d94d664d885323ad7e41a642= 4633c28c787e1 100644 --- a/drivers/gpu/drm/drm_atomic_helper.c +++ b/drivers/gpu/drm/drm_atomic_helper.c @@ -1818,13 +1818,13 @@ void drm_atomic_helper_commit_tail_rpm(struct drm_a= tomic_state *old_state) =20 drm_atomic_helper_cleanup_planes(dev, old_state); } EXPORT_SYMBOL(drm_atomic_helper_commit_tail_rpm); =20 -static void commit_tail(struct drm_atomic_state *old_state) +static void commit_tail(struct drm_atomic_state *state) { - struct drm_device *dev =3D old_state->dev; + struct drm_device *dev =3D state->dev; const struct drm_mode_config_helper_funcs *funcs; struct drm_crtc_state *new_crtc_state; struct drm_crtc *crtc; ktime_t start; s64 commit_time_ms; @@ -1842,37 +1842,37 @@ static void commit_tail(struct drm_atomic_state *ol= d_state) * These times will be averaged out in the self refresh helpers to avoid * overreacting over one outlier frame */ start =3D ktime_get(); =20 - drm_atomic_helper_wait_for_fences(dev, old_state, false); + drm_atomic_helper_wait_for_fences(dev, state, false); =20 - drm_atomic_helper_wait_for_dependencies(old_state); + drm_atomic_helper_wait_for_dependencies(state); =20 /* * We cannot safely access new_crtc_state after * drm_atomic_helper_commit_hw_done() so figure out which crtc's have * self-refresh active beforehand: */ - for_each_new_crtc_in_state(old_state, crtc, new_crtc_state, i) + for_each_new_crtc_in_state(state, crtc, new_crtc_state, i) if (new_crtc_state->self_refresh_active) new_self_refresh_mask |=3D BIT(i); =20 if (funcs && funcs->atomic_commit_tail) - funcs->atomic_commit_tail(old_state); + funcs->atomic_commit_tail(state); else - drm_atomic_helper_commit_tail(old_state); + drm_atomic_helper_commit_tail(state); =20 commit_time_ms =3D ktime_ms_delta(ktime_get(), start); if (commit_time_ms > 0) - drm_self_refresh_helper_update_avg_times(old_state, + drm_self_refresh_helper_update_avg_times(state, (unsigned long)commit_time_ms, new_self_refresh_mask); =20 - drm_atomic_helper_commit_cleanup_done(old_state); + drm_atomic_helper_commit_cleanup_done(state); =20 - drm_atomic_state_put(old_state); + drm_atomic_state_put(state); } =20 static void commit_work(struct work_struct *work) { struct drm_atomic_state *state =3D container_of(work, --=20 2.47.1