Received: by 2002:a05:6a10:5bc5:0:0:0:0 with SMTP id os5csp2283201pxb; Thu, 28 Oct 2021 20:57:59 -0700 (PDT) X-Google-Smtp-Source: ABdhPJziRPaQIfn7RfevmPeTG4+HOKl4OMbSsuDbJGgzUYDwtGOoLOY8uk92WcfXDTK8j2EK8xWv X-Received: by 2002:a17:903:2350:b0:141:7a60:13f9 with SMTP id c16-20020a170903235000b001417a6013f9mr7750749plh.49.1635479879614; Thu, 28 Oct 2021 20:57:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1635479879; cv=none; d=google.com; s=arc-20160816; b=fpwzSy+JA3IR1tPJGqroC8RFv0w6nyXOZjqBMtI3ySwfotF1k2+QBcArko/nTZEQ6j fenZl94rGap8sbeiN8vWOqwZtPWNZ1AsilpdtyQNwtRnclmT99I2YJfy8AC1JLdebC/4 xZp/sWhQG2KFdtzkwvrwNX9GFJwQEXd0jvpl0ahZIPStdYNGj9fczNl8Bo/c9/9xk2nq nz37IppMOsKMlqjSI00GzxaE5WyIpRcXelzcpCkF59XFl0jJclasdsd4kGOrppdBauk1 cFaTsuUwgWi1SMPEGAWaww5FvETt3/JWzEIb2J3MNkkD2f5BmgKjRNdX2jUWPr4gAKAu cygw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=8Zu2NlJjzUJIW7LJkXmp82497gu4wfVTL0MecvngYqw=; b=Abee8O/Xm6zfq5HRhoLb98cOvHdbwbqagWm3asm55/SMh4Pv7VCQ6fHMPv8zWsEMmC cpN/IfP3pDYnW6e5/WW6eAbYvTf/+5Yr0I0Q2twLVNXEySzUu3qcU9uAD89LStwIMuPk c9XobHpRN6bcwvX6qDIem6P5XJfMglQSYjLtuv0p8vxqMkQ5fH6QDNOyXHH6tQpojdkI 5zqjwAiNMj9/c2oDW79LS+jE2cD5aJi3c9AAbeWFTiXlj2h0+9y8nWa7IjKzf9oumzdi deFWD39G2q132PwAw2l3WEGNZjqRHYC4UVWjQW951d08rn8pb8ggrJ06eYLGhRvyLpTn KhCA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=mediatek.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id pj7si8555430pjb.95.2021.10.28.20.57.47; Thu, 28 Oct 2021 20:57:59 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=mediatek.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231913AbhJ2D6z (ORCPT + 99 others); Thu, 28 Oct 2021 23:58:55 -0400 Received: from mailgw01.mediatek.com ([60.244.123.138]:41968 "EHLO mailgw01.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S231899AbhJ2D6Z (ORCPT ); Thu, 28 Oct 2021 23:58:25 -0400 X-UUID: 2240b3ab37664a23b1edab62918c5b90-20211029 X-UUID: 2240b3ab37664a23b1edab62918c5b90-20211029 Received: from mtkmbs10n1.mediatek.inc [(172.21.101.34)] by mailgw01.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 574383761; Fri, 29 Oct 2021 11:55:53 +0800 Received: from mtkexhb02.mediatek.inc (172.21.101.103) by mtkmbs10n2.mediatek.inc (172.21.101.183) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.2.792.3; Fri, 29 Oct 2021 11:55:51 +0800 Received: from mtkmbs10n2.mediatek.inc (172.21.101.183) by mtkexhb02.mediatek.inc (172.21.101.103) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Fri, 29 Oct 2021 11:55:51 +0800 Received: from localhost.localdomain (10.17.3.154) by mtkmbs10n2.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.2.792.3 via Frontend Transport; Fri, 29 Oct 2021 11:55:49 +0800 From: Yunfei Dong To: Yunfei Dong , Alexandre Courbot , Hans Verkuil , "Tzung-Bi Shih" , Tiffany Lin , Andrew-CT Chen , Mauro Carvalho Chehab , Rob Herring , Matthias Brugger , Tomasz Figa CC: Hsin-Yi Wang , Fritz Koenig , Dafna Hirschfeld , Benjamin Gaignard , Daniel Vetter , dri-devel , Irui Wang , , , , , , , Subject: [PATCH v8, 14/17] media: mtk-vcodec: Support 34bits dma address for vdec Date: Fri, 29 Oct 2021 11:55:24 +0800 Message-ID: <20211029035527.454-15-yunfei.dong@mediatek.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211029035527.454-1-yunfei.dong@mediatek.com> References: <20211029035527.454-1-yunfei.dong@mediatek.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-MTK: N Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use the dma_set_mask_and_coherent helper to set vdec DMA bit mask to support 34bits iova space(16GB) that the mt8192 iommu HW support. Whole the iova range separate to 0~4G/4G~8G/8G~12G/12G~16G, regarding which iova range VDEC actually locate, it depends on the dma-ranges property of vdec dtsi node. Signed-off-by: Yunfei Dong --- v8: add return value for dma_set_mask_and_coherent --- drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c index ad8d15e07e58..7154dcea795b 100644 --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c @@ -363,6 +363,14 @@ static int mtk_vcodec_probe(struct platform_device *pdev) } } + if (of_get_property(pdev->dev.of_node, "dma-ranges", NULL)) { + ret = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(34)); + if (ret) { + mtk_v4l2_err("Failed to set mask"); + goto err_core_workq; + } + } + for (i = 0; i < MTK_VDEC_HW_MAX; i++) mutex_init(&dev->dec_mutex[i]); spin_lock_init(&dev->irqlock); -- 2.25.1