Received: by 2002:a05:6358:4e97:b0:b3:742d:4702 with SMTP id ce23csp2930296rwb; Mon, 15 Aug 2022 14:16:07 -0700 (PDT) X-Google-Smtp-Source: AA6agR7J0peme6T3Z/tFTLtVJ8GRoiEEmq83/GacmzwZF8a53b9R+xHNe9Q1fJJzw4kFZ60Okf9y X-Received: by 2002:a05:6a00:cc4:b0:52e:a830:2b5d with SMTP id b4-20020a056a000cc400b0052ea8302b5dmr18161429pfv.67.1660598069644; Mon, 15 Aug 2022 14:14:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1660598069; cv=none; d=google.com; s=arc-20160816; b=kIGoN+i+cWDNpizVuwAOimDT+yb3SUdyvWy+3B53EPKQy9z2OHUwK7G3xgSDqCn+8O 5pP0mBREhI1XSgIDbwqD3Yz/Fk4rCyxHZGV+KRXg6pSbSmYIQN8EWhwtIm2Azju/fFRe sg+CUrcSDPxDZQiaWYbV5Z4EvvlR1fSEXxTRn+EsG2zTjc5SQkBoAD8hAAv6z0jNm+g0 I7D5NVG9/b46Nukhj3iJlAkul566z/zePgVOJN01VAHEoUgnBhDk7vIW4++m1ma1HD3e D7lK1P20eBV2e4rx1Tu+I7LbflALIPFy/WIcFYYx3LKXj6XJVwdi6Ii1bFe8n844eTMC Mcnw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=ePJQCrHvjPbG3GKv+B4qoK3p0aRp1KZi3W1ravmPwso=; b=XnVEy6Cx5BzGne+NG2/D60rXUt+RG3sD1Z5oX7jmw1I3s6D2pRtUZGUgkl9JZ69Xn/ eo3HDHwYNZGxBj7kiQ4puNwk6KOW3ZJVXYDE2PbJblGUWQJ2/xQUBHpUJWXR4i04pnvl lI1fk6UWjNucpvoCydu2lLPtc17/NcU3PG5jZcY26wMd1HJ7OMDD+swmO88yRs/zkMMK pPSVTmc+ggJhy5AwPB8UeH/p3TnazrpAyMtCDFWlFB6bivphrPWXtrQwsUU4Xk+YoUrm dwkzZiRdml8QD1Yy5GmN2OzqsqcVRI/T4ei91VJYv4KHBSSiuilg/fO76pLinvshrfgj Xb2A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=u1C9dhP1; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id d5-20020a170903230500b0016d19a07f40si12928654plh.55.2022.08.15.14.14.18; Mon, 15 Aug 2022 14:14:29 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=u1C9dhP1; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241940AbiHOVEr (ORCPT + 99 others); Mon, 15 Aug 2022 17:04:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55446 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347049AbiHOU4P (ORCPT ); Mon, 15 Aug 2022 16:56:15 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3BFBE4F688; Mon, 15 Aug 2022 12:12:10 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id BE9C2B81106; Mon, 15 Aug 2022 19:12:08 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0CEBFC433D6; Mon, 15 Aug 2022 19:12:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1660590727; bh=hHCohr2pvT6665QyvBJWeiuo0wm6VPzuTJD4FG3o8RE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=u1C9dhP18lb6YuSI3CL+RapagO/UAKjuIjpoZmJuMif6+W9JsuYzdEoYPRk596BuC kDwunPAtk0YvlYE13obUUV++hpAGNuXbzrtqhNLbR3lzzwkvLnh+iihpSpjRzVCw+E VLeNrzIOjVfhgbQ6K6ZTZiMPeV2LN9BcQSsVK4bI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Benjamin Gaignard , Nicolas Dufresne , Hans Verkuil , Mauro Carvalho Chehab , Sasha Levin Subject: [PATCH 5.18 0351/1095] media: Hantro: Correct G2 init qp field Date: Mon, 15 Aug 2022 19:55:50 +0200 Message-Id: <20220815180444.286333757@linuxfoundation.org> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220815180429.240518113@linuxfoundation.org> References: <20220815180429.240518113@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Benjamin Gaignard [ Upstream commit 300065f966d30baa59a13849753305aac8c320c3 ] Documentation said that g2 init_qp field use bits 24 to 30 of the 8th register. Change the field mask to be able to set 7 bits and not only 6 of them. Conformance test INITQP_B_Main10_Sony_1 decoding is OK with this patch. Fixes: cb5dd5a0fa518 ("media: hantro: Introduce G2/HEVC decoder") Signed-off-by: Benjamin Gaignard Reviewed-by: Nicolas Dufresne Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- drivers/staging/media/hantro/hantro_g2_regs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/media/hantro/hantro_g2_regs.h b/drivers/staging/media/hantro/hantro_g2_regs.h index b7c6f9877b9d..0f43516d0805 100644 --- a/drivers/staging/media/hantro/hantro_g2_regs.h +++ b/drivers/staging/media/hantro/hantro_g2_regs.h @@ -107,7 +107,7 @@ #define g2_start_code_e G2_DEC_REG(10, 31, 0x1) #define g2_init_qp_old G2_DEC_REG(10, 25, 0x3f) -#define g2_init_qp G2_DEC_REG(10, 24, 0x3f) +#define g2_init_qp G2_DEC_REG(10, 24, 0x7f) #define g2_num_tile_cols_old G2_DEC_REG(10, 20, 0x1f) #define g2_num_tile_cols G2_DEC_REG(10, 19, 0x1f) #define g2_num_tile_rows_old G2_DEC_REG(10, 15, 0x1f) -- 2.35.1