Received: by 10.192.165.156 with SMTP id m28csp295882imm; Tue, 17 Apr 2018 10:14:47 -0700 (PDT) X-Google-Smtp-Source: AIpwx494Tml9wa9lTYvpclmMtE2oHHQT3RrJThAztDFcBOU4bRsF3W/W41LCNpLi/qnnKcl9BwSM X-Received: by 10.98.163.145 with SMTP id q17mr2023563pfl.87.1523985287851; Tue, 17 Apr 2018 10:14:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523985287; cv=none; d=google.com; s=arc-20160816; b=AvTOSuH2OB+ysISHCRhAUqrU/8RVYElmQ04T4fzin3+2zBf3rnnmGz1Q3DdJ8B0xYN qKF0TBjQMnVvTMoXuC71r3SOPg/p8ry8P/FWLGp0r9dtvLeJUrMF1webZZqW5RhU3N0i l7AAU6ecA6SbzTFxWkZJNqeW8iGFWig5Z8ToxiaxCBwoXJiKt4g6+Vb4z+chMXyd0zeT EQsDWCOz0shhYHkOWsJBO140kUWODmBMENFubhLtPzZnsryH9nNwmJwSj5MQzfZg2kCZ 9zHd+1Rv5uqUXkMOO4W9VYiF9RJNIscORUdGrnqUO5Pim+OUVqau2T+efXIG3xp3Lq1h 9zBg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=G2rVsmtcVrcQnswDHo8S8x+RI9IUr5xlhRtmPbHIX5w=; b=IBwQ4kvRQIh8sJh4BpTinXNxgqcKjEMgJ604lLiykgPs5Sv3EaCtZiwX1ey6tWPpE/ SvSZD8BRNPr3AnCHwfAecbMXhiX5k/egR95xp9F7VXb2n73o/N9HvBJ30INqbdo5J+e0 UzwcrT0iv74uHS6g77JuIOIGsrUNJdh7IaN9zQ/A14Svk14GcgaWJ2k57QJrXw/9dGxY CXptND6So/UX+1oICTex2BgLs/eQCj9T8YAtMnLHasgnToMa9bdqbqNVtBtfCP/kyUds p9b80gGSznwpjHoRLbybqGf9j/25/ZhD3mSJOpaEEJxPmu3830SAyRXaN6eV48L3AiMw 53mQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id c15si11717667pgu.312.2018.04.17.10.14.34; Tue, 17 Apr 2018 10:14:47 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753383AbeDQRN1 (ORCPT + 99 others); Tue, 17 Apr 2018 13:13:27 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:60022 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752696AbeDQQAK (ORCPT ); Tue, 17 Apr 2018 12:00:10 -0400 Received: from localhost (unknown [46.44.180.42]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id 4B32AD6A; Tue, 17 Apr 2018 16:00:09 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Kieran Bingham , Laurent Pinchart , Mauro Carvalho Chehab Subject: [PATCH 4.16 13/68] media: v4l: vsp1: Fix header display list status check in continuous mode Date: Tue, 17 Apr 2018 17:57:26 +0200 Message-Id: <20180417155749.871501229@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180417155749.341779147@linuxfoundation.org> References: <20180417155749.341779147@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.16-stable review patch. If anyone has any objections, please let me know. ------------------ From: Kieran Bingham commit 613928e85317b945c863bb893f5737d2f22f5425 upstream. To allow dual pipelines utilising two WPF entities when available, the VSP was updated to support header-mode display list in continuous pipelines. A small bug in the status check of the command register causes the second pipeline to be directly afflicted by the running of the first; appearing as a perceived performance issue with stuttering display. Fix the vsp1_dl_list_hw_update_pending() call to ensure that the read comparison corresponds to the correct pipeline. Fixes: eaf4bfad6ad8 ("v4l: vsp1: Add support for header display lists in continuous mode") Cc: "Stable v4.14+" Signed-off-by: Kieran Bingham Signed-off-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Greg Kroah-Hartman --- drivers/media/platform/vsp1/vsp1_dl.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/drivers/media/platform/vsp1/vsp1_dl.c +++ b/drivers/media/platform/vsp1/vsp1_dl.c @@ -509,7 +509,8 @@ static bool vsp1_dl_list_hw_update_pendi return !!(vsp1_read(vsp1, VI6_DL_BODY_SIZE) & VI6_DL_BODY_SIZE_UPD); else - return !!(vsp1_read(vsp1, VI6_CMD(dlm->index) & VI6_CMD_UPDHDR)); + return !!(vsp1_read(vsp1, VI6_CMD(dlm->index)) + & VI6_CMD_UPDHDR); } static void vsp1_dl_list_hw_enqueue(struct vsp1_dl_list *dl)