Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b820c4c6 authored by Krzysztof Hałasa's avatar Krzysztof Hałasa Committed by Greg Kroah-Hartman
Browse files

gpu: ipu-v3: Fix i.MX IPU-v3 offset calculations for (semi)planar U/V formats 



[ Upstream commit 7cca7c8096e2c8a4149405438329b5035d0744f0 ]

Video captured in 1400x1050 resolution (bytesperline aka stride = 1408
bytes) is invalid. Fix it.

Signed-off-by: default avatarKrzysztof Halasa <khalasa@piap.pl>
Link: https://lore.kernel.org/r/m3y2bmq7a4.fsf@t19.piap.pl


[p.zabel@pengutronix.de: added "gpu: ipu-v3:" prefix to commit description]
Signed-off-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 48051387

drivers/gpu/ipu-v3/ipu-cpmem.c

+15 −15
Original line number Diff line number Diff line
@@ -585,21 +585,21 @@ static const struct ipu_rgb def_bgra_16 = { 
	.bits_per_pixel = 16,

};



#define Y_OFFSET(pix, x, y)	((x) + pix->width * (y))

#define U_OFFSET(pix, x, y)	((pix->width * pix->height) +		\

				 (pix->width * ((y) / 2) / 2) + (x) / 2)

#define V_OFFSET(pix, x, y)	((pix->width * pix->height) +		\

				 (pix->width * pix->height / 4) +	\

				 (pix->width * ((y) / 2) / 2) + (x) / 2)

#define U2_OFFSET(pix, x, y)	((pix->width * pix->height) +		\

				 (pix->width * (y) / 2) + (x) / 2)

#define V2_OFFSET(pix, x, y)	((pix->width * pix->height) +		\

				 (pix->width * pix->height / 2) +	\

				 (pix->width * (y) / 2) + (x) / 2)

#define UV_OFFSET(pix, x, y)	((pix->width * pix->height) +	\

				 (pix->width * ((y) / 2)) + (x))

#define UV2_OFFSET(pix, x, y)	((pix->width * pix->height) +	\

				 (pix->width * y) + (x))

#define Y_OFFSET(pix, x, y)	((x) + pix->bytesperline * (y))

#define U_OFFSET(pix, x, y)	((pix->bytesperline * pix->height) +	 \

				 (pix->bytesperline * ((y) / 2) / 2) + (x) / 2)

#define V_OFFSET(pix, x, y)	((pix->bytesperline * pix->height) +	 \

				 (pix->bytesperline * pix->height / 4) + \

				 (pix->bytesperline * ((y) / 2) / 2) + (x) / 2)

#define U2_OFFSET(pix, x, y)	((pix->bytesperline * pix->height) +	 \

				 (pix->bytesperline * (y) / 2) + (x) / 2)

#define V2_OFFSET(pix, x, y)	((pix->bytesperline * pix->height) +	 \

				 (pix->bytesperline * pix->height / 2) + \

				 (pix->bytesperline * (y) / 2) + (x) / 2)

#define UV_OFFSET(pix, x, y)	((pix->bytesperline * pix->height) +	 \

				 (pix->bytesperline * ((y) / 2)) + (x))

#define UV2_OFFSET(pix, x, y)	((pix->bytesperline * pix->height) +	 \

				 (pix->bytesperline * y) + (x))



#define NUM_ALPHA_CHANNELS	7