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.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,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 41274C433E0 for ; Tue, 23 Jun 2020 21:40:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1388420888 for ; Tue, 23 Jun 2020 21:40:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592948449; bh=Or7bgk3QY/n+v+HTyTA+PnHw8GsmRBL3MiCX0UeA+aw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=q33k3Je6lTP0+gDASuwaPjSROGY3HFGjCsXPIT8td/WiEquHlSo3/9rzLfLBf5Xhs VXTHfF3ifsLJ9ETAaCqAyOyJGcxYTLhswvTCXfwBeQEQZKgDK6s6+NCuRdQ5WVVxTl z3gP3hIyNAmdVvK9PmFN9aSuT/O/biniKDo9NHYY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388330AbgFWVkr (ORCPT ); Tue, 23 Jun 2020 17:40:47 -0400 Received: from mail.kernel.org ([198.145.29.99]:46770 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388494AbgFWUGg (ORCPT ); Tue, 23 Jun 2020 16:06:36 -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 ADBED2078A; Tue, 23 Jun 2020 20:06:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592942796; bh=Or7bgk3QY/n+v+HTyTA+PnHw8GsmRBL3MiCX0UeA+aw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tbDA+z35j3zt4XfApDS6RmcGWZIcaf8hNkzxSdDna/QYmUHVzdQgc1ywCaKItcCi7 +RvW01tern/pzNMt+16Foep0fAmX+tYb5Bax8q/jDh2GvIPd83Uqh0xKcU2Kh4M2UD KwtE7nd85eYRHra3BBM5ADkgR1jxtXEaQlPPMtb0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jonas Karlman , Hans Verkuil , Mauro Carvalho Chehab , Sasha Levin Subject: [PATCH 5.7 108/477] media: v4l2-ctrls: Unset correct HEVC loop filter flag Date: Tue, 23 Jun 2020 21:51:45 +0200 Message-Id: <20200623195412.699364756@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200623195407.572062007@linuxfoundation.org> References: <20200623195407.572062007@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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 452edd06d67d7..99fd377f9b81a 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