From nobody Wed Feb 5 16:50:25 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 ADC411D8DEA for ; Wed, 15 Jan 2025 21:06:07 +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=1736975167; cv=none; b=QRkVL+XqiOSD/MzM5bcBRFE2zvUqCDARPtocN3XQ+mH/rfVE9KXEcjwf90TfA3/1edSTiPuIpP8FbcrsqspurniyP4/kF9c81/BtmJHAd26uAovh6W5DSl+T7mKc97lBPy0tjf22ig4jvBAXqVTvQRB6izHWkaWO0iDBAECCXsI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736975167; c=relaxed/simple; bh=mj6NM+PSrLMPxTlgg9EIkBu+YOWNcjioXwNh4JUXpAI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=fYpd4hTEnUFGFt27Ib96LSmzAb5IBiFFtfuHUvqI+c+9zLdVMwY67LwOBImazYQ127BPGyA9/DZvmTYjplDjgegpup1h+7ttJKpDeJq+YgDPBLH8E0pWyeqc7Ie/TnUIMMcqckh/zyLMZLtPLpRFkzOPnJ5epdJzH/2ir/zZdaU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=o2JALqug; 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="o2JALqug" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0A301C4CEE4; Wed, 15 Jan 2025 21:06:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1736975167; bh=mj6NM+PSrLMPxTlgg9EIkBu+YOWNcjioXwNh4JUXpAI=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=o2JALquglnx8RnLtBofCg2ih33H4tu3g/093vrzsERl6elnUwiCINKbntNqbMtE98 lsX8knGLNlQbOy3OjjwNmjKaAORxJcAHUJqG+ovaumh2w7Pp6SFLEgq6GfWdLRMG1/ YuphMK8kEo8BdIgd7CfeHZymzPXv/CsU/kjSZl6f4LY301IUZ8k99/pVg5EVQqnu6M E5Xjxp2joX+H9oSEwXA599h/eZ4oLWb1Bw3gdv203UkbV5moLKIgC184qrzyB66nP8 D6eRcAFy7i8zzjo07cpteWS75U74BTUYB00iKVLSFf2uS/3KPjm3CNzK0ZLdbAXZCk pTCLAMwa+W7tA== From: Maxime Ripard Date: Wed, 15 Jan 2025 22:05:16 +0100 Subject: [PATCH 09/29] drm/atomic-helper: Change parameter name of drm_atomic_helper_update_legacy_modeset_state() 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-9-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=3609; i=mripard@kernel.org; h=from:subject:message-id; bh=mj6NM+PSrLMPxTlgg9EIkBu+YOWNcjioXwNh4JUXpAI=; b=owGbwMvMwCmsHn9OcpHtvjLG02pJDOkdypKexe13XohvfJBs3ybZ9Oryps17L7he1PsqmCY+e +O18NDEjqksDMKcDLJiiixPZMJOL29fXOVgv/IHzBxWJpAhDFycAjCRfFvGhvNGxhsO7GuVuvD8 V/P+gwuWuXvXW2frlC8LK5512ExwlcGBXsEXXKbPNOJEbP7ZbeDMY6zPifq9KqNqd1P/8pQrm+d 4TN5Q58uhPzc/NTxEpO6JrX3mhgD2SYXvPjff0sk/mnwufg4A X-Developer-Key: i=mripard@kernel.org; a=openpgp; fpr=BE5675C37E818C8B5764241C254BCFC56BF6CE8D drm_atomic_helper_update_legacy_modeset_state() updates all the legacy modeset pointers a connector, encoder or CRTC might have with the ones being setup by a given 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 | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atom= ic_helper.c index 0d561b5c249a79a723e047f061d4103ef7742e87..50b3fdb033eaae8e852a4fd298d= 2e958be1201f3 100644 --- a/drivers/gpu/drm/drm_atomic_helper.c +++ b/drivers/gpu/drm/drm_atomic_helper.c @@ -1265,11 +1265,11 @@ disable_outputs(struct drm_device *dev, struct drm_= atomic_state *state) } =20 /** * drm_atomic_helper_update_legacy_modeset_state - update legacy modeset s= tate * @dev: DRM device - * @old_state: atomic state object with old state structures + * @state: atomic state object being committed * * This function updates all the various legacy modeset state pointers in * connectors, encoders and CRTCs. * * Drivers can use this for building their own atomic commit if they don't= have @@ -1281,20 +1281,20 @@ disable_outputs(struct drm_device *dev, struct drm_= atomic_state *state) * the legacy state pointers are only really useful for transitioning an * existing driver to the atomic world. */ void drm_atomic_helper_update_legacy_modeset_state(struct drm_device *dev, - struct drm_atomic_state *old_state) + 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 *new_crtc_state; int i; =20 /* clear out existing links and update dpms */ - 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) { if (connector->encoder) { WARN_ON(!connector->encoder->crtc); =20 connector->encoder->crtc =3D NULL; connector->encoder =3D NULL; @@ -1311,11 +1311,11 @@ drm_atomic_helper_update_legacy_modeset_state(struc= t drm_device *dev, connector->dpms =3D mode; } } =20 /* set new links */ - 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) { if (!new_conn_state->crtc) continue; =20 if (WARN_ON(!new_conn_state->best_encoder)) continue; @@ -1323,19 +1323,19 @@ drm_atomic_helper_update_legacy_modeset_state(struc= t drm_device *dev, connector->encoder =3D new_conn_state->best_encoder; connector->encoder->crtc =3D new_conn_state->crtc; } =20 /* set legacy state in the crtc structure */ - 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) { struct drm_plane *primary =3D crtc->primary; struct drm_plane_state *new_plane_state; =20 crtc->mode =3D new_crtc_state->mode; crtc->enabled =3D new_crtc_state->enable; =20 new_plane_state =3D - drm_atomic_get_new_plane_state(old_state, primary); + drm_atomic_get_new_plane_state(state, primary); =20 if (new_plane_state && new_plane_state->crtc =3D=3D crtc) { crtc->x =3D new_plane_state->src_x >> 16; crtc->y =3D new_plane_state->src_y >> 16; } --=20 2.47.1