Commit 53bf7f7a authored by Drew Davenport's avatar Drew Davenport Committed by Rob Clark
Browse files

drm/msm: Remove unused function arguments 



The arguments related to IOMMU port name have been unused since
commit 944fc36c ("drm/msm: use upstream iommu") and can be removed.

Signed-off-by: default avatarDrew Davenport <ddavenport@chromium.org>
Signed-off-by: default avatarRob Clark <robdclark@chromium.org>
parent fa8278b8

drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c

+2 −8
Original line number Diff line number Diff line
@@ -30,10 +30,6 @@ 
#define CREATE_TRACE_POINTS

#include "dpu_trace.h"



static const char * const iommu_ports[] = {

		"mdp_0",

};



/*

 * To enable overall DRM driver logging

 * # echo 0x2 > /sys/module/drm/parameters/debug
@@ -703,8 +699,7 @@ static void _dpu_kms_mmu_destroy(struct dpu_kms *dpu_kms) 


	mmu = dpu_kms->base.aspace->mmu;



	mmu->funcs->detach(mmu, (const char **)iommu_ports,

			ARRAY_SIZE(iommu_ports));

	mmu->funcs->detach(mmu);

	msm_gem_address_space_put(dpu_kms->base.aspace);



	dpu_kms->base.aspace = NULL;
@@ -730,8 +725,7 @@ static int _dpu_kms_mmu_init(struct dpu_kms *dpu_kms) 
		return PTR_ERR(aspace);

	}



	ret = aspace->mmu->funcs->attach(aspace->mmu, iommu_ports,

			ARRAY_SIZE(iommu_ports));

	ret = aspace->mmu->funcs->attach(aspace->mmu);

	if (ret) {

		DPU_ERROR("failed to attach iommu %d\n", ret);

		msm_gem_address_space_put(aspace);

drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c

+2 −8
Original line number Diff line number Diff line
@@ -157,10 +157,6 @@ static long mdp4_round_pixclk(struct msm_kms *kms, unsigned long rate, 
	}

}



static const char * const iommu_ports[] = {

	"mdp_port0_cb0", "mdp_port1_cb0",

};



static void mdp4_destroy(struct msm_kms *kms)

{

	struct mdp4_kms *mdp4_kms = to_mdp4_kms(to_mdp_kms(kms));
@@ -172,8 +168,7 @@ static void mdp4_destroy(struct msm_kms *kms) 
	drm_gem_object_put_unlocked(mdp4_kms->blank_cursor_bo);



	if (aspace) {

		aspace->mmu->funcs->detach(aspace->mmu,

				iommu_ports, ARRAY_SIZE(iommu_ports));

		aspace->mmu->funcs->detach(aspace->mmu);

		msm_gem_address_space_put(aspace);

	}
@@ -524,8 +519,7 @@ struct msm_kms *mdp4_kms_init(struct drm_device *dev) 


		kms->aspace = aspace;



		ret = aspace->mmu->funcs->attach(aspace->mmu, iommu_ports,

				ARRAY_SIZE(iommu_ports));

		ret = aspace->mmu->funcs->attach(aspace->mmu);

		if (ret)

			goto fail;

	} else {

drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c

+2 −8
Original line number Diff line number Diff line
@@ -19,10 +19,6 @@ 
#include "msm_mmu.h"

#include "mdp5_kms.h"



static const char *iommu_ports[] = {

		"mdp_0",

};



static int mdp5_hw_init(struct msm_kms *kms)

{

	struct mdp5_kms *mdp5_kms = to_mdp5_kms(to_mdp_kms(kms));
@@ -233,8 +229,7 @@ static void mdp5_kms_destroy(struct msm_kms *kms) 
		mdp5_pipe_destroy(mdp5_kms->hwpipes[i]);



	if (aspace) {

		aspace->mmu->funcs->detach(aspace->mmu,

				iommu_ports, ARRAY_SIZE(iommu_ports));

		aspace->mmu->funcs->detach(aspace->mmu);

		msm_gem_address_space_put(aspace);

	}

}
@@ -737,8 +732,7 @@ struct msm_kms *mdp5_kms_init(struct drm_device *dev) 


		kms->aspace = aspace;



		ret = aspace->mmu->funcs->attach(aspace->mmu, iommu_ports,

				ARRAY_SIZE(iommu_ports));

		ret = aspace->mmu->funcs->attach(aspace->mmu);

		if (ret) {

			DRM_DEV_ERROR(&pdev->dev, "failed to attach iommu: %d\n",

				ret);

drivers/gpu/drm/msm/msm_gpu.c

+2 −3
Original line number Diff line number Diff line
@@ -838,7 +838,7 @@ msm_gpu_create_address_space(struct msm_gpu *gpu, struct platform_device *pdev, 
		return ERR_CAST(aspace);

	}



	ret = aspace->mmu->funcs->attach(aspace->mmu, NULL, 0);

	ret = aspace->mmu->funcs->attach(aspace->mmu);

	if (ret) {

		msm_gem_address_space_put(aspace);

		return ERR_PTR(ret);
@@ -995,8 +995,7 @@ void msm_gpu_cleanup(struct msm_gpu *gpu) 
	msm_gem_kernel_put(gpu->memptrs_bo, gpu->aspace, false);



	if (!IS_ERR_OR_NULL(gpu->aspace)) {

		gpu->aspace->mmu->funcs->detach(gpu->aspace->mmu,

			NULL, 0);

		gpu->aspace->mmu->funcs->detach(gpu->aspace->mmu);

		msm_gem_address_space_put(gpu->aspace);

	}

}

drivers/gpu/drm/msm/msm_gpummu.c

+2 −4
Original line number Diff line number Diff line
@@ -21,14 +21,12 @@ struct msm_gpummu { 
#define GPUMMU_PAGE_SIZE SZ_4K

#define TABLE_SIZE (sizeof(uint32_t) * GPUMMU_VA_RANGE / GPUMMU_PAGE_SIZE)



static int msm_gpummu_attach(struct msm_mmu *mmu, const char * const *names,

		int cnt)

static int msm_gpummu_attach(struct msm_mmu *mmu)

{

	return 0;

}



static void msm_gpummu_detach(struct msm_mmu *mmu, const char * const *names,

		int cnt)

static void msm_gpummu_detach(struct msm_mmu *mmu)

{

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE