Skip to contentSkip to conversation

v4l: vsp1: Fix continuous mode for dual pipelines

PATCH In review Kieran Bingham 3 participants 3 messages Feb 9, 2018

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 v4l: vsp1: Fix continuous mode for dual pipelines

From: Kieran Bingham <[email protected]>

To allow dual pipelines utilising two WPF entities when available, the VSP was updated to support header-mode display list in continuous pipelines.

A small bug in the status check of the command register causes the second pipeline to be directly afflicted by the running of the first; appearing as a perceived performance issue with stuttering display.

Fix the vsp1_dl_list_hw_update_pending() call to ensure that the read comparison corresponds to the correct pipeline.

Fixes eaf4bfad6ad8 ("v4l: vsp1: Add support for header display

lists in continuous mode")
Cc: "Stable v4.14+" <[email protected]>

---
 drivers/media/platform/vsp1/vsp1_dl.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/media/platform/vsp1/vsp1_dl.c +2 -1
index 8cd03ee45f79..34b5ed2592f8 100644
@@ -509,7 +509,8 @@ static bool vsp1_dl_list_hw_update_pending(struct vsp1_dl_manager *dlm)
 		return !!(vsp1_read(vsp1, VI6_DL_BODY_SIZE)
 			  & VI6_DL_BODY_SIZE_UPD);
 	else
-		return !!(vsp1_read(vsp1, VI6_CMD(dlm->index) & VI6_CMD_UPDHDR));
+		return !!(vsp1_read(vsp1, VI6_CMD(dlm->index))
+			  & VI6_CMD_UPDHDR);
 }
 
 static bool vsp1_dl_hw_active(struct vsp1_dl_manager *dlm)
Signature · 1 line
2.7.4
Reviewed-by on v1 1/1
#1 lore raw

Hi Kieran,

Thank you for the patch.

Quoted 10 lines · On Friday, 9 February 2018 15:18:25 EET Kieran Bingham wrote:

From: Kieran Bingham <[email protected]>

To allow dual pipelines utilising two WPF entities when available, the VSP was updated to support header-mode display list in continuous pipelines.

A small bug in the status check of the command register causes the second pipeline to be directly afflicted by the running of the first; appearing as a perceived performance issue with stuttering display.

Quoted 8 lines

Fix the vsp1_dl_list_hw_update_pending() call to ensure that the read comparison corresponds to the correct pipeline.

Fixes eaf4bfad6ad8 ("v4l: vsp1: Add support for header display

lists in continuous mode")
Cc: "Stable v4.14+" <[email protected]>

Good catch !

The patch looks good to me, but I wonder if we shouldn't write the subject line as "v4l: vsp1: Fix header display list status check in continuous mode". Sure, we're fixing continuous mode for dual pipelines, but that's more of a side effect, it's header display lists that are broken as a whole in continuous mode, even if we only use that for dual pipelines right now.

Apart from that,

Please let me know if you'd like to rewrite the commit message.

Quoted 10 lines
---
 drivers/media/platform/vsp1/vsp1_dl.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
(quoted diff) +0 -0

b/drivers/media/platform/vsp1/vsp1_dl.c index 8cd03ee45f79..34b5ed2592f8 100644

drivers/media/platform/vsp1/vsp1_dl.c static bool vsp1_dl_list_hw_update_pending(struct · line 513

Quoted 6 lines
drivers/media/platform/vsp1/vsp1_dl.c +2 -1
@@ -509,7 +509,8 @@ static bool vsp1_dl_list_hw_update_pending(struct
 vsp1_dl_manager *dlm) return !!(vsp1_read(vsp1, VI6_DL_BODY_SIZE)
 			  & VI6_DL_BODY_SIZE_UPD);
 	else
-		return !!(vsp1_read(vsp1, VI6_CMD(dlm->index) & VI6_CMD_UPDHDR));
+		return !!(vsp1_read(vsp1, VI6_CMD(dlm->index))
+			  & VI6_CMD_UPDHDR);

/me feels so ashamed.

Quoted 3 lines
drivers/media/platform/vsp1/vsp1_dl.c +0 -0
 }
 
 static bool vsp1_dl_hw_active(struct vsp1_dl_manager *dlm)
Signature · 3 lines
Regards,

Laurent Pinchart
#2 lore raw

Hi Laurent,

Quoted 22 lines · Laurent Pinchart

Hi Kieran,

Thank you for the patch.

Quoted 17 lines · On Friday, 9 February 2018 15:18:25 EET Kieran Bingham wrote:

From: Kieran Bingham <[email protected]>

To allow dual pipelines utilising two WPF entities when available, the VSP was updated to support header-mode display list in continuous pipelines.

A small bug in the status check of the command register causes the second pipeline to be directly afflicted by the running of the first; appearing as a perceived performance issue with stuttering display.

Fix the vsp1_dl_list_hw_update_pending() call to ensure that the read comparison corresponds to the correct pipeline.

Fixes eaf4bfad6ad8 ("v4l: vsp1: Add support for header display

lists in continuous mode")
Cc: "Stable v4.14+" <[email protected]>

Quoted 6 lines
Quoted 1 line

Good catch !

The patch looks good to me, but I wonder if we shouldn't write the subject line as "v4l: vsp1: Fix header display list status check in continuous mode".

I'm fine with that,

Will resend with your RB tag.

Quoted 14 lines

Sure, we're fixing continuous mode for dual pipelines, but that's more of a side effect, it's header display lists that are broken as a whole in continuous mode, even if we only use that for dual pipelines right now.

Apart from that,

Please let me know if you'd like to rewrite the commit message.

Quoted 4 lines
---
 drivers/media/platform/vsp1/vsp1_dl.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
Quoted 14 lines

drivers/media/platform/vsp1/vsp1_dl.c static bool vsp1_dl_list_hw_update_pending(struct · line 513

Quoted 12 lines
(quoted diff) +0 -0

b/drivers/media/platform/vsp1/vsp1_dl.c index 8cd03ee45f79..34b5ed2592f8 100644

drivers/media/platform/vsp1/vsp1_dl.c +2 -1
@@ -509,7 +509,8 @@ static bool vsp1_dl_list_hw_update_pending(struct
 vsp1_dl_manager *dlm) return !!(vsp1_read(vsp1, VI6_DL_BODY_SIZE)
 			  & VI6_DL_BODY_SIZE_UPD);
 	else
-		return !!(vsp1_read(vsp1, VI6_CMD(dlm->index) & VI6_CMD_UPDHDR));
+		return !!(vsp1_read(vsp1, VI6_CMD(dlm->index))
+			  & VI6_CMD_UPDHDR);

/me feels so ashamed.

Bah, it's only a brace out of place. I mean, what harm could it do ... hehe :-)

Personally I still blame the compiler for not picking up on the fact that we told it to do something we didn't want it to do.

/me ducks to avoid all the items thrown by the compiler guys...

Quoted 3 lines

drivers/media/platform/vsp1/vsp1_dl.c static bool vsp1_dl_list_hw_update_pending(struct vsp1_dl_manager *dlm) · line 516

Quoted 3 lines
drivers/media/platform/vsp1/vsp1_dl.c +0 -0
 }
 
 static bool vsp1_dl_hw_active(struct vsp1_dl_manager *dlm)

--
Kieran