LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Maxime Ripard <maxime@cerno.tech>
To: dri-devel@lists.freedesktop.org,
Daniel Vetter <daniel.vetter@intel.com>,
David Airlie <airlied@linux.ie>,
Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
Thomas Zimmermann <tzimmermann@suse.de>,
Maxime Ripard <maxime@cerno.tech>
Cc: Maxime Ripard <mripard@kernel.org>, Emma Anholt <emma@anholt.net>,
linux-kernel@vger.kernel.org,
Nicolas Saenz Julienne <nsaenz@kernel.org>,
Dave Stevenson <dave.stevenson@raspberrypi.com>,
Phil Elwell <phil@raspberrypi.com>,
Tim Gover <tim.gover@raspberrypi.com>,
Dom Cobley <dom@raspberrypi.com>,
bcm-kernel-feedback-list@broadcom.com,
linux-rpi-kernel@lists.infradead.org
Subject: [PATCH v7 04/10] drm/vc4: crtc: Add encoder to vc4_crtc_config_pv prototype
Date: Thu, 19 Aug 2021 11:51:13 +0200 [thread overview]
Message-ID: <20210819095119.689945-5-maxime@cerno.tech> (raw)
In-Reply-To: <20210819095119.689945-1-maxime@cerno.tech>
vc4_crtc_config_pv() retrieves the encoder again, even though its only
caller, vc4_crtc_atomic_enable(), already did.
Pass the encoder pointer as an argument instead of going through all the
connectors to retrieve it again.
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
---
drivers/gpu/drm/vc4/vc4_crtc.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/vc4/vc4_crtc.c b/drivers/gpu/drm/vc4/vc4_crtc.c
index 902862a67341..93d2413d0842 100644
--- a/drivers/gpu/drm/vc4/vc4_crtc.c
+++ b/drivers/gpu/drm/vc4/vc4_crtc.c
@@ -313,12 +313,11 @@ static void vc4_crtc_pixelvalve_reset(struct drm_crtc *crtc)
CRTC_WRITE(PV_CONTROL, CRTC_READ(PV_CONTROL) | PV_CONTROL_FIFO_CLR);
}
-static void vc4_crtc_config_pv(struct drm_crtc *crtc, struct drm_atomic_state *state)
+static void vc4_crtc_config_pv(struct drm_crtc *crtc, struct drm_encoder *encoder,
+ struct drm_atomic_state *state)
{
struct drm_device *dev = crtc->dev;
struct vc4_dev *vc4 = to_vc4_dev(dev);
- struct drm_encoder *encoder = vc4_get_crtc_encoder(crtc, state,
- drm_atomic_get_new_connector_state);
struct vc4_encoder *vc4_encoder = to_vc4_encoder(encoder);
struct vc4_crtc *vc4_crtc = to_vc4_crtc(crtc);
const struct vc4_pv_data *pv_data = vc4_crtc_to_vc4_pv_data(vc4_crtc);
@@ -580,7 +579,7 @@ static void vc4_crtc_atomic_enable(struct drm_crtc *crtc,
if (vc4_encoder->pre_crtc_configure)
vc4_encoder->pre_crtc_configure(encoder, state);
- vc4_crtc_config_pv(crtc, state);
+ vc4_crtc_config_pv(crtc, encoder, state);
CRTC_WRITE(PV_CONTROL, CRTC_READ(PV_CONTROL) | PV_CONTROL_EN);
--
2.31.1
next prev parent reply other threads:[~2021-08-19 9:51 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-19 9:51 [PATCH v7 00/10] drm/vc4: hdmi: Support the 4k @ 60Hz modes Maxime Ripard
2021-08-19 9:51 ` [PATCH v7 01/10] drm/vc4: hdmi: Remove the DDC probing for status detection Maxime Ripard
2021-08-19 9:51 ` [PATCH v7 02/10] drm/vc4: hdmi: Fix HPD GPIO detection Maxime Ripard
2021-08-19 9:51 ` [PATCH v7 03/10] drm/vc4: Make vc4_crtc_get_encoder public Maxime Ripard
2021-08-19 9:51 ` Maxime Ripard [this message]
2021-08-19 9:51 ` [PATCH v7 05/10] drm/vc4: crtc: Rework the encoder retrieval code (again) Maxime Ripard
2021-08-19 9:51 ` [PATCH v7 06/10] drm/vc4: crtc: Add some logging Maxime Ripard
2021-08-19 9:51 ` [PATCH v7 07/10] drm/vc4: Leverage the load tracker on the BCM2711 Maxime Ripard
2021-08-19 9:51 ` [PATCH v7 08/10] drm/vc4: hdmi: Raise the maximum clock rate Maxime Ripard
2021-08-19 9:51 ` [PATCH v7 09/10] drm/vc4: hdmi: Enable the scrambler on reconnection Maxime Ripard
2021-08-19 9:51 ` [PATCH v7 10/10] drm/vc4: Increase the core clock based on HVS load Maxime Ripard
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210819095119.689945-5-maxime@cerno.tech \
--to=maxime@cerno.tech \
--cc=airlied@linux.ie \
--cc=bcm-kernel-feedback-list@broadcom.com \
--cc=daniel.vetter@intel.com \
--cc=dave.stevenson@raspberrypi.com \
--cc=dom@raspberrypi.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=emma@anholt.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rpi-kernel@lists.infradead.org \
--cc=maarten.lankhorst@linux.intel.com \
--cc=mripard@kernel.org \
--cc=nsaenz@kernel.org \
--cc=phil@raspberrypi.com \
--cc=tim.gover@raspberrypi.com \
--cc=tzimmermann@suse.de \
--subject='Re: [PATCH v7 04/10] drm/vc4: crtc: Add encoder to vc4_crtc_config_pv prototype' \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).