diff mbox series

media: vsp1: Fix WPF macro names

Message ID 20210618161041.444987-1-kieran.bingham@ideasonboard.com
State New
Headers show
Series media: vsp1: Fix WPF macro names | expand

Commit Message

Kieran Bingham June 18, 2021, 4:10 p.m. UTC 
From: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>

The WPF IRQ enable and status macros have been incorrectly named WFP.
Fix them accordingly, and update all uses of the macros.

Signed-off-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
---
 drivers/media/platform/vsp1/vsp1_drv.c  | 4 ++--
 drivers/media/platform/vsp1/vsp1_regs.h | 8 ++++----
 drivers/media/platform/vsp1/vsp1_wpf.c  | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

Comments

Kieran Bingham Sept. 1, 2021, 10:06 p.m. UTC | #1 
Hi Laurent,

On 18/06/2021 17:21, Laurent Pinchart wrote:
> Hi Kieran,

> 

> Thank you for the patch.

> 

> On Fri, Jun 18, 2021 at 05:10:41PM +0100, Kieran Bingham wrote:

>> From: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>

>>

>> The WPF IRQ enable and status macros have been incorrectly named WFP.

>> Fix them accordingly, and update all uses of the macros.

>>

>> Signed-off-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>

> 

> Wow, and all this time it has escaped our eyes.

> 

> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

> 

> Feel free to push. Oh, wait... I'm too used to libcamera :-)


Has this been collected anywhere?

I don't see it progressing.
--
Kieran




> 

>> ---

>>  drivers/media/platform/vsp1/vsp1_drv.c  | 4 ++--

>>  drivers/media/platform/vsp1/vsp1_regs.h | 8 ++++----

>>  drivers/media/platform/vsp1/vsp1_wpf.c  | 2 +-

>>  3 files changed, 7 insertions(+), 7 deletions(-)

>>

>> diff --git a/drivers/media/platform/vsp1/vsp1_drv.c b/drivers/media/platform/vsp1/vsp1_drv.c

>> index de442d6c9926..1018786d0437 100644

>> --- a/drivers/media/platform/vsp1/vsp1_drv.c

>> +++ b/drivers/media/platform/vsp1/vsp1_drv.c

>> @@ -44,7 +44,7 @@

>>  

>>  static irqreturn_t vsp1_irq_handler(int irq, void *data)

