From patchwork Mon Aug 28 16:08:51 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Scheller X-Patchwork-Id: 9925831 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id D76E560383 for ; Mon, 28 Aug 2017 16:09:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CA25B28725 for ; Mon, 28 Aug 2017 16:09:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BE4E92873F; Mon, 28 Aug 2017 16:09:54 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A816A28725 for ; Mon, 28 Aug 2017 16:09:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751298AbdH1QI4 (ORCPT ); Mon, 28 Aug 2017 12:08:56 -0400 Received: from mail-wm0-f66.google.com ([74.125.82.66]:38250 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751236AbdH1QIz (ORCPT ); Mon, 28 Aug 2017 12:08:55 -0400 Received: by mail-wm0-f66.google.com with SMTP id u26so1040645wma.5 for ; Mon, 28 Aug 2017 09:08:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=Bi0I5ME5tv39Hvq2Bc87oURdjnV7GqzUH/Ca7KkAvRw=; b=LLisyZ8z8bCMgfUJahC8JScmggqkKRgTim5hjwg/z3QR7AI9Xhay71RKnv4cvO3dIh swPd9X12uZrDSEiMLn4a/CdQoYpYlT20V4ij3W5v0rbRW8V8Oc1aECiDYfezgVuVBZnD x9mpjTVKt/dgYsZmemwXCGOaSNg5FthUT0by7UE51aS1QxArrMa8o1CeeGGYLu2mbwQV WLP+uOxdY0oHuSsfb3nu9WQzZ34kwJLR4664SJp/bHossOLWu3jLM9/JJV7ZzNDsnD9v 2+EUeeWYhhas4dIhpeoUO36nkDp2Vba0UaCUXbQqUcX+czOOXxXRFpuc1EJg11Rrm37M 4bPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=Bi0I5ME5tv39Hvq2Bc87oURdjnV7GqzUH/Ca7KkAvRw=; b=sIBI2NkrJeXUO9YOvVv00NYTYsGN5ut1j9iIQHT5DWc5nq+mxDwUdbSmJUb5eroQpu oQYP29JFUtvzd3OotI61f0qK/MU825+bXcosjwaI4HBsvv4YQIry9P2Q6PK87jOqKlMh zdUQuXGgUQZhxC3TOLDnF61bQ2e6NOghZNfz01WjLUgpYjcBJS9T1kptrY36TBci9/zu m5Kq6nORNLfTbYfoUYhE4KS1gspFCCD8vCNkCH0KBOr1TXh0wUt1AvzHczDfy3yZvufQ uRs/Pu1oM6k5KZR5ffMc441ukkaXNfifR/sIitvMBlSkod8z+c22p/Nnt8XMyIGw7Mho xf+g== X-Gm-Message-State: AHYfb5ik2dyyIFoj5XfYFWgZudhMeLAlhFBtx+w1x3tU6amnx80uuXx2 d9dXqLkXUl1vwy/m X-Received: by 10.28.135.19 with SMTP id j19mr670681wmd.13.1503936534195; Mon, 28 Aug 2017 09:08:54 -0700 (PDT) Received: from dvbdev.wuest.de (ip-84-118-193-88.unity-media.net. [84.118.193.88]) by smtp.gmail.com with ESMTPSA id q108sm1306159wrb.4.2017.08.28.09.08.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 28 Aug 2017 09:08:53 -0700 (PDT) From: Daniel Scheller To: linux-media@vger.kernel.org Cc: mchehab@kernel.org, hverkuil@xs4all.nl, jasmin@anw.at Subject: [PATCH] [media_build] update v4.7_dma_attrs.patch Date: Mon, 28 Aug 2017 18:08:51 +0200 Message-Id: <20170828160851.618-1-d.scheller.oss@gmail.com> X-Mailer: git-send-email 2.13.5 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Daniel Scheller Fixes apply_patches wrt commit 5b6f9abe5a49 ("media: vb2: add bidirectional flag in vb2_queue") Signed-off-by: Daniel Scheller Tested-by: Jasmin Jessich --- Tested and verified by Jasmin on 3.13, 3.4 and 2.6.36, and by me on 4.4. backports/v4.7_dma_attrs.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/backports/v4.7_dma_attrs.patch b/backports/v4.7_dma_attrs.patch index 28d8dbc..40a7e5b 100644 --- a/backports/v4.7_dma_attrs.patch +++ b/backports/v4.7_dma_attrs.patch @@ -294,18 +294,18 @@ index 9a144f2..c5e3113 100644 * doesn't fill in the @alloc_devs array. - * @dma_attrs: DMA attributes to use for the DMA. + * @dma_attrs: DMA attributes to use for the DMA. May be NULL. - * @fileio_read_once: report EOF after reading the first buffer - * @fileio_write_immediately: queue buffer after each write() call - * @allow_zero_bytesused: allow bytesused == 0 to be passed to the driver + * @bidirectional: when this flag is set the DMA direction for the buffers of + * this queue will be overridden with DMA_BIDIRECTIONAL direction. + * This is useful in cases where the hardware (firmware) writes to @@ -494,7 +494,7 @@ struct vb2_queue { unsigned int type; unsigned int io_modes; struct device *dev; - unsigned long dma_attrs; + const struct dma_attrs *dma_attrs; + unsigned bidirectional:1; unsigned fileio_read_once:1; unsigned fileio_write_immediately:1; - unsigned allow_zero_bytesused:1; diff --git a/include/media/videobuf2-dma-contig.h b/include/media/videobuf2-dma-contig.h index 5604818..df2aabe 100644 --- a/include/media/videobuf2-dma-contig.h