Re: [PATCH 3/4] media: camss: vfe-480: Multiple outputs support for SM8250

From: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
To: quic_mmitkov@quicinc.com, linux-media@vger.kernel.org,
	linux-arm-msm@vger.kernel.org, robert.foss@linaro.org,
	akapatra@quicinc.com, jzala@quicinc.com, todor.too@gmail.com
Cc: agross@kernel.org, bjorn.andersson@linaro.org,
	konrad.dybcio@somainline.org, mchehab@kernel.org
Subject: Re: [PATCH 3/4] media: camss: vfe-480: Multiple outputs support for SM8250
Date: Wed, 21 Sep 2022 16:55:17 +0100	[thread overview]
Message-ID: <889049dd-2cd9-ee25-c5f5-a8a7e503a3e9@linaro.org> (raw)
In-Reply-To: <20220921141012.1709-4-quic_mmitkov@quicinc.com>

On 21/09/2022 15:10, quic_mmitkov@quicinc.com wrote:
> From: Milen Mitkov <quic_mmitkov@quicinc.com>
> 
> On SM8250 each VFE supports at least 3 RDI channels, or 4
> in case of VFE-Lite, so add appropriate IRQ setup and handling.
> 
> Signed-off-by: Milen Mitkov <quic_mmitkov@quicinc.com>
> ---
>   .../media/platform/qcom/camss/camss-vfe-480.c | 60 ++++++++++++-------
>   1 file changed, 39 insertions(+), 21 deletions(-)
> 
> diff --git a/drivers/media/platform/qcom/camss/camss-vfe-480.c b/drivers/media/platform/qcom/camss/camss-vfe-480.c
> index 129585110393..04272d085e5b 100644
> --- a/drivers/media/platform/qcom/camss/camss-vfe-480.c
> +++ b/drivers/media/platform/qcom/camss/camss-vfe-480.c
> @@ -94,6 +94,8 @@ static inline int bus_irq_mask_0_comp_done(struct vfe_device *vfe, int n)
>   #define RDI_WM(n)			((IS_LITE ? 0 : 23) + (n))
>   #define RDI_COMP_GROUP(n)		((IS_LITE ? 0 : 11) + (n))
>   
> +#define MAX_VFE_OUTPUT_LINES	4
> +
>   static u32 vfe_hw_version(struct vfe_device *vfe)
>   {
>   	u32 hw_version = readl_relaxed(vfe->base + VFE_HW_VERSION);
> @@ -171,12 +173,25 @@ static inline void vfe_reg_update_clear(struct vfe_device *vfe,
>   
>   static void vfe_enable_irq_common(struct vfe_device *vfe)
>   {
> -	/* enable only the IRQs used: rup and comp_done irqs for RDI0 */
> +	/* enable reset ack IRQ and top BUS status IRQ */
>   	writel_relaxed(IRQ_MASK_0_RESET_ACK | IRQ_MASK_0_BUS_TOP_IRQ,
>   		       vfe->base + VFE_IRQ_MASK(0));
> -	writel_relaxed(BUS_IRQ_MASK_0_RDI_RUP(vfe, 0) |
> -		       BUS_IRQ_MASK_0_COMP_DONE(vfe, RDI_COMP_GROUP(0)),
> -		       vfe->base + VFE_BUS_IRQ_MASK(0));
> +}
> +
> +static void vfe_enable_lines_irq(struct vfe_device *vfe)
> +{
> +	u32 bus_irq_mask;
> +	int i;
> +
> +	for (i = 0; i < MAX_VFE_OUTPUT_LINES; i++) {
> +		/* Enable IRQ for newly added lines, but also keep already running lines's IRQ */
> +		if (vfe->line[i].output.state == VFE_OUTPUT_RESERVED ||
> +		    vfe->line[i].output.state == VFE_OUTPUT_ON)
> +			bus_irq_mask |= BUS_IRQ_MASK_0_RDI_RUP(vfe, i)
> +					| BUS_IRQ_MASK_0_COMP_DONE(vfe, RDI_COMP_GROUP(i));

A multi-line should be enclosed with {}

if (vfe->line[i].output.state == VFE_OUTPUT_RESERVED ||
     vfe->line[i].output.state == VFE_OUTPUT_ON) {
	bus_irq_mask |= BUS_IRQ_MASK_0_RDI_RUP(vfe, i)
			| BUS_IRQ_MASK_0_COMP_DONE(vfe, RDI_COMP_GROUP(i));
}

---
bod