From patchwork Mon Sep 2 01:46:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baolu Lu X-Patchwork-Id: 825182 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.8]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B35033A8CB; Mon, 2 Sep 2024 01:51:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.8 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725241876; cv=none; b=cSRcJjEqe36nNb9m6Jh22HjIv37d9X0eLhYfC/big/oZz6jOW6/XMypV88p9z0HMpfg1nVT0SkvsOMKaqCFg2JUp3hwPbc2wyP54yoc17M+2EFSmQf/zuE0lA1jUXxeg7oHLYbs7wAL3wSqxULj7hS8uSCpkKJ1er4jVMk2csOQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725241876; c=relaxed/simple; bh=HTJQcN0FE2N5DQLr1jAt6JXd6rKNx9aVQY3dPFxGnc4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ItN4zKFjYWVRitR+Bwaxzrhba5BOU/fb6HCDE/GEKDyW963t7SRf9YAVXbLvA58Nsre7hFpaFl84QayGXeigL+sXekRvQ4NEHxS0noIN7VXOyQI9WqClno+UB9e971BASCmtiam1NTE5RV2iAwDFVB77FXjB0IjZSAXAmsOQAtY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=SAxBmPoS; arc=none smtp.client-ip=192.198.163.8 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="SAxBmPoS" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1725241875; x=1756777875; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=HTJQcN0FE2N5DQLr1jAt6JXd6rKNx9aVQY3dPFxGnc4=; b=SAxBmPoSlc4y7/SGHP24I4hG78Pi+Ky53dVDzmpHKSTpMHd9Mccl+0qY UCJBQpV5WIOj/mSVkAiSh5ydbD8FlTyAsXaA0JYbhn6GmcN0rMUZXMadu C7a7ctsMOo2RBkIL9M61OCWmlUt7ixQp0R+rLmOALdw7WmrT3iaRk4lad aTivY5cGhYv++I0wz2hroc3zhNJLGBFWrRPpQ0jBzTwRml4e65Fabtywh Q/02c1J+/X9GPMGLglJxo/8oeEFYqJLNtd11xKo7OvQ2b6t9WPMRqShOB JkEauqt1gL3pv98jqqaYY6uwdutMAlfmCem9p2QiuB2vL/wmBbYL7oXD6 w==; X-CSE-ConnectionGUID: 9WAz+8hlS42G+4CvTde5vg== X-CSE-MsgGUID: Nu7l90SSSNuWPd0eoIIeyg== X-IronPort-AV: E=McAfee;i="6700,10204,11182"; a="41307688" X-IronPort-AV: E=Sophos;i="6.10,194,1719903600"; d="scan'208";a="41307688" Received: from orviesa006.jf.intel.com ([10.64.159.146]) by fmvoesa102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Sep 2024 18:51:14 -0700 X-CSE-ConnectionGUID: Nl7Pj8i9TO6XqEwIgHlq0Q== X-CSE-MsgGUID: +vkijvTkTzO3htP32F9nBw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.10,194,1719903600"; d="scan'208";a="64817664" Received: from allen-box.sh.intel.com ([10.239.159.127]) by orviesa006.jf.intel.com with ESMTP; 01 Sep 2024 18:51:08 -0700 From: Lu Baolu To: Karol Herbst , Lyude Paul , Danilo Krummrich , David Airlie , Daniel Vetter , Thierry Reding , Jonathan Hunter , Sandy Huang , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Mikko Perttunen , Joerg Roedel , Will Deacon , Robin Murphy , Jason Gunthorpe , Kevin Tian Cc: dri-devel@lists.freedesktop.org, nouveau@lists.freedesktop.org, linux-tegra@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-media@vger.kernel.org, iommu@lists.linux.dev, linux-kernel@vger.kernel.org, Lu Baolu , Jason Gunthorpe , Andy Yan Subject: [PATCH v2 2/3] drm/rockchip: Use iommu_paging_domain_alloc() Date: Mon, 2 Sep 2024 09:46:59 +0800 Message-Id: <20240902014700.66095-3-baolu.lu@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240902014700.66095-1-baolu.lu@linux.intel.com> References: <20240902014700.66095-1-baolu.lu@linux.intel.com> Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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 Reviewed-by: Jason Gunthorpe Acked-by: Andy Yan --- 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 44d769d9234d..11e5d10de4d7 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;