Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 80daa7e7 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "drm/msm: Remove redundant parameter in msm_iommu" into dev/msm-3.18-drm_kms

parents 5ee3f7ca cd25940c

drivers/gpu/drm/msm/msm_gem.c

+1 −3
Original line number Diff line number Diff line
@@ -406,7 +406,6 @@ int msm_gem_get_iova_locked(struct drm_gem_object *obj, int id, 


				ret = mmu->funcs->map(mmu, pa,

						msm_obj->domain[id].sgt,

						obj->size,

						IOMMU_READ | IOMMU_NOEXEC);

				if (ret) {

					DRM_ERROR("Unable to map phy buf=%p\n",
@@ -677,8 +676,7 @@ void msm_gem_free_object(struct drm_gem_object *obj) 
				uint32_t offset = msm_obj->domain[id].iova;



				mmu->funcs->unmap(mmu, offset,

					msm_obj->domain[id].sgt,

					obj->size);

					msm_obj->domain[id].sgt);

			} else {

				dma_unmap_sg(mmu->dev,

					msm_obj->domain[id].sgt->sgl,

drivers/gpu/drm/msm/msm_iommu.c

+2 −2
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ static void msm_iommu_detach(struct msm_mmu *mmu, const char **names, int cnt) 
}



static int msm_iommu_map(struct msm_mmu *mmu, dma_addr_t iova,

		struct sg_table *sgt, unsigned len, int prot)

		struct sg_table *sgt, int prot)

{

	struct msm_iommu *iommu = to_msm_iommu(mmu);

	struct iommu_domain *domain = iommu->domain;
@@ -81,7 +81,7 @@ fail: 
}



static int msm_iommu_unmap(struct msm_mmu *mmu, dma_addr_t iova,

		struct sg_table *sgt, unsigned len)

		struct sg_table *sgt)

{

	struct msm_iommu *iommu = to_msm_iommu(mmu);

	struct iommu_domain *domain = iommu->domain;

drivers/gpu/drm/msm/msm_mmu.h

+4 −4
Original line number Diff line number Diff line
@@ -35,10 +35,10 @@ enum msm_mmu_domain_type { 
struct msm_mmu_funcs {

	int (*attach)(struct msm_mmu *mmu, const char **names, int cnt);

	void (*detach)(struct msm_mmu *mmu, const char **names, int cnt);

	int (*map)(struct msm_mmu *mmu, dma_addr_t iova, struct sg_table *sgt,

			unsigned len, int prot);

	int (*unmap)(struct msm_mmu *mmu, dma_addr_t iova, struct sg_table *sgt,

			unsigned len);

	int (*map)(struct msm_mmu *mmu, dma_addr_t iova,

			struct sg_table *sgt, int prot);

	int (*unmap)(struct msm_mmu *mmu, dma_addr_t iova,

			struct sg_table *sgt);

	int (*map_sg)(struct msm_mmu *mmu, struct sg_table *sgt,

			enum dma_data_direction dir);

	void (*unmap_sg)(struct msm_mmu *mmu, struct sg_table *sgt,

drivers/gpu/drm/msm/msm_smmu.c

+2 −2
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ static void msm_smmu_detach(struct msm_mmu *mmu, const char **names, int cnt) 
}



static int msm_smmu_map(struct msm_mmu *mmu, dma_addr_t iova,

		struct sg_table *sgt, unsigned len, int prot)

		struct sg_table *sgt, int prot)

{

	struct msm_smmu *smmu = to_msm_smmu(mmu);

	struct msm_smmu_client *client = msm_smmu_to_client(smmu);
@@ -163,7 +163,7 @@ static void msm_smmu_unmap_sg(struct msm_mmu *mmu, struct sg_table *sgt, 
}



static int msm_smmu_unmap(struct msm_mmu *mmu, dma_addr_t iova,

		struct sg_table *sgt, unsigned len)

		struct sg_table *sgt)

{

	struct msm_smmu *smmu = to_msm_smmu(mmu);

	struct msm_smmu_client *client = msm_smmu_to_client(smmu);