From nobody Wed Feb 5 16:58:18 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 0438C1DC9AE for ; Wed, 15 Jan 2025 21:05:58 +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=1736975159; cv=none; b=oThxjHhtBm3h+/g1yTI2sU6uG8DoJJGskE4lyKasUF2O/yu8smS9h9DI9pYYc3GYNHZagvf2prTwpkvPhihxDZxKGZL6nWMvr2lpZrunhO7DscCYdirHSabZmKilx8oEaq5zlmZbTxxyy8aCR5NORgjFomDiGzNPz+mhX6eEaqE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736975159; c=relaxed/simple; bh=jrW4OZul1IIHd+cW8sCFwOefiIlmodcDT+REyvjTBCU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=PH2+IFMG6RfskuUOq6d6WnRZ+IjvnYaAiI/eIjAhcn5Om/spwPEChJ8LIYBObEG0Gs15DfQ9R9gMJ1LZukZb2QxfvW8So2CaHHRV0UeITdcmrUy9Vv4P1gRzVQPhRN3vDhTMn20MahgEREGudQmg+5COfbPsoNJo3HYNjFzpH+Q= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=CtJJQf+q; 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="CtJJQf+q" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8503EC4CEE2; Wed, 15 Jan 2025 21:05:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1736975158; bh=jrW4OZul1IIHd+cW8sCFwOefiIlmodcDT+REyvjTBCU=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=CtJJQf+qSBrfDDMoIKGI3QTIV/BLFgIyacJHlD6jJ2TTZsVoDbm4laxEv8lQPYxHV /4FnlZfcvJfiBnLsDf/Nk+9olC4AcHpDO0aTrlAw4EvY17+oZjDhLaqhw47wgwequA nOJom8DRvkgaD15+Fp18/HPnm4a5bUlJR3GqW7acFjRQmwlbkkgRfvYq+irRf9p5Va q7lhdFIDuznrVwB+IhiPpks+Kava/xWCS89+1SzJyHeyg3e6ItkKlI6pqWC7uJ4iNg RRankKOmsbVDBcdTvBeq7X/nFsn+BzLvweZEw9daQ00VEsnqrsF/Qh2+FGb35OkFgU 0ScIoF9DP1mRw== From: Maxime Ripard Date: Wed, 15 Jan 2025 22:05:13 +0100 Subject: [PATCH 06/29] drm/atomic-helper: Change parameter name of disable_outputs() 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-6-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=4016; i=mripard@kernel.org; h=from:subject:message-id; bh=jrW4OZul1IIHd+cW8sCFwOefiIlmodcDT+REyvjTBCU=; b=owGbwMvMwCmsHn9OcpHtvjLG02pJDOkdyuJntDsv71tsPNVzuZTzislR2z8dDP3Uctt7aVh00 /0FpRvNO6ayMAhzMsiKKbI8kQk7vbx9cZWD/cofMHNYmUCGMHBxCsBENpcyNszwzNoUWPo6MsRW T9j24wbPWVwCvAeCmiT5VI36A/9fTMvSjn73VXGD0NdvU3c0SKcYMtY7meSv0Z744Hzow/6NR98 k3N14RUmq0F7vrXbs0wPsazfN/lrreujJHP/vl69O9DKv3LYaAA== X-Developer-Key: i=mripard@kernel.org; a=openpgp; fpr=BE5675C37E818C8B5764241C254BCFC56BF6CE8D disable_outputs() disables all connectors and CRTCs affected by a commit. It takes the drm_atomic_state being committed as a parameter. However, that parameter name is called 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 d5129de2278d5f62c136f8b6c831f903d9e53927..0d561b5c249a79a723e047f061d= 4103ef7742e87 100644 --- a/drivers/gpu/drm/drm_atomic_helper.c +++ b/drivers/gpu/drm/drm_atomic_helper.c @@ -1148,19 +1148,19 @@ crtc_needs_disable(struct drm_crtc_state *old_state, (old_state->self_refresh_active && !new_state->active) || new_state->self_refresh_active; } =20 static void -disable_outputs(struct drm_device *dev, struct drm_atomic_state *old_state) +disable_outputs(struct drm_device *dev, struct drm_atomic_state *state) { struct drm_connector *connector; struct drm_connector_state *old_conn_state, *new_conn_state; struct drm_crtc *crtc; struct drm_crtc_state *old_crtc_state, *new_crtc_state; int i; =20 - for_each_oldnew_connector_in_state(old_state, connector, old_conn_state, = new_conn_state, i) { + for_each_oldnew_connector_in_state(state, connector, old_conn_state, new_= conn_state, i) { const struct drm_encoder_helper_funcs *funcs; struct drm_encoder *encoder; struct drm_bridge *bridge; =20 /* @@ -1168,15 +1168,15 @@ disable_outputs(struct drm_device *dev, struct drm_= atomic_state *old_state) * still on. So need to check the old, saved state. */ if (!old_conn_state->crtc) continue; =20 - old_crtc_state =3D drm_atomic_get_old_crtc_state(old_state, old_conn_sta= te->crtc); + old_crtc_state =3D drm_atomic_get_old_crtc_state(state, old_conn_state->= crtc); =20 if (new_conn_state->crtc) new_crtc_state =3D drm_atomic_get_new_crtc_state( - old_state, + state, new_conn_state->crtc); else new_crtc_state =3D NULL; =20 if (!crtc_needs_disable(old_crtc_state, new_crtc_state) || @@ -1199,28 +1199,28 @@ disable_outputs(struct drm_device *dev, struct drm_= atomic_state *old_state) /* * Each encoder has at most one connector (since we always steal * it away), so we won't call disable hooks twice. */ bridge =3D drm_bridge_chain_get_first_bridge(encoder); - drm_atomic_bridge_chain_disable(bridge, old_state); + drm_atomic_bridge_chain_disable(bridge, state); =20 /* Right function depends upon target state. */ if (funcs) { if (funcs->atomic_disable) - funcs->atomic_disable(encoder, old_state); + funcs->atomic_disable(encoder, state); else if (new_conn_state->crtc && funcs->prepare) funcs->prepare(encoder); else if (funcs->disable) funcs->disable(encoder); else if (funcs->dpms) funcs->dpms(encoder, DRM_MODE_DPMS_OFF); } =20 - drm_atomic_bridge_chain_post_disable(bridge, old_state); + drm_atomic_bridge_chain_post_disable(bridge, state); } =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; int ret; =20 /* Shut down everything that needs a full modeset. */ if (!drm_atomic_crtc_needs_modeset(new_crtc_state)) @@ -1237,11 +1237,11 @@ disable_outputs(struct drm_device *dev, struct drm_= atomic_state *old_state) =20 /* Right function depends upon target state. */ if (new_crtc_state->enable && funcs->prepare) funcs->prepare(crtc); else if (funcs->atomic_disable) - funcs->atomic_disable(crtc, old_state); + funcs->atomic_disable(crtc, state); else if (funcs->disable) funcs->disable(crtc); else if (funcs->dpms) funcs->dpms(crtc, DRM_MODE_DPMS_OFF); =20 --=20 2.47.1