From 9b2798d5b71c50f64c41a40f0cbcae47c3fbd067 Mon Sep 17 00:00:00 2001

From: Koji Matsuoka <koji.matsuoka.xm@renesas.com>

Date: Thu, 26 Oct 2017 02:27:51 -0400

Subject: [PATCH] media: vsp1: Fix YCbCr planar formats pitch calculation

Git-commit: 9b2798d5b71c50f64c41a40f0cbcae47c3fbd067

Patch-mainline: v4.20-rc1

References: bsc#1051510

YCbCr planar formats can have different pitch values for the luma and

chroma planes. This isn't taken into account in the driver. Fix it.

Based on a BSP patch from Koji Matsuoka <koji.matsuoka.xm@renesas.com>.

Fixes: 7863ac504bc5 ("drm: rcar-du: Add tri-planar memory formats support")

[Updated documentation of the struct vsp1_du_atomic_config pitch field]

Signed-off-by: Koji Matsuoka <koji.matsuoka.xm@renesas.com>

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>

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

Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>

Acked-by: Takashi Iwai <tiwai@suse.de>

---

 drivers/media/platform/vsp1/vsp1_drm.c |   11 ++++++++++-

 1 file changed, 10 insertions(+), 1 deletion(-)

--- a/drivers/media/platform/vsp1/vsp1_drm.c

+++ b/drivers/media/platform/vsp1/vsp1_drm.c

@@ -260,6 +260,7 @@ int vsp1_du_atomic_update(struct device

 {

 	struct vsp1_device *vsp1 = dev_get_drvdata(dev);

 	const struct vsp1_format_info *fmtinfo;

+	unsigned int chroma_hsub;

 	struct vsp1_rwpf *rpf;

 	if (rpf_index >= vsp1->info->rpf_count)

@@ -294,10 +295,18 @@ int vsp1_du_atomic_update(struct device

 		return -EINVAL;

 	}

+	/*

+	 * Only formats with three planes can affect the chroma planes pitch.

+	 * All formats with two planes have a horizontal subsampling value of 2,

+	 * but combine U and V in a single chroma plane, which thus results in

+	 * the luma plane and chroma plane having the same pitch.

+	 */

+	chroma_hsub = (fmtinfo->planes == 3) ? fmtinfo->hsub : 1;

+

 	rpf->fmtinfo = fmtinfo;

 	rpf->format.num_planes = fmtinfo->planes;

 	rpf->format.plane_fmt[0].bytesperline = cfg->pitch;

-	rpf->format.plane_fmt[1].bytesperline = cfg->pitch;

+	rpf->format.plane_fmt[1].bytesperline = cfg->pitch / chroma_hsub;

 	rpf->alpha = cfg->alpha;

 	rpf->mem.addr[0] = cfg->mem[0];