Skip to content

Commit dedf404

Browse files
cwabbott0Rob Clark
authored andcommitted
drm/msm: Delete resume_translation()
Unused since the previous commit. Signed-off-by: Connor Abbott <[email protected]> Patchwork: https://patchwork.freedesktop.org/patch/654890/ Signed-off-by: Rob Clark <[email protected]>
1 parent 0c5fea1 commit dedf404

File tree

3 files changed

+0
-19
lines changed

3 files changed

+0
-19
lines changed

drivers/gpu/drm/msm/adreno/a2xx_gpummu.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,6 @@ static int a2xx_gpummu_unmap(struct msm_mmu *mmu, uint64_t iova, size_t len)
7171
return 0;
7272
}
7373

74-
static void a2xx_gpummu_resume_translation(struct msm_mmu *mmu)
75-
{
76-
}
77-
7874
static void a2xx_gpummu_destroy(struct msm_mmu *mmu)
7975
{
8076
struct a2xx_gpummu *gpummu = to_a2xx_gpummu(mmu);
@@ -90,7 +86,6 @@ static const struct msm_mmu_funcs funcs = {
9086
.map = a2xx_gpummu_map,
9187
.unmap = a2xx_gpummu_unmap,
9288
.destroy = a2xx_gpummu_destroy,
93-
.resume_translation = a2xx_gpummu_resume_translation,
9489
};
9590

9691
struct msm_mmu *a2xx_gpummu_new(struct device *dev, struct msm_gpu *gpu)

drivers/gpu/drm/msm/msm_iommu.c

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,6 @@ static int msm_gpu_fault_handler(struct iommu_domain *domain, struct device *dev
345345
unsigned long iova, int flags, void *arg)
346346
{
347347
struct msm_iommu *iommu = arg;
348-
struct msm_mmu *mmu = &iommu->base;
349348
struct adreno_smmu_priv *adreno_smmu = dev_get_drvdata(iommu->base.dev);
350349
struct adreno_smmu_fault_info info, *ptr = NULL;
351350

@@ -359,9 +358,6 @@ static int msm_gpu_fault_handler(struct iommu_domain *domain, struct device *dev
359358

360359
pr_warn_ratelimited("*** fault: iova=%16lx, flags=%d\n", iova, flags);
361360

362-
if (mmu->funcs->resume_translation)
363-
mmu->funcs->resume_translation(mmu);
364-
365361
return 0;
366362
}
367363

@@ -376,14 +372,6 @@ static int msm_disp_fault_handler(struct iommu_domain *domain, struct device *de
376372
return -ENOSYS;
377373
}
378374

379-
static void msm_iommu_resume_translation(struct msm_mmu *mmu)
380-
{
381-
struct adreno_smmu_priv *adreno_smmu = dev_get_drvdata(mmu->dev);
382-
383-
if (adreno_smmu->resume_translation)
384-
adreno_smmu->resume_translation(adreno_smmu->cookie, true);
385-
}
386-
387375
static void msm_iommu_detach(struct msm_mmu *mmu)
388376
{
389377
struct msm_iommu *iommu = to_msm_iommu(mmu);
@@ -431,7 +419,6 @@ static const struct msm_mmu_funcs funcs = {
431419
.map = msm_iommu_map,
432420
.unmap = msm_iommu_unmap,
433421
.destroy = msm_iommu_destroy,
434-
.resume_translation = msm_iommu_resume_translation,
435422
};
436423

437424
struct msm_mmu *msm_iommu_new(struct device *dev, unsigned long quirks)

drivers/gpu/drm/msm/msm_mmu.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ struct msm_mmu_funcs {
1515
size_t len, int prot);
1616
int (*unmap)(struct msm_mmu *mmu, uint64_t iova, size_t len);
1717
void (*destroy)(struct msm_mmu *mmu);
18-
void (*resume_translation)(struct msm_mmu *mmu);
1918
};
2019

2120
enum msm_mmu_type {

0 commit comments

Comments
 (0)