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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,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 CC23AC433E1 for ; Thu, 18 Jun 2020 02:46:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9FD9020776 for ; Thu, 18 Jun 2020 02:46:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592448419; bh=OhuwWR1pHKkKg0JA0TgwM8GDNArAPfNmbW5ZA4DO098=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=fIgdHgoJd9KmWX19gzLUNB23d6QoBurAcrejEFDK11niDDDCHe4StTB2bLWBZZDWo 10Ha5WnZMvrL3Zkt49bVBQc6uUPx5mp2OSZcUJCnj6bTwuORQ4pg8gE/UdLQRj72Sg qhzpzN5t4cgiGk/Q3WaRUqCIkrZdqVfHzS9ns2Ao= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732281AbgFRCqy (ORCPT ); Wed, 17 Jun 2020 22:46:54 -0400 Received: from mail.kernel.org ([198.145.29.99]:37752 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727107AbgFRBKc (ORCPT ); Wed, 17 Jun 2020 21:10:32 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 5BF9320CC7; Thu, 18 Jun 2020 01:10:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592442632; bh=OhuwWR1pHKkKg0JA0TgwM8GDNArAPfNmbW5ZA4DO098=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1Fyu65O0yPxm1z8XBQ6qO1s0hvFoU2WT43c3qNFawxAO16XPmp+QotEB1TwVMUFGX /0lX+Bqy+sU8Zvnlvd5THQEH45zclicLcle607KZETvNrBV6L6OKPcANlhJJaGSkZF Tz56NMcz2fw3KVK0lM6juhOxy2kmmEKur2rl/sm8= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Jonas Karlman , Hans Verkuil , Mauro Carvalho Chehab , Sasha Levin , linux-media@vger.kernel.org Subject: [PATCH AUTOSEL 5.7 109/388] media: v4l2-ctrls: Unset correct HEVC loop filter flag Date: Wed, 17 Jun 2020 21:03:26 -0400 Message-Id: <20200618010805.600873-109-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200618010805.600873-1-sashal@kernel.org> References: <20200618010805.600873-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Jonas Karlman [ Upstream commit 88441917dc6cd995cb993df603e264f5b88be50c ] Wrong loop filter flag is unset when tiles enabled flag is not set, this cause HEVC decoding issues with Rockchip Video Decoder. Fix this by unsetting the loop filter across tiles enabled flag instead of the pps loop filter across slices enabled flag when tiles are disabled. Fixes: 256fa3920874 ("media: v4l: Add definitions for HEVC stateless decoding") Signed-off-by: Jonas Karlman Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- drivers/media/v4l2-core/v4l2-ctrls.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/v4l2-core/v4l2-ctrls.c b/drivers/media/v4l2-core/v4l2-ctrls.c index 93d33d1db4e8..07d9ae7a929c 100644 --- a/drivers/media/v4l2-core/v4l2-ctrls.c +++ b/drivers/media/v4l2-core/v4l2-ctrls.c @@ -1825,7 +1825,7 @@ static int std_validate_compound(const struct v4l2_ctrl *ctrl, u32 idx, sizeof(p_hevc_pps->row_height_minus1)); p_hevc_pps->flags &= - ~V4L2_HEVC_PPS_FLAG_PPS_LOOP_FILTER_ACROSS_SLICES_ENABLED; + ~V4L2_HEVC_PPS_FLAG_LOOP_FILTER_ACROSS_TILES_ENABLED; } if (p_hevc_pps->flags & -- 2.25.1