From nobody Wed Feb 5 19:59:40 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 3C142216604 for ; Tue, 4 Feb 2025 14:59:33 +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=1738681174; cv=none; b=gMk2SuPPFWKjaRYJSbsMCMJ9Q08gssfwS87kbzrHnvS2IupA31Z35Bs3lXGE46ApyRlFIwKn4X1rRMznTl0W5d36rJzXX8x1hXdkgJA0pAzdAoSjXFqro5uRpOOnnNIUmkN6bEIukkHjxmJBUAsGIc1Lcc9G6X1D+ALxPgoFZNs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738681174; c=relaxed/simple; bh=tFfKlGt5RgPkNRrTsf4WzrnPOiwCyYjT9iW7xh93qcc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=OMOE+2Mmr4MstOwDa2zAvR1j8GIAe2xxJm3z1widCiPZwz8dA2KeHnpaRlp/qlr7mODMk1XtqL6z58CywbF2hZpTEuFG82OUzcjty1FyVlPhGgqbE2X/1KfPMy6sEAv8RtJDBF0VQzhAiWYG5vfzkzh7UiU01n9bxm7xy9hPXaY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=nX+1MVXm; 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="nX+1MVXm" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5E16CC4CEDF; Tue, 4 Feb 2025 14:59:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1738681173; bh=tFfKlGt5RgPkNRrTsf4WzrnPOiwCyYjT9iW7xh93qcc=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=nX+1MVXm+faCKMAvWUz3Tvqu8fcmR/WZUwfCfQT42XCPwcpFVPL84HHcS1VRCHeeC V3yfpOPzK4XkloJ7nB/L+Wzj4n+pKCJZQzGYfr8ZGOYibZfLU5XJAQyxuUgYO+HOCV pQQQ8Zf5Cqf3ivAcNiaJcozHGc+AvNn4iJVvhsyn06DPG2s+CL7R07Y+VqIBFlkhWr 3pEkkqGSq305J7d86NM5ZJc/QBOUVpeKY83Rz3gbB4retR7NCmtNzCZkOu6uQ4fmdD A2xl5nKRRY9vUAgojhkxicXv/eUy/MyME3w0DQ7AJy6b6VPW7KqpgRyXvGrh0rtF7i CvwOeiIZa8AGQ== From: Maxime Ripard Date: Tue, 04 Feb 2025 15:57:45 +0100 Subject: [PATCH v2 17/35] drm/atomic-helper: Change parameter name of drm_atomic_helper_commit_modeset_enables() 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: <20250204-bridge-connector-v2-17-35dd6c834e08@kernel.org> References: <20250204-bridge-connector-v2-0-35dd6c834e08@kernel.org> In-Reply-To: <20250204-bridge-connector-v2-0-35dd6c834e08@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=4126; i=mripard@kernel.org; h=from:subject:message-id; bh=tFfKlGt5RgPkNRrTsf4WzrnPOiwCyYjT9iW7xh93qcc=; b=owGbwMvMwCmsHn9OcpHtvjLG02pJDOmLtD788A//MGfdwzD7vd9Pv3nAo7Pc7W5sz/RDev/3y u8u9F+o0zGVhUGYk0FWTJHliUzY6eXti6sc7Ff+gJnDygQyhIGLUwAmklfE2LDV2NavuOh3L59i nHtwc+HzRz8mMtQEKbHMnrzjefiz3HOHn8psUm18yb+xyCswYqbFYsY6c7eSm5yX92yTyHP6rLq epdXwJ2e+ZkoBy+1rd96emre9jdvymkvcqTuLDl69ukV/ldclAA== X-Developer-Key: i=mripard@kernel.org; a=openpgp; fpr=BE5675C37E818C8B5764241C254BCFC56BF6CE8D drm_atomic_helper_commit_modeset_enables() enables all outputs affected by a new commit. It takes the drm_atomic_state being committed as a parameter. However, that parameter name is called (and documented) as old_state, which is pretty confusing. Let's rename that variable as state. Signed-off-by: Maxime Ripard --- drivers/gpu/drm/drm_atomic_helper.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atom= ic_helper.c index 9f3cf5df0dd810e3725bf44a02a9574f676f17de..b95e30dee1b4e2ba8991affd1e2= 80a7a36171afd 100644 --- a/drivers/gpu/drm/drm_atomic_helper.c +++ b/drivers/gpu/drm/drm_atomic_helper.c @@ -1474,11 +1474,11 @@ static void drm_atomic_helper_commit_writebacks(str= uct drm_device *dev, } =20 /** * drm_atomic_helper_commit_modeset_enables - modeset commit to enable out= puts * @dev: DRM device - * @old_state: atomic state object with old state structures + * @state: atomic state object being committed * * This function enables all the outputs with the new configuration which = had to * be turned off for the update. * * For compatibility with legacy CRTC helpers this should be called after @@ -1486,20 +1486,20 @@ static void drm_atomic_helper_commit_writebacks(str= uct drm_device *dev, * does. But drivers with different needs can group the modeset commits to= gether * and do the plane commits at the end. This is useful for drivers doing r= untime * PM since planes updates then only happen when the CRTC is actually enab= led. */ void drm_atomic_helper_commit_modeset_enables(struct drm_device *dev, - struct drm_atomic_state *old_state) + struct drm_atomic_state *state) { struct drm_crtc *crtc; struct drm_crtc_state *old_crtc_state; struct drm_crtc_state *new_crtc_state; struct drm_connector *connector; struct drm_connector_state *new_conn_state; int i; =20 - for_each_oldnew_crtc_in_state(old_state, crtc, old_crtc_state, new_crtc_s= tate, i) { + for_each_oldnew_crtc_in_state(state, crtc, old_crtc_state, new_crtc_state= , i) { const struct drm_crtc_helper_funcs *funcs; =20 /* Need to filter out CRTCs where only planes change. */ if (!drm_atomic_crtc_needs_modeset(new_crtc_state)) continue; @@ -1511,17 +1511,17 @@ void drm_atomic_helper_commit_modeset_enables(struc= t drm_device *dev, =20 if (new_crtc_state->enable) { drm_dbg_atomic(dev, "enabling [CRTC:%d:%s]\n", crtc->base.id, crtc->name); if (funcs->atomic_enable) - funcs->atomic_enable(crtc, old_state); + funcs->atomic_enable(crtc, state); else if (funcs->commit) funcs->commit(crtc); } } =20 - for_each_new_connector_in_state(old_state, connector, new_conn_state, i) { + for_each_new_connector_in_state(state, connector, new_conn_state, i) { const struct drm_encoder_helper_funcs *funcs; struct drm_encoder *encoder; struct drm_bridge *bridge; =20 if (!new_conn_state->best_encoder) @@ -1540,25 +1540,25 @@ void drm_atomic_helper_commit_modeset_enables(struc= t drm_device *dev, /* * Each encoder has at most one connector (since we always steal * it away), so we won't call enable hooks twice. */ bridge =3D drm_bridge_chain_get_first_bridge(encoder); - drm_atomic_bridge_chain_pre_enable(bridge, old_state); + drm_atomic_bridge_chain_pre_enable(bridge, state); =20 if (funcs) { if (funcs->atomic_enable) - funcs->atomic_enable(encoder, old_state); + funcs->atomic_enable(encoder, state); else if (funcs->enable) funcs->enable(encoder); else if (funcs->commit) funcs->commit(encoder); } =20 - drm_atomic_bridge_chain_enable(bridge, old_state); + drm_atomic_bridge_chain_enable(bridge, state); } =20 - drm_atomic_helper_commit_writebacks(dev, old_state); + drm_atomic_helper_commit_writebacks(dev, state); } EXPORT_SYMBOL(drm_atomic_helper_commit_modeset_enables); =20 /* * For atomic updates which touch just a single CRTC, calculate the time o= f the --=20 2.48.0