From patchwork Wed Dec 12 12:06:45 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eunchul Kim X-Patchwork-Id: 1865711 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork2.kernel.org (Postfix) with ESMTP id AF366DF2EE for ; Wed, 12 Dec 2012 12:10:02 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9A658E6294 for ; Wed, 12 Dec 2012 04:10:02 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mailout1.samsung.com (mailout1.samsung.com [203.254.224.24]) by gabe.freedesktop.org (Postfix) with ESMTP id 058C3E60E5 for ; Wed, 12 Dec 2012 04:06:49 -0800 (PST) Received: from epcpsbgm2.samsung.com (epcpsbgm2 [203.254.230.27]) by mailout1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MEX00AUV2ZAI350@mailout1.samsung.com> for dri-devel@lists.freedesktop.org; Wed, 12 Dec 2012 21:06:47 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [203.254.230.42]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id E0.78.12699.75378C05; Wed, 12 Dec 2012 21:06:47 +0900 (KST) X-AuditID: cbfee61b-b7f616d00000319b-e9-50c87357aa10 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 30.78.12699.65378C05; Wed, 12 Dec 2012 21:06:47 +0900 (KST) Received: from localhost.localdomain ([10.90.54.32]) by mmp1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MEX00NZ12Z74ZB0@mmp1.samsung.com> for dri-devel@lists.freedesktop.org; Wed, 12 Dec 2012 21:06:46 +0900 (KST) From: Eunchul Kim To: dri-devel@lists.freedesktop.org, inki.dae@samsung.com Subject: [RFC v4 2/5] drm/exynos: add iommu support for ipp Date: Wed, 12 Dec 2012 21:06:45 +0900 Message-id: <1355314008-24903-3-git-send-email-chulspro.kim@samsung.com> X-Mailer: git-send-email 1.7.0.4 In-reply-to: <1355314008-24903-1-git-send-email-chulspro.kim@samsung.com> References: <1355314008-24903-1-git-send-email-chulspro.kim@samsung.com> DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrNLMWRmVeSWpSXmKPExsVy+t8zLd3w4hMBBjN+sltc+fqezYHR4373 caYAxigum5TUnMyy1CJ9uwSujGP/7rIV3OOvWDz5GlsD4wzeLkZODgkBE4lVT/6wQ9hiEhfu rWfrYuTiEBJYxihxZHczK0zRw+83mSESixgltq+4zArhrGCS+Hmxlxmkik1AR+LIrWYwW0TA UuLB1t9gNrPASUaJ02tzuhg5OIQFrCU+PFIBCbMIqEqsX/qJDcTmFfCQ6G9ayQaxTEGiddkh sIs4BTwlNu24wArSKgRUs2NWPUSrgMS3yYdYQMISArISmw6AnSYhcJ1N4u7EHSwQYyQlDq64 wTKBUXgBI8MqRtHUguSC4qT0XCO94sTc4tK8dL3k/NxNjJAQlN7BuKrB4hCjAAejEg/vhZfH A4RYE8uKK3MPMUpwMCuJ8Ap6nggQ4k1JrKxKLcqPLyrNSS0+xOgDdMlEZinR5HxgfOSVxBsa GxgbGloamplamhrgEFYS5232SAkQEkhPLEnNTk0tSC2CGcfEwSnVwDhlvVC8Uk7xhNc3Im/1 J9t6/jhy9M3+3pV9fNpWD/80ftrMuSSzeO4vL9lvu5Xbf09gup7lfuY2O2cx89XuQx+Wdrq0 dvPxPWZL2ffP2PDiJM7HB+eyrD132C1u2ySLY1196stu3Hvx7VXYoQt3SgwX+m95uFf5g2hj E8Ps1xZuyocjl9ub+ropsRRnJBpqMRcVJwIAAaiAK24CAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupikeLIzCtJLcpLzFFi42I5/e+xgG548YkAg0mNTBZXvr5nc2D0uN99 nCmAMaqB0SYjNTEltUghNS85PyUzL91WyTs43jne1MzAUNfQ0sJcSSEvMTfVVsnFJ0DXLTMH aKySQlliTilQKCCxuFhJ3w7ThNAQN10LmMYIXd+QILgeIwM0kLCOMePYv7tsBff4KxZPvsbW wDiDt4uRk0NCwETi4febzBC2mMSFe+vZuhi5OIQEFjFKbF9xmRXCWcEk8fNiL1gVm4COxJFb zWC2iIClxIOtv8FsZoGTjBKn1+Z0MXJwCAtYS3x4pAISZhFQlVi/9BMbiM0r4CHR37SSDWKZ gkTrskPsIDangKfEph0XWEFahYBqdsyqn8DIu4CRYRWjaGpBckFxUnqukV5xYm5xaV66XnJ+ 7iZGcIA/k97BuKrB4hCjAAejEg/vhZfHA4RYE8uKK3MPMUpwMCuJ8Ap6nggQ4k1JrKxKLcqP LyrNSS0+xOgDdNREZinR5Hxg9OWVxBsam5gZWRqZGZuYGxvjEFYS5232SAkQEkhPLEnNTk0t SC2CGcfEwSnVwKjDGl1XsfnBb6aitobHr4xPGkvferVBu3GOpv3tCbVHT5b+rld7/3Y+5zn7 lC2cdr8q3276wD5t/TUbt5RpNz80ZhrHl9pvCYiY3/QrQeDfUU2V2w9P/Ln55vaKHocdx6w4 j+zNZSpYfcPqyN07xkddBCfvsYg4dojXPe6dmWjjS/cq0QZ+/3wlluKMREMt5qLiRACMit5k nQIAAA== X-CFilter-Loop: Reflected Cc: jy0.jeon@samsung.com, sw0312.kim@samsung.com, jaejoon.seo@samsung.com, kyungmin.park@samsung.com, jmock.shin@samsung.com X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Errors-To: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org This patch adds iommu support for ipp. For this, it adds subdrv_probe/remove callback to enable or disable ipp iommu. we can get or put device address to a gem handle from user through exynos_drm_gem_get/put_dma_addr(). Signed-off-by: Eunchul Kim Signed-off-by: Jinyoung Jeon --- drivers/gpu/drm/exynos/exynos_drm_ipp.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/drivers/gpu/drm/exynos/exynos_drm_ipp.c b/drivers/gpu/drm/exynos/exynos_drm_ipp.c index f95b407..e4b42cd 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_ipp.c +++ b/drivers/gpu/drm/exynos/exynos_drm_ipp.c @@ -24,6 +24,7 @@ #include "exynos_drm_drv.h" #include "exynos_drm_gem.h" #include "exynos_drm_ipp.h" +#include "exynos_drm_iommu.h" /* * IPP is stand for Image Post Processing and @@ -1765,10 +1766,24 @@ static int ipp_subdrv_probe(struct drm_device *drm_dev, struct device *dev) ippdrv->event_workq = ctx->event_workq; ippdrv->sched_event = ipp_sched_event; INIT_LIST_HEAD(&ippdrv->cmd_list); + + if (is_drm_iommu_supported(drm_dev)) { + ret = drm_iommu_attach_device(drm_dev, ippdrv->dev); + if (ret) { + DRM_ERROR("failed to activate iommu\n"); + goto err_iommu; + } + } } return 0; +err_iommu: + /* get ipp driver entry */ + list_for_each_entry_reverse(ippdrv, &exynos_drm_ippdrv_list, drv_list) + if (is_drm_iommu_supported(drm_dev)) + drm_iommu_detach_device(drm_dev, ippdrv->dev); + err_idr: idr_remove_all(&ctx->ipp_idr); idr_remove_all(&ctx->prop_idr); @@ -1785,6 +1800,9 @@ static void ipp_subdrv_remove(struct drm_device *drm_dev, struct device *dev) /* get ipp driver entry */ list_for_each_entry(ippdrv, &exynos_drm_ippdrv_list, drv_list) { + if (is_drm_iommu_supported(drm_dev)) + drm_iommu_detach_device(drm_dev, ippdrv->dev); + ippdrv->drm_dev = NULL; exynos_drm_ippdrv_unregister(ippdrv); }