drm/gma500: Remove unused psb_mmu_virtual_to_pfn

[PATCH] drm/gma500: Remove unused psb_mmu_virtual_to_pfn

Posted by linux@treblig.org 11 months ago

From: "Dr. David Alan Gilbert" <linux@treblig.org>

psb_mmu_virtual_to_pfn() was added in 2011 by
commit 8c8f1c958ab5 ("gma500: introduce the GTT and MMU handling logic")
but hasn't been used.

Remove it.

Signed-off-by: Dr. David Alan Gilbert <linux@treblig.org>
---
 drivers/gpu/drm/gma500/mmu.c | 41 ------------------------------------
 drivers/gpu/drm/gma500/mmu.h |  2 --
 2 files changed, 43 deletions(-)

diff --git a/drivers/gpu/drm/gma500/mmu.c b/drivers/gpu/drm/gma500/mmu.c
index 4d78b33eaa82..e6753282e70e 100644
--- a/drivers/gpu/drm/gma500/mmu.c
+++ b/drivers/gpu/drm/gma500/mmu.c
@@ -730,44 +730,3 @@ int psb_mmu_insert_pages(struct psb_mmu_pd *pd, struct page **pages,
 
 	return ret;
 }
-
-int psb_mmu_virtual_to_pfn(struct psb_mmu_pd *pd, uint32_t virtual,
-			   unsigned long *pfn)
-{
-	int ret;
-	struct psb_mmu_pt *pt;
-	uint32_t tmp;
-	spinlock_t *lock = &pd->driver->lock;
-
-	down_read(&pd->driver->sem);
-	pt = psb_mmu_pt_map_lock(pd, virtual);
-	if (!pt) {
-		uint32_t *v;
-
-		spin_lock(lock);
-		v = kmap_atomic(pd->p);
-		tmp = v[psb_mmu_pd_index(virtual)];
-		kunmap_atomic(v);
-		spin_unlock(lock);
-
-		if (tmp != pd->invalid_pde || !(tmp & PSB_PTE_VALID) ||
-		    !(pd->invalid_pte & PSB_PTE_VALID)) {
-			ret = -EINVAL;
-			goto out;
-		}
-		ret = 0;
-		*pfn = pd->invalid_pte >> PAGE_SHIFT;
-		goto out;
-	}
-	tmp = pt->v[psb_mmu_pt_index(virtual)];
-	if (!(tmp & PSB_PTE_VALID)) {
-		ret = -EINVAL;
-	} else {
-		ret = 0;
-		*pfn = tmp >> PAGE_SHIFT;
-	}
-	psb_mmu_pt_unmap_unlock(pt);
-out:
-	up_read(&pd->driver->sem);
-	return ret;
-}
diff --git a/drivers/gpu/drm/gma500/mmu.h b/drivers/gpu/drm/gma500/mmu.h
index d4b5720ef08e..e6d39703718c 100644
--- a/drivers/gpu/drm/gma500/mmu.h
+++ b/drivers/gpu/drm/gma500/mmu.h
@@ -71,8 +71,6 @@ extern int psb_mmu_insert_pfn_sequence(struct psb_mmu_pd *pd,
 				       uint32_t start_pfn,
 				       unsigned long address,
 				       uint32_t num_pages, int type);
-extern int psb_mmu_virtual_to_pfn(struct psb_mmu_pd *pd, uint32_t virtual,
-				  unsigned long *pfn);
 extern void psb_mmu_set_pd_context(struct psb_mmu_pd *pd, int hw_context);
 extern int psb_mmu_insert_pages(struct psb_mmu_pd *pd, struct page **pages,
 				unsigned long address, uint32_t num_pages,
-- 
2.48.1

Re: [PATCH] drm/gma500: Remove unused psb_mmu_virtual_to_pfn

Posted by Patrik Jakobsson 11 months ago

On Sun, Mar 9, 2025 at 12:44 AM <linux@treblig.org> wrote:
>
> From: "Dr. David Alan Gilbert" <linux@treblig.org>
>
> psb_mmu_virtual_to_pfn() was added in 2011 by
> commit 8c8f1c958ab5 ("gma500: introduce the GTT and MMU handling logic")
> but hasn't been used.
>
> Remove it.
>
> Signed-off-by: Dr. David Alan Gilbert <linux@treblig.org>

Applied to drm-misc-next
Thanks

> ---
>  drivers/gpu/drm/gma500/mmu.c | 41 ------------------------------------
>  drivers/gpu/drm/gma500/mmu.h |  2 --
>  2 files changed, 43 deletions(-)
>
> diff --git a/drivers/gpu/drm/gma500/mmu.c b/drivers/gpu/drm/gma500/mmu.c
> index 4d78b33eaa82..e6753282e70e 100644
> --- a/drivers/gpu/drm/gma500/mmu.c
> +++ b/drivers/gpu/drm/gma500/mmu.c
> @@ -730,44 +730,3 @@ int psb_mmu_insert_pages(struct psb_mmu_pd *pd, struct page **pages,
>
>         return ret;
>  }
> -
> -int psb_mmu_virtual_to_pfn(struct psb_mmu_pd *pd, uint32_t virtual,
> -                          unsigned long *pfn)
> -{
> -       int ret;
> -       struct psb_mmu_pt *pt;
> -       uint32_t tmp;
> -       spinlock_t *lock = &pd->driver->lock;
> -
> -       down_read(&pd->driver->sem);
> -       pt = psb_mmu_pt_map_lock(pd, virtual);
> -       if (!pt) {
> -               uint32_t *v;
> -
> -               spin_lock(lock);
> -               v = kmap_atomic(pd->p);
> -               tmp = v[psb_mmu_pd_index(virtual)];
> -               kunmap_atomic(v);
> -               spin_unlock(lock);
> -
> -               if (tmp != pd->invalid_pde || !(tmp & PSB_PTE_VALID) ||
> -                   !(pd->invalid_pte & PSB_PTE_VALID)) {
> -                       ret = -EINVAL;
> -                       goto out;
> -               }
> -               ret = 0;
> -               *pfn = pd->invalid_pte >> PAGE_SHIFT;
> -               goto out;
> -       }
> -       tmp = pt->v[psb_mmu_pt_index(virtual)];
> -       if (!(tmp & PSB_PTE_VALID)) {
> -               ret = -EINVAL;
> -       } else {
> -               ret = 0;
> -               *pfn = tmp >> PAGE_SHIFT;
> -       }
> -       psb_mmu_pt_unmap_unlock(pt);
> -out:
> -       up_read(&pd->driver->sem);
> -       return ret;
> -}
> diff --git a/drivers/gpu/drm/gma500/mmu.h b/drivers/gpu/drm/gma500/mmu.h
> index d4b5720ef08e..e6d39703718c 100644
> --- a/drivers/gpu/drm/gma500/mmu.h
> +++ b/drivers/gpu/drm/gma500/mmu.h
> @@ -71,8 +71,6 @@ extern int psb_mmu_insert_pfn_sequence(struct psb_mmu_pd *pd,
>                                        uint32_t start_pfn,
>                                        unsigned long address,
>                                        uint32_t num_pages, int type);
> -extern int psb_mmu_virtual_to_pfn(struct psb_mmu_pd *pd, uint32_t virtual,
> -                                 unsigned long *pfn);
>  extern void psb_mmu_set_pd_context(struct psb_mmu_pd *pd, int hw_context);
>  extern int psb_mmu_insert_pages(struct psb_mmu_pd *pd, struct page **pages,
>                                 unsigned long address, uint32_t num_pages,
> --
> 2.48.1
>