]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
gpu: ipu-v3: ipu-ic: Fix saturation bit offset in TPMEM
authorSteve Longerbeam <slongerbeam@gmail.com>
Wed, 22 May 2019 01:03:13 +0000 (18:03 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 26 Jul 2019 07:13:05 +0000 (09:13 +0200)
commit 3d1f62c686acdedf5ed9642b763f3808d6a47d1e upstream.

The saturation bit was being set at bit 9 in the second 32-bit word
of the TPMEM CSC. This isn't correct, the saturation bit is bit 42,
which is bit 10 of the second word.

Fixes: 1aa8ea0d2bd5d ("gpu: ipu-v3: Add Image Converter unit")
Signed-off-by: Steve Longerbeam <slongerbeam@gmail.com>
Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de>
Cc: stable@vger.kernel.org
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/gpu/ipu-v3/ipu-ic.c

index 594c3cbc8291b217a2ad6d5b87fe16a6782634fe..18816ccf600e7eaa68e232a6f881bb62d2099f3d 100644 (file)
@@ -257,7 +257,7 @@ static int init_csc(struct ipu_ic *ic,
        writel(param, base++);
 
        param = ((a[0] & 0x1fe0) >> 5) | (params->scale << 8) |
-               (params->sat << 9);
+               (params->sat << 10);
        writel(param, base++);
 
        param = ((a[1] & 0x1f) << 27) | ((c[0][1] & 0x1ff) << 18) |