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=ham 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 4E394C76186 for ; Wed, 24 Jul 2019 20:24:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 10080214AF for ; Wed, 24 Jul 2019 20:24:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563999861; bh=BO3WXfvLTtB82+HMoOJxdimQms4+C4YlVbblqXAHaoU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=t3VOVn+4eMRyXmWPLLtrk8vE4UTTXCtbKhaAyuDJWLfn0GPUtFC1BBWE9spMaInQF XNWSyGDbooLQEDtXsG7kigjB3kJb6dPzugiJrpv5IgFOGvEFvx9ypXxm4bjWBEUxRk 13R78q//sVsg3i3mzzqVyLnvM0KEoe7HM1/7KxM8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390208AbfGXTle (ORCPT ); Wed, 24 Jul 2019 15:41:34 -0400 Received: from mail.kernel.org ([198.145.29.99]:42924 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390199AbfGXTlb (ORCPT ); Wed, 24 Jul 2019 15:41:31 -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 7D56F229F3; Wed, 24 Jul 2019 19:41:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563997290; bh=BO3WXfvLTtB82+HMoOJxdimQms4+C4YlVbblqXAHaoU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=R/IJWqWy1a9BWQJzjk5T9FVVGNlDpD4Q+HNWHWv0bYZftcBNuqlgP7743y8YFHYtk eD+fr/P0YPK9/YgtMhhHl8pE/X5B7PRCWbma/fGoGR0+eQSNdW8BujIDL5F8fiYfSu siQWEVSD1TIoca5h0BWpZZj87YwvPoDd1ruD9+8o= 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.2 383/413] gpu: ipu-v3: ipu-ic: Fix saturation bit offset in TPMEM Date: Wed, 24 Jul 2019 21:21:14 +0200 Message-Id: <20190724191802.459356008@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190724191735.096702571@linuxfoundation.org> References: <20190724191735.096702571@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 @@ -251,7 +251,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) |