diff options
| author |   Steve Longerbeam <slongerbeam@gmail.com> | 2019-06-11 18:16:56 -0700 |
|---|---|---|
| committer |   Philipp Zabel <p.zabel@pengutronix.de> | 2019-06-14 14:06:16 +0200 |
| commit | bca4d70cf1b8f6478a711c448a3a1e47b794b162 (patch) | |
| tree | dd7b02ed3a3dbddff87eac64bff59df369c9e120 /drivers/gpu/ipu-v3 | |
| parent | gpu: ipu-v3: image-convert: Fix input bytesperline width/height align (diff) | |
| download | linux-dev-bca4d70cf1b8f6478a711c448a3a1e47b794b162.tar.xz linux-dev-bca4d70cf1b8f6478a711c448a3a1e47b794b162.zip | |
gpu: ipu-v3: image-convert: Fix input bytesperline for packed formats
The input bytesperline calculation for packed pixel formats was
incorrect. The min/max clamping values must be multiplied by the
packed bits-per-pixel. This was causing corrupted converted images
when the input format was RGB4 (probably also other input packed
formats).
Fixes: d966e23d61a2c ("gpu: ipu-v3: image-convert: fix bytesperline
adjustment")
Reported-by: Harsha Manjula Mallikarjun <Harsha.ManjulaMallikarjun@in.bosch.com>
Suggested-by: Harsha Manjula Mallikarjun <Harsha.ManjulaMallikarjun@in.bosch.com>
Signed-off-by: Steve Longerbeam <slongerbeam@gmail.com>
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Diffstat (limited to 'drivers/gpu/ipu-v3')
| -rw-r--r-- | drivers/gpu/ipu-v3/ipu-image-convert.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/ipu-v3/ipu-image-convert.c b/drivers/gpu/ipu-v3/ipu-image-convert.c index 36eb4c77ad91..4dfdbd1adf0d 100644 --- a/drivers/gpu/ipu-v3/ipu-image-convert.c +++ b/drivers/gpu/ipu-v3/ipu-image-convert.c @@ -1933,7 +1933,9 @@ void ipu_image_convert_adjust(struct ipu_image *in, struct ipu_image *out, clamp_align(in->pix.width, 2 << w_align_in, MAX_W, w_align_in) : clamp_align((in->pix.width * infmt->bpp) >> 3, - 2 << w_align_in, MAX_W, w_align_in); + ((2 << w_align_in) * infmt->bpp) >> 3, + (MAX_W * infmt->bpp) >> 3, + w_align_in); in->pix.sizeimage = infmt->planar ? (in->pix.height * in->pix.bytesperline * infmt->bpp) >> 3 : in->pix.height * in->pix.bytesperline; |