From patchwork Mon Jan 11 17:30:27 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 32597 X-Patchwork-Delegate: sylvester.nawrocki@gmail.com Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.84) (envelope-from ) id 1aIgLN-0005yp-2t; Mon, 11 Jan 2016 17:33:25 +0000 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.76/mailfrontend-7) with esmtp id 1aIgLK-0007hE-2A; Mon, 11 Jan 2016 18:33:24 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932670AbcAKRc5 (ORCPT + 1 other); Mon, 11 Jan 2016 12:32:57 -0500 Received: from mail-pa0-f52.google.com ([209.85.220.52]:36436 "EHLO mail-pa0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760144AbcAKRbs (ORCPT ); Mon, 11 Jan 2016 12:31:48 -0500 Received: by mail-pa0-f52.google.com with SMTP id yy13so231749660pab.3 for ; Mon, 11 Jan 2016 09:31:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=brlqyl4TpcN4CM4dAZXfpSNkfMo51uyWpdt+4/YUyfw=; b=gUxeyG8MLbgUBmRBteDiM0bkut0lD/c0UEX7oBv8vVcsTGrYcIFvCc/xS4CU+7jeNz kr3zT9UIqCrwmDPMjAc+DQdLcPPGTmXEpo3mcwjG/1Qhr8tqoYwSR0fs1NPubT9viBkq Zkf08FIKLXZ7AKVFozfGTXumvQ7lOUNWPcCQU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=brlqyl4TpcN4CM4dAZXfpSNkfMo51uyWpdt+4/YUyfw=; b=B5qFj1HNd1nJMPUBvR+wNGvR9mpgfozcTzDAzxucs45csl4TMGMLVfeAHOX1he2DRT dqfLjFmUqmMPPxwQlhub0F4emw1QCMPeXhUYVbE59jHrBOb7+ua/XUwGpWiMQQUT4aqw V5qTxVaxhW3Nxkd/CUNeSvDF7FcmD3jXW8iyOpGS1xi2HxtvpJ6lX46ME6f6Oh0mW1HI p0WGu7qP5ZpVZ1hShN63Ztfy20S+vGAt3dlNEWHFW3vRJcumkK+rWoiWEk9j9KzmeOQ5 rxSr9GFMl0vXkn6r/ueqmpofXo16LdCPOKMcPEFysc5QUa/SzwdxxKDDLBnUgwuPPHMo 36mg== X-Gm-Message-State: ALoCoQl8BNs+gm2n/Vbx+Hw3MoKINTATQxO9MORYMz4Ukd1Q/NFQypKznKxNW1QkDIEhDIYaO2cAyEM4q8YhLKlTHo1BTGuMFg== X-Received: by 10.67.24.33 with SMTP id if1mr106047819pad.137.1452533507290; Mon, 11 Jan 2016 09:31:47 -0800 (PST) Received: from tictac.mtv.corp.google.com ([172.22.65.76]) by smtp.gmail.com with ESMTPSA id wa17sm118618460pac.38.2016.01.11.09.31.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 11 Jan 2016 09:31:46 -0800 (PST) From: Douglas Anderson To: linux@arm.linux.org.uk, mchehab@osg.samsung.com, robin.murphy@arm.com, tfiga@chromium.org, m.szyprowski@samsung.com Cc: pawel@osciak.com, Dmitry Torokhov , hch@infradead.org, Douglas Anderson , kyungmin.park@samsung.com, k.debski@samsung.com, jtp.park@samsung.com, linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v6 5/5] s5p-mfc: Set DMA_ATTR_ALLOC_SINGLE_PAGES Date: Mon, 11 Jan 2016 09:30:27 -0800 Message-Id: <1452533428-12762-6-git-send-email-dianders@chromium.org> X-Mailer: git-send-email 2.6.0.rc2.230.g3dd15c0 In-Reply-To: <1452533428-12762-1-git-send-email-dianders@chromium.org> References: <1452533428-12762-1-git-send-email-dianders@chromium.org> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 6.0.0.2142326, Antispam-Engine: 2.7.2.2107409, Antispam-Data: 2016.1.11.172116 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_2000_2999 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, DATE_TZ_NA 0, DKIM_SIGNATURE 0, NO_URI_HTTPS 0, REFERENCES 0, SINGLE_URI_IN_BODY 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CP_MEDIA_BODY 0, __CP_URI_IN_BODY 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __IN_REP_TO 0, __MIME_TEXT_ONLY 0, __MULTIPLE_RCPTS_CC_X2 0, __MULTIPLE_RCPTS_TO_X5 0, __REFERENCES 0, __SANE_MSGID 0, __SINGLE_URI_TEXT 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_IN_BODY 0, __URI_NO_WWW 0, __URI_NS , __YOUTUBE_RCVD 0' We do video allocation all the time and we need it to be fast. Plus TLB efficiency isn't terribly important for video. That means we want to set DMA_ATTR_ALLOC_SINGLE_PAGES. See also the previous change ("ARM: dma-mapping: Use DMA_ATTR_ALLOC_SINGLE_PAGES hint to optimize allocation"). Signed-off-by: Douglas Anderson --- Changes in v6: - renamed DMA_ATTR_NO_HUGE_PAGE to DMA_ATTR_ALLOC_SINGLE_PAGES Changes in v5: - s5p-mfc patch new for v5 Changes in v4: None Changes in v3: None Changes in v2: None drivers/media/platform/s5p-mfc/s5p_mfc.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc.c b/drivers/media/platform/s5p-mfc/s5p_mfc.c index 927ab4928779..421d25a1aec1 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc.c +++ b/drivers/media/platform/s5p-mfc/s5p_mfc.c @@ -1095,6 +1095,7 @@ static int s5p_mfc_alloc_memdevs(struct s5p_mfc_dev *dev) /* MFC probe function */ static int s5p_mfc_probe(struct platform_device *pdev) { + DEFINE_DMA_ATTRS(attrs); struct s5p_mfc_dev *dev; struct video_device *vfd; struct resource *res; @@ -1164,12 +1165,20 @@ static int s5p_mfc_probe(struct platform_device *pdev) } } - dev->alloc_ctx[0] = vb2_dma_contig_init_ctx(dev->mem_dev_l); + /* + * We'll do mostly sequential access, so sacrifice TLB efficiency for + * faster allocation. + */ + dma_set_attr(DMA_ATTR_ALLOC_SINGLE_PAGES, &attrs); + + dev->alloc_ctx[0] = vb2_dma_contig_init_ctx_attrs(dev->mem_dev_l, + &attrs); if (IS_ERR(dev->alloc_ctx[0])) { ret = PTR_ERR(dev->alloc_ctx[0]); goto err_res; } - dev->alloc_ctx[1] = vb2_dma_contig_init_ctx(dev->mem_dev_r); + dev->alloc_ctx[1] = vb2_dma_contig_init_ctx_attrs(dev->mem_dev_r, + &attrs); if (IS_ERR(dev->alloc_ctx[1])) { ret = PTR_ERR(dev->alloc_ctx[1]); goto err_mem_init_ctx_1;