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=-9.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,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 96CBAC43381 for ; Sun, 17 Feb 2019 02:49:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4D5D32147C for ; Sun, 17 Feb 2019 02:49:02 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="WN0j3bdr" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727978AbfBQCtB (ORCPT ); Sat, 16 Feb 2019 21:49:01 -0500 Received: from perceval.ideasonboard.com ([213.167.242.64]:45152 "EHLO perceval.ideasonboard.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727920AbfBQCtB (ORCPT ); Sat, 16 Feb 2019 21:49:01 -0500 Received: from pendragon.bb.dnainternet.fi (dfj612yhrgyx302h3jwwy-3.rev.dnainternet.fi [IPv6:2001:14ba:21f5:5b00:ce28:277f:58d7:3ca4]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 1F0D8122A; Sun, 17 Feb 2019 03:49:00 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1550371740; bh=LMliMucKn4CzlEqVX18ntGVxpXcJeq/6qcz6xDdtHiA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WN0j3bdrE/k8HSIzhcEtbBOmJ0wbyQoe92Yc7wVlSDj+bj7aKMntA8YvgQvpzB4XR uHwRpCCloFbv2hkJmbdp4adtWg7s/jh4iUYc/dwsgYIuaH0bmyTlL6Qf4YMzZp3M4z rz90PWOrVAlXxkPdk1kXUBg0tMOcUU4CD9H1/XHU= From: Laurent Pinchart To: linux-media@vger.kernel.org, dri-devel@lists.freedesktop.org Cc: Kieran Bingham Subject: [PATCH v4 1/7] Revert "[media] v4l: vsp1: Supply frames to the DU continuously" Date: Sun, 17 Feb 2019 04:48:46 +0200 Message-Id: <20190217024852.23328-2-laurent.pinchart+renesas@ideasonboard.com> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20190217024852.23328-1-laurent.pinchart+renesas@ideasonboard.com> References: <20190217024852.23328-1-laurent.pinchart+renesas@ideasonboard.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org From: Kieran Bingham This reverts commit 3299ba5c0b21 ("[media] v4l: vsp1: Supply frames to the DU continuously") The DU output mode does not rely on frames being supplied on the WPF as its pipeline is supplied from DRM. For the upcoming WPF writeback functionality, we will choose to enable writeback mode if there is an output buffer, or disable it (leaving the existing display pipeline unharmed) otherwise. Signed-off-by: Kieran Bingham --- drivers/media/platform/vsp1/vsp1_video.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/drivers/media/platform/vsp1/vsp1_video.c b/drivers/media/platform/vsp1/vsp1_video.c index 7ceaf3222145..328d686189be 100644 --- a/drivers/media/platform/vsp1/vsp1_video.c +++ b/drivers/media/platform/vsp1/vsp1_video.c @@ -307,11 +307,6 @@ static int vsp1_video_pipeline_setup_partitions(struct vsp1_pipeline *pipe) * This function completes the current buffer by filling its sequence number, * time stamp and payload size, and hands it back to the videobuf core. * - * When operating in DU output mode (deep pipeline to the DU through the LIF), - * the VSP1 needs to constantly supply frames to the display. In that case, if - * no other buffer is queued, reuse the one that has just been processed instead - * of handing it back to the videobuf core. - * * Return the next queued buffer or NULL if the queue is empty. */ static struct vsp1_vb2_buffer * @@ -333,12 +328,6 @@ vsp1_video_complete_buffer(struct vsp1_video *video) done = list_first_entry(&video->irqqueue, struct vsp1_vb2_buffer, queue); - /* In DU output mode reuse the buffer if the list is singular. */ - if (pipe->lif && list_is_singular(&video->irqqueue)) { - spin_unlock_irqrestore(&video->irqlock, flags); - return done; - } - list_del(&done->queue); if (!list_empty(&video->irqqueue)) -- Regards, Laurent Pinchart From mboxrd@z Thu Jan 1 00:00:00 1970 From: Laurent Pinchart Subject: [PATCH v4 1/7] Revert "[media] v4l: vsp1: Supply frames to the DU continuously" Date: Sun, 17 Feb 2019 04:48:46 +0200 Message-ID: <20190217024852.23328-2-laurent.pinchart+renesas@ideasonboard.com> References: <20190217024852.23328-1-laurent.pinchart+renesas@ideasonboard.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by gabe.freedesktop.org (Postfix) with ESMTPS id A7BB26E056 for ; Sun, 17 Feb 2019 02:49:02 +0000 (UTC) In-Reply-To: <20190217024852.23328-1-laurent.pinchart+renesas@ideasonboard.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: linux-media@vger.kernel.org, dri-devel@lists.freedesktop.org Cc: Kieran Bingham List-Id: dri-devel@lists.freedesktop.org RnJvbTogS2llcmFuIEJpbmdoYW0gPGtpZXJhbi5iaW5naGFtK3JlbmVzYXNAaWRlYXNvbmJvYXJk LmNvbT4KClRoaXMgcmV2ZXJ0cyBjb21taXQgMzI5OWJhNWMwYjIxICgiW21lZGlhXSB2NGw6IHZz cDE6IFN1cHBseSBmcmFtZXMgdG8KdGhlIERVIGNvbnRpbnVvdXNseSIpCgpUaGUgRFUgb3V0cHV0 IG1vZGUgZG9lcyBub3QgcmVseSBvbiBmcmFtZXMgYmVpbmcgc3VwcGxpZWQgb24gdGhlIFdQRiBh cwppdHMgcGlwZWxpbmUgaXMgc3VwcGxpZWQgZnJvbSBEUk0uIEZvciB0aGUgdXBjb21pbmcgV1BG IHdyaXRlYmFjawpmdW5jdGlvbmFsaXR5LCB3ZSB3aWxsIGNob29zZSB0byBlbmFibGUgd3JpdGVi YWNrIG1vZGUgaWYgdGhlcmUgaXMgYW4Kb3V0cHV0IGJ1ZmZlciwgb3IgZGlzYWJsZSBpdCAobGVh dmluZyB0aGUgZXhpc3RpbmcgZGlzcGxheSBwaXBlbGluZQp1bmhhcm1lZCkgb3RoZXJ3aXNlLgoK U2lnbmVkLW9mZi1ieTogS2llcmFuIEJpbmdoYW0gPGtpZXJhbi5iaW5naGFtK3JlbmVzYXNAaWRl YXNvbmJvYXJkLmNvbT4KLS0tCiBkcml2ZXJzL21lZGlhL3BsYXRmb3JtL3ZzcDEvdnNwMV92aWRl by5jIHwgMTEgLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAxMSBkZWxldGlvbnMoLSkKCmRp ZmYgLS1naXQgYS9kcml2ZXJzL21lZGlhL3BsYXRmb3JtL3ZzcDEvdnNwMV92aWRlby5jIGIvZHJp dmVycy9tZWRpYS9wbGF0Zm9ybS92c3AxL3ZzcDFfdmlkZW8uYwppbmRleCA3Y2VhZjMyMjIxNDUu LjMyOGQ2ODYxODliZSAxMDA2NDQKLS0tIGEvZHJpdmVycy9tZWRpYS9wbGF0Zm9ybS92c3AxL3Zz cDFfdmlkZW8uYworKysgYi9kcml2ZXJzL21lZGlhL3BsYXRmb3JtL3ZzcDEvdnNwMV92aWRlby5j CkBAIC0zMDcsMTEgKzMwNyw2IEBAIHN0YXRpYyBpbnQgdnNwMV92aWRlb19waXBlbGluZV9zZXR1 cF9wYXJ0aXRpb25zKHN0cnVjdCB2c3AxX3BpcGVsaW5lICpwaXBlKQogICogVGhpcyBmdW5jdGlv biBjb21wbGV0ZXMgdGhlIGN1cnJlbnQgYnVmZmVyIGJ5IGZpbGxpbmcgaXRzIHNlcXVlbmNlIG51 bWJlciwKICAqIHRpbWUgc3RhbXAgYW5kIHBheWxvYWQgc2l6ZSwgYW5kIGhhbmRzIGl0IGJhY2sg dG8gdGhlIHZpZGVvYnVmIGNvcmUuCiAgKgotICogV2hlbiBvcGVyYXRpbmcgaW4gRFUgb3V0cHV0 IG1vZGUgKGRlZXAgcGlwZWxpbmUgdG8gdGhlIERVIHRocm91Z2ggdGhlIExJRiksCi0gKiB0aGUg VlNQMSBuZWVkcyB0byBjb25zdGFudGx5IHN1cHBseSBmcmFtZXMgdG8gdGhlIGRpc3BsYXkuIElu IHRoYXQgY2FzZSwgaWYKLSAqIG5vIG90aGVyIGJ1ZmZlciBpcyBxdWV1ZWQsIHJldXNlIHRoZSBv bmUgdGhhdCBoYXMganVzdCBiZWVuIHByb2Nlc3NlZCBpbnN0ZWFkCi0gKiBvZiBoYW5kaW5nIGl0 IGJhY2sgdG8gdGhlIHZpZGVvYnVmIGNvcmUuCi0gKgogICogUmV0dXJuIHRoZSBuZXh0IHF1ZXVl ZCBidWZmZXIgb3IgTlVMTCBpZiB0aGUgcXVldWUgaXMgZW1wdHkuCiAgKi8KIHN0YXRpYyBzdHJ1 Y3QgdnNwMV92YjJfYnVmZmVyICoKQEAgLTMzMywxMiArMzI4LDYgQEAgdnNwMV92aWRlb19jb21w bGV0ZV9idWZmZXIoc3RydWN0IHZzcDFfdmlkZW8gKnZpZGVvKQogCWRvbmUgPSBsaXN0X2ZpcnN0 X2VudHJ5KCZ2aWRlby0+aXJxcXVldWUsCiAJCQkJc3RydWN0IHZzcDFfdmIyX2J1ZmZlciwgcXVl dWUpOwogCi0JLyogSW4gRFUgb3V0cHV0IG1vZGUgcmV1c2UgdGhlIGJ1ZmZlciBpZiB0aGUgbGlz dCBpcyBzaW5ndWxhci4gKi8KLQlpZiAocGlwZS0+bGlmICYmIGxpc3RfaXNfc2luZ3VsYXIoJnZp ZGVvLT5pcnFxdWV1ZSkpIHsKLQkJc3Bpbl91bmxvY2tfaXJxcmVzdG9yZSgmdmlkZW8tPmlycWxv Y2ssIGZsYWdzKTsKLQkJcmV0dXJuIGRvbmU7Ci0JfQotCiAJbGlzdF9kZWwoJmRvbmUtPnF1ZXVl KTsKIAogCWlmICghbGlzdF9lbXB0eSgmdmlkZW8tPmlycXF1ZXVlKSkKLS0gClJlZ2FyZHMsCgpM YXVyZW50IFBpbmNoYXJ0CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3Rv cC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmkt ZGV2ZWw=