public inbox for linux-arm-kernel@lists.infradead.org
 help / color / mirror / Atom feed
From: Thomas Zimmermann <tzimmermann@suse.de>
To: Maxime Ripard <maxime@cerno.tech>,
	Daniel Vetter <daniel.vetter@intel.com>,
	David Airlie <airlied@linux.ie>, Eric Anholt <eric@anholt.net>,
	Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: linux-rpi-kernel@lists.infradead.org,
	bcm-kernel-feedback-list@broadcom.com,
	linux-arm-kernel@lists.infradead.org,
	dri-devel@lists.freedesktop.org,
	Dave Stevenson <dave.stevenson@raspberrypi.com>
Subject: Re: [PATCH v5 2/9] drm/vc4: Pass the atomic state to encoder hooks
Date: Tue, 8 Dec 2020 08:53:29 +0100	[thread overview]
Message-ID: <189b8c00-6c52-2d44-88c9-71657dd4e85c@suse.de> (raw)
In-Reply-To: <20201207155719.17149-3-maxime@cerno.tech>


[-- Attachment #1.1.1: Type: text/plain, Size: 7486 bytes --]



Am 07.12.20 um 16:57 schrieb Maxime Ripard:
> We'll need to access the connector state in our encoder setup, so let's
> just pass the whole DRM state to our private encoder hooks.
> 
> Signed-off-by: Maxime Ripard <maxime@cerno.tech>

Acked-by: Thomas Zimmermann <tzimmermann@suse.de>

> ---
>   drivers/gpu/drm/vc4/vc4_crtc.c | 18 ++++++++++--------
>   drivers/gpu/drm/vc4/vc4_drv.h  | 10 +++++-----
>   drivers/gpu/drm/vc4/vc4_hdmi.c | 15 ++++++++++-----
>   3 files changed, 25 insertions(+), 18 deletions(-)
> 
> diff --git a/drivers/gpu/drm/vc4/vc4_crtc.c b/drivers/gpu/drm/vc4/vc4_crtc.c
> index e02e499885ed..a3439756594c 100644
> --- a/drivers/gpu/drm/vc4/vc4_crtc.c
> +++ b/drivers/gpu/drm/vc4/vc4_crtc.c
> @@ -403,7 +403,9 @@ static void require_hvs_enabled(struct drm_device *dev)
>   		     SCALER_DISPCTRL_ENABLE);
>   }
>   
> -static int vc4_crtc_disable(struct drm_crtc *crtc, unsigned int channel)
> +static int vc4_crtc_disable(struct drm_crtc *crtc,
> +			    struct drm_atomic_state *state,
> +			    unsigned int channel)
>   {
>   	struct drm_encoder *encoder = vc4_get_crtc_encoder(crtc);
>   	struct vc4_encoder *vc4_encoder = to_vc4_encoder(encoder);
> @@ -435,13 +437,13 @@ static int vc4_crtc_disable(struct drm_crtc *crtc, unsigned int channel)
>   	mdelay(20);
>   
>   	if (vc4_encoder && vc4_encoder->post_crtc_disable)
> -		vc4_encoder->post_crtc_disable(encoder);
> +		vc4_encoder->post_crtc_disable(encoder, state);
>   
>   	vc4_crtc_pixelvalve_reset(crtc);
>   	vc4_hvs_stop_channel(dev, channel);
>   
>   	if (vc4_encoder && vc4_encoder->post_crtc_powerdown)
> -		vc4_encoder->post_crtc_powerdown(encoder);
> +		vc4_encoder->post_crtc_powerdown(encoder, state);
>   
>   	return 0;
>   }
> @@ -468,7 +470,7 @@ int vc4_crtc_disable_at_boot(struct drm_crtc *crtc)
>   	if (channel < 0)
>   		return 0;
>   
> -	return vc4_crtc_disable(crtc, channel);
> +	return vc4_crtc_disable(crtc, NULL, channel);
>   }
>   
>   static void vc4_crtc_atomic_disable(struct drm_crtc *crtc,
> @@ -484,7 +486,7 @@ static void vc4_crtc_atomic_disable(struct drm_crtc *crtc,
>   	/* Disable vblank irq handling before crtc is disabled. */
>   	drm_crtc_vblank_off(crtc);
>   
> -	vc4_crtc_disable(crtc, old_vc4_state->assigned_channel);
> +	vc4_crtc_disable(crtc, state, old_vc4_state->assigned_channel);
>   
>   	/*
>   	 * Make sure we issue a vblank event after disabling the CRTC if
> @@ -518,14 +520,14 @@ static void vc4_crtc_atomic_enable(struct drm_crtc *crtc,
>   	vc4_hvs_atomic_enable(crtc, state);
>   
>   	if (vc4_encoder->pre_crtc_configure)
> -		vc4_encoder->pre_crtc_configure(encoder);
> +		vc4_encoder->pre_crtc_configure(encoder, state);
>   
>   	vc4_crtc_config_pv(crtc);
>   
>   	CRTC_WRITE(PV_CONTROL, CRTC_READ(PV_CONTROL) | PV_CONTROL_EN);
>   
>   	if (vc4_encoder->pre_crtc_enable)
> -		vc4_encoder->pre_crtc_enable(encoder);
> +		vc4_encoder->pre_crtc_enable(encoder, state);
>   
>   	/* When feeding the transposer block the pixelvalve is unneeded and
>   	 * should not be enabled.
> @@ -534,7 +536,7 @@ static void vc4_crtc_atomic_enable(struct drm_crtc *crtc,
>   		   CRTC_READ(PV_V_CONTROL) | PV_VCONTROL_VIDEN);
>   
>   	if (vc4_encoder->post_crtc_enable)
> -		vc4_encoder->post_crtc_enable(encoder);
> +		vc4_encoder->post_crtc_enable(encoder, state);
>   }
>   
>   static enum drm_mode_status vc4_crtc_mode_valid(struct drm_crtc *crtc,
> diff --git a/drivers/gpu/drm/vc4/vc4_drv.h b/drivers/gpu/drm/vc4/vc4_drv.h
> index c47c85533805..b404cd3ab0d8 100644
> --- a/drivers/gpu/drm/vc4/vc4_drv.h
> +++ b/drivers/gpu/drm/vc4/vc4_drv.h
> @@ -444,12 +444,12 @@ struct vc4_encoder {
>   	enum vc4_encoder_type type;
>   	u32 clock_select;
>   
> -	void (*pre_crtc_configure)(struct drm_encoder *encoder);
> -	void (*pre_crtc_enable)(struct drm_encoder *encoder);
> -	void (*post_crtc_enable)(struct drm_encoder *encoder);
> +	void (*pre_crtc_configure)(struct drm_encoder *encoder, struct drm_atomic_state *state);
> +	void (*pre_crtc_enable)(struct drm_encoder *encoder, struct drm_atomic_state *state);
> +	void (*post_crtc_enable)(struct drm_encoder *encoder, struct drm_atomic_state *state);
>   
> -	void (*post_crtc_disable)(struct drm_encoder *encoder);
> -	void (*post_crtc_powerdown)(struct drm_encoder *encoder);
> +	void (*post_crtc_disable)(struct drm_encoder *encoder, struct drm_atomic_state *state);
> +	void (*post_crtc_powerdown)(struct drm_encoder *encoder, struct drm_atomic_state *state);
>   };
>   
>   static inline struct vc4_encoder *
> diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
> index afc178b0d89f..5a608ed1d75e 100644
> --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
> +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
> @@ -357,7 +357,8 @@ static void vc4_hdmi_set_infoframes(struct drm_encoder *encoder)
>   		vc4_hdmi_set_audio_infoframe(encoder);
>   }
>   
> -static void vc4_hdmi_encoder_post_crtc_disable(struct drm_encoder *encoder)
> +static void vc4_hdmi_encoder_post_crtc_disable(struct drm_encoder *encoder,
> +					       struct drm_atomic_state *state)
>   {
>   	struct vc4_hdmi *vc4_hdmi = encoder_to_vc4_hdmi(encoder);
>   
> @@ -370,7 +371,8 @@ static void vc4_hdmi_encoder_post_crtc_disable(struct drm_encoder *encoder)
>   		   HDMI_READ(HDMI_VID_CTL) | VC4_HD_VID_CTL_BLANKPIX);
>   }
>   
> -static void vc4_hdmi_encoder_post_crtc_powerdown(struct drm_encoder *encoder)
> +static void vc4_hdmi_encoder_post_crtc_powerdown(struct drm_encoder *encoder,
> +						 struct drm_atomic_state *state)
>   {
>   	struct vc4_hdmi *vc4_hdmi = encoder_to_vc4_hdmi(encoder);
>   	int ret;
> @@ -584,7 +586,8 @@ static void vc4_hdmi_recenter_fifo(struct vc4_hdmi *vc4_hdmi)
>   		  "VC4_HDMI_FIFO_CTL_RECENTER_DONE");
>   }
>   
> -static void vc4_hdmi_encoder_pre_crtc_configure(struct drm_encoder *encoder)
> +static void vc4_hdmi_encoder_pre_crtc_configure(struct drm_encoder *encoder,
> +						struct drm_atomic_state *state)
>   {
>   	struct drm_display_mode *mode = &encoder->crtc->state->adjusted_mode;
>   	struct vc4_hdmi *vc4_hdmi = encoder_to_vc4_hdmi(encoder);
> @@ -676,7 +679,8 @@ static void vc4_hdmi_encoder_pre_crtc_configure(struct drm_encoder *encoder)
>   		vc4_hdmi->variant->set_timings(vc4_hdmi, mode);
>   }
>   
> -static void vc4_hdmi_encoder_pre_crtc_enable(struct drm_encoder *encoder)
> +static void vc4_hdmi_encoder_pre_crtc_enable(struct drm_encoder *encoder,
> +					     struct drm_atomic_state *state)
>   {
>   	struct drm_display_mode *mode = &encoder->crtc->state->adjusted_mode;
>   	struct vc4_hdmi_encoder *vc4_encoder = to_vc4_hdmi_encoder(encoder);
> @@ -698,7 +702,8 @@ static void vc4_hdmi_encoder_pre_crtc_enable(struct drm_encoder *encoder)
>   	HDMI_WRITE(HDMI_FIFO_CTL, VC4_HDMI_FIFO_CTL_MASTER_SLAVE_N);
>   }
>   
> -static void vc4_hdmi_encoder_post_crtc_enable(struct drm_encoder *encoder)
> +static void vc4_hdmi_encoder_post_crtc_enable(struct drm_encoder *encoder,
> +					      struct drm_atomic_state *state)
>   {
>   	struct drm_display_mode *mode = &encoder->crtc->state->adjusted_mode;
>   	struct vc4_hdmi *vc4_hdmi = encoder_to_vc4_hdmi(encoder);
> 

-- 
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5, 90409 Nürnberg, Germany
(HRB 36809, AG Nürnberg)
Geschäftsführer: Felix Imendörffer


[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 840 bytes --]

[-- Attachment #2: Type: text/plain, Size: 176 bytes --]

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

  reply	other threads:[~2020-12-08  7:54 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-12-07 15:57 [PATCH v5 0/9] drm/vc4: hdmi: Support the 10/12 bit output Maxime Ripard
2020-12-07 15:57 ` [PATCH v5 1/9] drm/vc4: hvs: Align the HVS atomic hooks to the new API Maxime Ripard
2020-12-07 15:57 ` [PATCH v5 2/9] drm/vc4: Pass the atomic state to encoder hooks Maxime Ripard
2020-12-08  7:53   ` Thomas Zimmermann [this message]
2020-12-07 15:57 ` [PATCH v5 3/9] drm/vc4: hdmi: Take into account the clock doubling flag in atomic_check Maxime Ripard
2020-12-08  7:54   ` Thomas Zimmermann
2020-12-09 15:29   ` Dave Stevenson
2020-12-07 15:57 ` [PATCH v5 4/9] drm/vc4: hdmi: Don't access the connector state in reset if kmalloc fails Maxime Ripard
2020-12-09 15:20   ` Dave Stevenson
2020-12-07 15:57 ` [PATCH v5 5/9] drm/vc4: hdmi: Create a custom connector state Maxime Ripard
2020-12-09 15:22   ` Dave Stevenson
2020-12-07 15:57 ` [PATCH v5 6/9] drm/vc4: hdmi: Store pixel frequency in the " Maxime Ripard
2020-12-08  7:55   ` Thomas Zimmermann
2020-12-09 15:32   ` Dave Stevenson
2020-12-07 15:57 ` [PATCH v5 7/9] drm/vc4: hdmi: Use the connector state pixel rate for the PHY Maxime Ripard
2020-12-09 15:23   ` Dave Stevenson
2020-12-07 15:57 ` [PATCH v5 8/9] drm/vc4: hdmi: Limit the BCM2711 to the max without scrambling Maxime Ripard
2020-12-09 15:23   ` Dave Stevenson
2020-12-07 15:57 ` [PATCH v5 9/9] drm/vc4: hdmi: Enable 10/12 bpc output Maxime Ripard
2020-12-09 15:27   ` Dave Stevenson
2020-12-10 14:21     ` 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=189b8c00-6c52-2d44-88c9-71657dd4e85c@suse.de \
    --to=tzimmermann@suse.de \
    --cc=airlied@linux.ie \
    --cc=bcm-kernel-feedback-list@broadcom.com \
    --cc=daniel.vetter@intel.com \
    --cc=dave.stevenson@raspberrypi.com \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=eric@anholt.net \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-rpi-kernel@lists.infradead.org \
    --cc=maarten.lankhorst@linux.intel.com \
    --cc=maxime@cerno.tech \
    /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
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox