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 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 92A74C27C6E for ; Mon, 10 Jun 2024 10:02:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=B8xo9fI7Hnp8L4pRiYaelnAUj51huFWgQRALBrrxqcU=; b=pEVcf+u+hl+zbjp4WBCj5rq4Z0 1nboEpDX9OSJVYJNZEOhE5mJcUSy2gC6J6wMsR0jZ3Ft9MHrnSr79J97ahDcCAIN5xvFR/gKLqZwW pj2T5v8a1EKqW3WjN0XtmKMonUP3KJmuy2iihUYgtm1+R0bpaWgUhq6HZLiHbAc6hgpHg+QsZCdM/ s/lMYTJroxDbQxHDEfQlumjqAzO1HTnzmKDME6kcU7C83O79s9SL/mrFHoB7pwIU38Zdy7394UZEk vWnpujTwmRcWpDT5J2fFLpVELUi2873873fl4kLy0GWEItJnmC1b9trwAw3elIe9CZ/2vLoB0PzNF j9dCERIg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sGbrI-00000004Y3c-0sXz; Mon, 10 Jun 2024 10:02:36 +0000 Received: from mgamail.intel.com ([192.198.163.13]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sGasg-00000004Kn7-37Gq; Mon, 10 Jun 2024 09:00:17 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1718009998; x=1749545998; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=2RzKLZKa9aMbeh8zX7gRXSDK8Hv/vXOsjqYlhYXqS5Y=; b=dHDMhZMXWNR9KLZt6Zqr6NaxC4rArybsP0fnXU3JZkQbSQOs2cBHxyE7 VGj2ESxn5CKJKz1nAqH22uVY9QoaIa07iJndUFKa+VbMPNhkM6fNxQB1B 4Dxi23dluAuuEfuWWJsl5+lCbI36/fB5cL/YeVcF6atFSGHo2bGhqne59 toG229dnbRfsFRar8bUh1hZ1Zru5hTlVoIk7ndQUe/kOVVqLbwxSr5RlT 0jO61iynUbn+U3JRaxFLNhln90lBgjSZI1RV2T1KWkvbOsPcerJtEtyrV byHgJDfZnMJwynDUpPjgS4/+KTYeJpmaJBhyEm9VT3z1SBmamsOsMrlnr A==; X-CSE-ConnectionGUID: Ps+6rMfCS4mm8dU359C3jg== X-CSE-MsgGUID: iZK+hmBKQoC7wzOuzbjScA== X-IronPort-AV: E=McAfee;i="6600,9927,11098"; a="17581965" X-IronPort-AV: E=Sophos;i="6.08,227,1712646000"; d="scan'208";a="17581965" Received: from fmviesa003.fm.intel.com ([10.60.135.143]) by fmvoesa107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Jun 2024 01:59:49 -0700 X-CSE-ConnectionGUID: QxgTd28SQrGRjUA9euRVfg== X-CSE-MsgGUID: gs8aoJhZQmubGCpSr1nBLw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,227,1712646000"; d="scan'208";a="43433021" Received: from unknown (HELO allen-box.sh.intel.com) ([10.239.159.127]) by fmviesa003.fm.intel.com with ESMTP; 10 Jun 2024 01:59:45 -0700 From: Lu Baolu To: Joerg Roedel , Will Deacon , Robin Murphy , Jason Gunthorpe , Kevin Tian Cc: Yi Liu , David Airlie , Daniel Vetter , Kalle Valo , Bjorn Andersson , Mathieu Poirier , Alex Williamson , mst@redhat.com, Jason Wang , Thierry Reding , Jonathan Hunter , Mikko Perttunen , Jeff Johnson , ath10k@lists.infradead.org, ath11k@lists.infradead.org, iommu@lists.linux.dev, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Lu Baolu Subject: [PATCH v3 18/21] drm/rockchip: Use iommu_paging_domain_alloc() Date: Mon, 10 Jun 2024 16:55:52 +0800 Message-Id: <20240610085555.88197-19-baolu.lu@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240610085555.88197-1-baolu.lu@linux.intel.com> References: <20240610085555.88197-1-baolu.lu@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240610_015959_422177_A815060F X-CRM114-Status: GOOD ( 10.11 ) X-BeenThere: ath11k@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "ath11k" Errors-To: ath11k-bounces+ath11k=archiver.kernel.org@lists.infradead.org Commit <421be3ee36a4> ("drm/rockchip: Refactor IOMMU initialisation") has refactored rockchip_drm_init_iommu() to pass a device that the domain is allocated for. Replace iommu_domain_alloc() with iommu_paging_domain_alloc() to retire the former. Signed-off-by: Lu Baolu --- drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c index ab55d7132550..52126ffb9280 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c @@ -103,13 +103,17 @@ static int rockchip_drm_init_iommu(struct drm_device *drm_dev) struct rockchip_drm_private *private = drm_dev->dev_private; struct iommu_domain_geometry *geometry; u64 start, end; + int ret; if (IS_ERR_OR_NULL(private->iommu_dev)) return 0; - private->domain = iommu_domain_alloc(private->iommu_dev->bus); - if (!private->domain) - return -ENOMEM; + private->domain = iommu_paging_domain_alloc(private->iommu_dev); + if (IS_ERR(private->domain)) { + ret = PTR_ERR(private->domain); + private->domain = NULL; + return ret; + } geometry = &private->domain->geometry; start = geometry->aperture_start; -- 2.34.1