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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,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 41FFFC10F14 for ; Thu, 3 Oct 2019 16:50:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0A67D20867 for ; Thu, 3 Oct 2019 16:50:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1570121420; bh=qlKi8sfZrReaearLm/ylwI/YAYHwYCncfnDPGIhBkTw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=xmpYIuEYJImKaqZSIsYibVkE9SWzum2Ra3dCW1o18DMBzStpdag0GdgO4BAxEC7p+ kqakPPKClROd4Z5WUlFPSyKbiOgxiiccPlWfnlJLmJd84Apa58MbtvxmLdpyr5UXiV dGVRHuvh08Pl0iJbk3U5AAfcPbQyYFJ2TGMMVKnA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2405404AbfJCQuS (ORCPT ); Thu, 3 Oct 2019 12:50:18 -0400 Received: from mail.kernel.org ([198.145.29.99]:37224 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2404546AbfJCQuN (ORCPT ); Thu, 3 Oct 2019 12:50:13 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 857BA2086A; Thu, 3 Oct 2019 16:50:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1570121413; bh=qlKi8sfZrReaearLm/ylwI/YAYHwYCncfnDPGIhBkTw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WqAca34GdP7Pn+Bj7dJ7BILuuLXv2gnsdnRRXvia2NcZzklneECwS+ScAoknJFEVd 9HlBHRSKMkvWjrLX4LSaC1fYvuDT/G+BIurDmR2iOqXIKZK2CiV5eiYPbEC7ez3mMJ Q6iIIL86CloioP7/VboQHqIhmG0qdXqUOczaHQX0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Francois Buergisser , Ezequiel Garcia , Hans Verkuil , Mauro Carvalho Chehab Subject: [PATCH 5.3 270/344] media: hantro: Set DMA max segment size Date: Thu, 3 Oct 2019 17:53:55 +0200 Message-Id: <20191003154606.905277395@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191003154540.062170222@linuxfoundation.org> References: <20191003154540.062170222@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Francois Buergisser commit c3c3509b86810293df5c524ef61421d8affc8bf0 upstream. The Hantro codec is typically used in platforms with an IOMMU, so we need to set a proper DMA segment size. Devices without an IOMMU will still fallback to default 64KiB segments. Cc: stable@vger.kernel.org Fixes: 775fec69008d3 ("media: add Rockchip VPU JPEG encoder driver") Signed-off-by: Francois Buergisser Signed-off-by: Ezequiel Garcia Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Greg Kroah-Hartman --- drivers/staging/media/hantro/hantro_drv.c | 1 + 1 file changed, 1 insertion(+) --- a/drivers/staging/media/hantro/hantro_drv.c +++ b/drivers/staging/media/hantro/hantro_drv.c @@ -724,6 +724,7 @@ static int hantro_probe(struct platform_ dev_err(vpu->dev, "Could not set DMA coherent mask.\n"); return ret; } + vb2_dma_contig_set_max_seg_size(&pdev->dev, DMA_BIT_MASK(32)); for (i = 0; i < vpu->variant->num_irqs; i++) { const char *irq_name = vpu->variant->irqs[i].name;