Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp980600ybt; Wed, 17 Jun 2020 19:49:06 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzgJ4E0BDRuzScQ+KISBDK6iL4UdyOipziBxw7vPSDQIFupWAlQlunvFfwm1VRS1UrhE1Wl X-Received: by 2002:a17:906:1d41:: with SMTP id o1mr2043719ejh.477.1592448546068; Wed, 17 Jun 2020 19:49:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592448546; cv=none; d=google.com; s=arc-20160816; b=PbYyUzKBrxBhwGiS4ItMjOjBrqYPAjMDIvPtcPnbpE3hDy1SPB7Z6wTIGzQVwVG4jw Q69MGC+vmtkvRvHBpjaSYd5+2aYxSq1PzTvAUmsS5RRZvM/8IBDOwMvzntR1r7Reb9yx AtaXCoxlwNu2ZW6vSX6RcK9IMNoW4F95jxTM97E5qY6z2UsVguaKlTEW0GCKWqqhEduW dBsXw+OkQYf7ujtQqhTJLDjWK/qao2smHYobUEHnidrqTNWzBRjfj2cQ4rMuH1Yqr6ml 86VqhFks0z1uZw/SWvxQQ0vzpZqDF9JBtzMjBw8oDwiJ8xoWPwDwvmZEpRhxX8pGS68U ZqKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=6mabMh4JHmw3RwusyE0AOpdld4cwcNx7T0LcB1EFioA=; b=nTlPpfSjihvCZrTxSxXIQshhWpm0ssokbS820fOep5hDhBz4BMtILRmvYegCXFsERa 36/0OiTajsAI2gM1KaCV9g6QGHmVcs4g2IF8isKmyZMsh//inwFGiKurJJKUWq7PhrAR 1A9nLyMNJIxpQJOon6a+B4HpyiXf/ohP21q37d0EMCKaIVnduWExBM1QqyOXNLjBTe/V 5KRqp4d6PR5yfeCQuu0aSu3iAzW35oIkI0ujLNX9n+IX6Wkv75RDw+VPhbXrWXQrKY49 Lk0p+OhVSShLNCW65LolWON6bfSzWTcoshvun79kutDV6+ZbGP4ZQMimfoXE+ClFIThe bZSQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=1Fyu65O0; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id bs21si1132315edb.87.2020.06.17.19.48.43; Wed, 17 Jun 2020 19:49:06 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=1Fyu65O0; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730672AbgFRCqz (ORCPT + 99 others); Wed, 17 Jun 2020 22:46:55 -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: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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