From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 19FB1C76186 for ; Wed, 24 Jul 2019 20:01:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DAC282147A for ; Wed, 24 Jul 2019 20:01:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563998472; bh=CqM/3sez9hDpYLVaIcw1Q3PHotGioltshOsUtlzve/8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=CFnp/A7a8XKuKn4KHg/YZwHL464H0e5moUcjdPqfASltBjNCgSsBJLU+cAMXRunWd ShjrFss+uvy6SUuQfHQ6MBil9NFEwWg67YXit1/YFQhpekba2+Wl8iBeO7pdCgQo6K Ph7E6ghx/AMtWFOn3apqOxtLK/nDOeqA7CQB7ZZY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2405355AbfGXUBK (ORCPT ); Wed, 24 Jul 2019 16:01:10 -0400 Received: from mail.kernel.org ([198.145.29.99]:49658 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391853AbfGXUBH (ORCPT ); Wed, 24 Jul 2019 16:01:07 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 30B0F206BA; Wed, 24 Jul 2019 20:01:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563998466; bh=CqM/3sez9hDpYLVaIcw1Q3PHotGioltshOsUtlzve/8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1PEk1Wlb73wMRPM5gNw34rOlPGRQe78bz/b4eIA9Mx/4WVVaIthe1dv59qe5R+wPC dw0HXEfRAAm0bz36EKs8pGYLjWg27cdWIOyH62LqeEnybHe2NSfytjbZJuXjPxXN+6 dUaLbqPvBgpVr7pnLNgXgDJU7ZQy9kh6MR9htdL4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Steve Longerbeam , Philipp Zabel Subject: [PATCH 5.1 346/371] gpu: ipu-v3: ipu-ic: Fix saturation bit offset in TPMEM Date: Wed, 24 Jul 2019 21:21:38 +0200 Message-Id: <20190724191749.725185400@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190724191724.382593077@linuxfoundation.org> References: <20190724191724.382593077@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Steve Longerbeam 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 Reviewed-by: Philipp Zabel Cc: stable@vger.kernel.org Signed-off-by: Philipp Zabel Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/ipu-v3/ipu-ic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/gpu/ipu-v3/ipu-ic.c +++ b/drivers/gpu/ipu-v3/ipu-ic.c @@ -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) |