diff mbox series

[v2] rcar-vin: Use correct pixel format when aligning format

Message ID 20191204175759.2976251-1-niklas.soderlund+renesas@ragnatech.se (mailing list archive)
State Mainlined
Commit 1fd4d9cb739bd47b74840f8933616cc75341db05
Delegated to: Kieran Bingham
Headers show
Series [v2] rcar-vin: Use correct pixel format when aligning format | expand

Commit Message

Niklas Söderlund Dec. 4, 2019, 5:57 p.m. UTC
When aligning the format the pixel format that is being processed shall
be used to figure out alignment constraints, not the currently active
pixel format. The alignment might be part of a try operation and shall
not be effected by the active format. Fix this by looking at the correct
pixel format.

Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
---
 drivers/media/platform/rcar-vin/rcar-v4l2.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Laurent Pinchart Dec. 5, 2019, 8:52 a.m. UTC | #1
Hi Niklas,

Thank you for the patch.

On Wed, Dec 04, 2019 at 06:57:59PM +0100, Niklas Söderlund wrote:
> When aligning the format the pixel format that is being processed shall
> be used to figure out alignment constraints, not the currently active
> pixel format. The alignment might be part of a try operation and shall
> not be effected by the active format. Fix this by looking at the correct
> pixel format.
> 
> Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>

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

> ---
>  drivers/media/platform/rcar-vin/rcar-v4l2.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/media/platform/rcar-vin/rcar-v4l2.c b/drivers/media/platform/rcar-vin/rcar-v4l2.c
> index 62d308a4ddaee82e..339cb2de111de166 100644
> --- a/drivers/media/platform/rcar-vin/rcar-v4l2.c
> +++ b/drivers/media/platform/rcar-vin/rcar-v4l2.c
> @@ -149,7 +149,7 @@ static void rvin_format_align(struct rvin_dev *vin, struct v4l2_pix_format *pix)
>  	}
>  
>  	/* HW limit width to a multiple of 32 (2^5) for NV12/16 else 2 (2^1) */
> -	switch (vin->format.pixelformat) {
> +	switch (pix->pixelformat) {
>  	case V4L2_PIX_FMT_NV12:
>  	case V4L2_PIX_FMT_NV16:
>  		walign = 5;
diff mbox series

Patch

diff --git a/drivers/media/platform/rcar-vin/rcar-v4l2.c b/drivers/media/platform/rcar-vin/rcar-v4l2.c
index 62d308a4ddaee82e..339cb2de111de166 100644
--- a/drivers/media/platform/rcar-vin/rcar-v4l2.c
+++ b/drivers/media/platform/rcar-vin/rcar-v4l2.c
@@ -149,7 +149,7 @@  static void rvin_format_align(struct rvin_dev *vin, struct v4l2_pix_format *pix)
 	}
 
 	/* HW limit width to a multiple of 32 (2^5) for NV12/16 else 2 (2^1) */
-	switch (vin->format.pixelformat) {
+	switch (pix->pixelformat) {
 	case V4L2_PIX_FMT_NV12:
 	case V4L2_PIX_FMT_NV16:
 		walign = 5;