Merge tag 'imx-drm-fixes-2018-08-03' of git://git.pengutronix.de/git/pza/linux into...

[linux-2.6-microblaze.git] / drivers / gpu / ipu-v3 / ipu-cpmem.c

diff --git a/drivers/gpu/ipu-v3/ipu-cpmem.c b/drivers/gpu/ipu-v3/ipu-cpmem.c
index 0f1155e..a9d2501 100644 (file)
--- a/drivers/gpu/ipu-v3/ipu-cpmem.c
+++ b/drivers/gpu/ipu-v3/ipu-cpmem.c
@@ -547,17 +547,17 @@ static const struct ipu_rgb def_bgra_16 = {
 
 #define Y_OFFSET(pix, x, y)    ((x) + pix->width * (y))
 #define U_OFFSET(pix, x, y)    ((pix->width * pix->height) +           \
-                                (pix->width * (y) / 4) + (x) / 2)
+                                (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) / 4) + (x) / 2)
+                                (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))
+                                (pix->width * ((y) / 2)) + (x))
 #define UV2_OFFSET(pix, x, y)  ((pix->width * pix->height) +   \
                                 (pix->width * y) + (x))