>>  {

>> -	u32 mask = VI6_WFP_IRQ_STA_DFE | VI6_WFP_IRQ_STA_FRE;

>> +	u32 mask = VI6_WPF_IRQ_STA_DFE | VI6_WPF_IRQ_STA_FRE;

>>  	struct vsp1_device *vsp1 = data;

>>  	irqreturn_t ret = IRQ_NONE;

>>  	unsigned int i;

>> @@ -59,7 +59,7 @@ static irqreturn_t vsp1_irq_handler(int irq, void *data)

>>  		status = vsp1_read(vsp1, VI6_WPF_IRQ_STA(i));

>>  		vsp1_write(vsp1, VI6_WPF_IRQ_STA(i), ~status & mask);

>>  

>> -		if (status & VI6_WFP_IRQ_STA_DFE) {

>> +		if (status & VI6_WPF_IRQ_STA_DFE) {

>>  			vsp1_pipeline_frame_end(wpf->entity.pipe);

>>  			ret = IRQ_HANDLED;

>>  		}

>> diff --git a/drivers/media/platform/vsp1/vsp1_regs.h b/drivers/media/platform/vsp1/vsp1_regs.h

>> index fe3130db1fa2..97942436868c 100644

>> --- a/drivers/media/platform/vsp1/vsp1_regs.h

>> +++ b/drivers/media/platform/vsp1/vsp1_regs.h

>> @@ -32,12 +32,12 @@

>>  #define VI6_STATUS_SYS_ACT(n)		BIT((n) + 8)

>>  

>>  #define VI6_WPF_IRQ_ENB(n)		(0x0048 + (n) * 12)

>> -#define VI6_WFP_IRQ_ENB_DFEE		BIT(1)

>> -#define VI6_WFP_IRQ_ENB_FREE		BIT(0)

>> +#define VI6_WPF_IRQ_ENB_DFEE		BIT(1)

>> +#define VI6_WPF_IRQ_ENB_FREE		BIT(0)

>>  

>>  #define VI6_WPF_IRQ_STA(n)		(0x004c + (n) * 12)

>> -#define VI6_WFP_IRQ_STA_DFE		BIT(1)

>> -#define VI6_WFP_IRQ_STA_FRE		BIT(0)

>> +#define VI6_WPF_IRQ_STA_DFE		BIT(1)

>> +#define VI6_WPF_IRQ_STA_FRE		BIT(0)

>>  

>>  #define VI6_DISP_IRQ_ENB(n)		(0x0078 + (n) * 60)

>>  #define VI6_DISP_IRQ_ENB_DSTE		BIT(8)

>> diff --git a/drivers/media/platform/vsp1/vsp1_wpf.c b/drivers/media/platform/vsp1/vsp1_wpf.c

>> index 208498fa6ed7..94e91d7bb56c 100644

>> --- a/drivers/media/platform/vsp1/vsp1_wpf.c

>> +++ b/drivers/media/platform/vsp1/vsp1_wpf.c

>> @@ -342,7 +342,7 @@ static void wpf_configure_stream(struct vsp1_entity *entity,

>>  	/* Enable interrupts. */

>>  	vsp1_dl_body_write(dlb, VI6_WPF_IRQ_STA(index), 0);

>>  	vsp1_dl_body_write(dlb, VI6_WPF_IRQ_ENB(index),

>> -			   VI6_WFP_IRQ_ENB_DFEE);

>> +			   VI6_WPF_IRQ_ENB_DFEE);

>>  

>>  	/*

>>  	 * Configure writeback for display pipelines (the wpf writeback flag is

>
Laurent Pinchart Sept. 1, 2021, 10:08 p.m. UTC | #2 
Hi Kieran,

On Wed, Sep 01, 2021 at 11:06:00PM +0100, Kieran Bingham wrote:
> On 18/06/2021 17:21, Laurent Pinchart wrote:

> > On Fri, Jun 18, 2021 at 05:10:41PM +0100, Kieran Bingham wrote:

> >> From: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>

> >>

> >> The WPF IRQ enable and status macros have been incorrectly named WFP.

> >> Fix them accordingly, and update all uses of the macros.

> >>

> >> Signed-off-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>

> > 

> > Wow, and all this time it has escaped our eyes.

> > 

> > Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

> > 

> > Feel free to push. Oh, wait... I'm too used to libcamera :-)

> 

> Has this been collected anywhere?


It has now.

> I don't see it progressing.

> 

> >> ---

> >>  drivers/media/platform/vsp1/vsp1_drv.c  | 4 ++--

> >>  drivers/media/platform/vsp1/vsp1_regs.h | 8 ++++----

> >>  drivers/media/platform/vsp1/vsp1_wpf.c  | 2 +-

> >>  3 files changed, 7 insertions(+), 7 deletions(-)

> >>

> >> diff --git a/drivers/media/platform/vsp1/vsp1_drv.c b/drivers/media/platform/vsp1/vsp1_drv.c

> >> index de442d6c9926..1018786d0437 100644

> >> --- a/drivers/media/platform/vsp1/vsp1_drv.c

> >> +++ b/drivers/media/platform/vsp1/vsp1_drv.c

> >> @@ -44,7 +44,7 @@

> >>  

> >>  static irqreturn_t vsp1_irq_handler(int irq, void *data)

> >>  {

> >> -	u32 mask = VI6_WFP_IRQ_STA_DFE | VI6_WFP_IRQ_STA_FRE;

> >> +	u32 mask = VI6_WPF_IRQ_STA_DFE | VI6_WPF_IRQ_STA_FRE;

> >>  	struct vsp1_device *vsp1 = data;

> >>  	irqreturn_t ret = IRQ_NONE;

> >>  	unsigned int i;

> >> @@ -59,7 +59,7 @@ static irqreturn_t vsp1_irq_handler(int irq, void *data)

> >>  		status = vsp1_read(vsp1, VI6_WPF_IRQ_STA(i));

> >>  		vsp1_write(vsp1, VI6_WPF_IRQ_STA(i), ~status & mask);

> >>  

> >> -		if (status & VI6_WFP_IRQ_STA_DFE) {

> >> +		if (status & VI6_WPF_IRQ_STA_DFE) {

> >>  			vsp1_pipeline_frame_end(wpf->entity.pipe);

> >>  			ret = IRQ_HANDLED;

> >>  		}

> >> diff --git a/drivers/media/platform/vsp1/vsp1_regs.h b/drivers/media/platform/vsp1/vsp1_regs.h

> >> index fe3130db1fa2..97942436868c 100644

> >> --- a/drivers/media/platform/vsp1/vsp1_regs.h

> >> +++ b/drivers/media/platform/vsp1/vsp1_regs.h

> >> @@ -32,12 +32,12 @@

> >>  #define VI6_STATUS_SYS_ACT(n)		BIT((n) + 8)

> >>  

> >>  #define VI6_WPF_IRQ_ENB(n)		(0x0048 + (n) * 12)

> >> -#define VI6_WFP_IRQ_ENB_DFEE		BIT(1)

> >> -#define VI6_WFP_IRQ_ENB_FREE		BIT(0)

> >> +#define VI6_WPF_IRQ_ENB_DFEE		BIT(1)

> >> +#define VI6_WPF_IRQ_ENB_FREE		BIT(0)

> >>  

> >>  #define VI6_WPF_IRQ_STA(n)		(0x004c + (n) * 12)

> >> -#define VI6_WFP_IRQ_STA_DFE		BIT(1)

> >> -#define VI6_WFP_IRQ_STA_FRE		BIT(0)

> >> +#define VI6_WPF_IRQ_STA_DFE		BIT(1)

> >> +#define VI6_WPF_IRQ_STA_FRE		BIT(0)

> >>  

> >>  #define VI6_DISP_IRQ_ENB(n)		(0x0078 + (n) * 60)

> >>  #define VI6_DISP_IRQ_ENB_DSTE		BIT(8)

> >> diff --git a/drivers/media/platform/vsp1/vsp1_wpf.c b/drivers/media/platform/vsp1/vsp1_wpf.c

> >> index 208498fa6ed7..94e91d7bb56c 100644

> >> --- a/drivers/media/platform/vsp1/vsp1_wpf.c

> >> +++ b/drivers/media/platform/vsp1/vsp1_wpf.c

> >> @@ -342,7 +342,7 @@ static void wpf_configure_stream(struct vsp1_entity *entity,

> >>  	/* Enable interrupts. */

> >>  	vsp1_dl_body_write(dlb, VI6_WPF_IRQ_STA(index), 0);

> >>  	vsp1_dl_body_write(dlb, VI6_WPF_IRQ_ENB(index),

> >> -			   VI6_WFP_IRQ_ENB_DFEE);

> >> +			   VI6_WPF_IRQ_ENB_DFEE);

> >>  

> >>  	/*

> >>  	 * Configure writeback for display pipelines (the wpf writeback flag is


-- 
Regards,

Laurent Pinchart
diff mbox series

Patch

diff --git a/drivers/media/platform/vsp1/vsp1_drv.c b/drivers/media/platform/vsp1/vsp1_drv.c
index de442d6c9926..1018786d0437 100644
--- a/drivers/media/platform/vsp1/vsp1_drv.c
+++ b/drivers/media/platform/vsp1/vsp1_drv.c
@@ -44,7 +44,7 @@ 
 
 static irqreturn_t vsp1_irq_handler(int irq, void *data)
 {
-	u32 mask = VI6_WFP_IRQ_STA_DFE | VI6_WFP_IRQ_STA_FRE;
+	u32 mask = VI6_WPF_IRQ_STA_DFE | VI6_WPF_IRQ_STA_FRE;
 	struct vsp1_device *vsp1 = data;
 	irqreturn_t ret = IRQ_NONE;
 	unsigned int i;
@@ -59,7 +59,7 @@  static irqreturn_t vsp1_irq_handler(int irq, void *data)
 		status = vsp1_read(vsp1, VI6_WPF_IRQ_STA(i));
 		vsp1_write(vsp1, VI6_WPF_IRQ_STA(i), ~status & mask);
 
-		if (status & VI6_WFP_IRQ_STA_DFE) {
+		if (status & VI6_WPF_IRQ_STA_DFE) {
 			vsp1_pipeline_frame_end(wpf->entity.pipe);
 			ret = IRQ_HANDLED;
 		}
diff --git a/drivers/media/platform/vsp1/vsp1_regs.h b/drivers/media/platform/vsp1/vsp1_regs.h
index fe3130db1fa2..97942436868c 100644
--- a/drivers/media/platform/vsp1/vsp1_regs.h
+++ b/drivers/media/platform/vsp1/vsp1_regs.h
@@ -32,12 +32,12 @@ 
 #define VI6_STATUS_SYS_ACT(n)		BIT((n) + 8)
 
 #define VI6_WPF_IRQ_ENB(n)		(0x0048 + (n) * 12)
-#define VI6_WFP_IRQ_ENB_DFEE		BIT(1)
-#define VI6_WFP_IRQ_ENB_FREE		BIT(0)
+#define VI6_WPF_IRQ_ENB_DFEE		BIT(1)
+#define VI6_WPF_IRQ_ENB_FREE		BIT(0)
 
 #define VI6_WPF_IRQ_STA(n)		(0x004c + (n) * 12)
-#define VI6_WFP_IRQ_STA_DFE		BIT(1)
-#define VI6_WFP_IRQ_STA_FRE		BIT(0)
+#define VI6_WPF_IRQ_STA_DFE		BIT(1)
+#define VI6_WPF_IRQ_STA_FRE		BIT(0)
 
 #define VI6_DISP_IRQ_ENB(n)		(0x0078 + (n) * 60)
 #define VI6_DISP_IRQ_ENB_DSTE		BIT(8)
diff --git a/drivers/media/platform/vsp1/vsp1_wpf.c b/drivers/media/platform/vsp1/vsp1_wpf.c
index 208498fa6ed7..94e91d7bb56c 100644
--- a/drivers/media/platform/vsp1/vsp1_wpf.c
+++ b/drivers/media/platform/vsp1/vsp1_wpf.c
@@ -342,7 +342,7 @@  static void wpf_configure_stream(struct vsp1_entity *entity,
 	/* Enable interrupts. */
 	vsp1_dl_body_write(dlb, VI6_WPF_IRQ_STA(index), 0);
 	vsp1_dl_body_write(dlb, VI6_WPF_IRQ_ENB(index),
-			   VI6_WFP_IRQ_ENB_DFEE);
+			   VI6_WPF_IRQ_ENB_DFEE);
 
 	/*
 	 * Configure writeback for display pipelines (the wpf writeback flag is