[<prev] [next>] [day] [month] [year] [list]
Message-Id: <20250710010130.113441-1-abdelrahmanfekry375@gmail.com>
Date: Thu, 10 Jul 2025 04:01:30 +0300
From: Abdelrahman Fekry <abdelrahmanfekry375@...il.com>
To: hansg@...nel.org,
mchehab@...nel.org,
sakari.ailus@...ux.intel.com,
andy@...nel.org,
gregkh@...uxfoundation.org
Cc: linux-media@...r.kernel.org,
linux-kernel@...r.kernel.org,
linux-staging@...ts.linux.dev,
linux-kernel-mentees@...ts.linux.dev,
skhan@...uxfoundation.org,
dan.carpenter@...aro.org,
Abdelrahman Fekry <abdelrahmanfekry375@...il.com>
Subject: [PATCH] staging: media: atomisp: move hmm_get_mmu_base_addr()
The function hmm_get_mmu_base_addr() is related to the functionality
of hmm so its better to be declared and defined in this scope.
- Move hmm_get_mmu_base_addr() to hmm.c.
- Change hmm_bo_device struct to be static.
Note:
This patch builds on [1], [2] that were not accepted yet.
Link: https://lore.kernel.org/all/20250708164408.79863-1-abdelrahmanfekry375@gmail.com/ [1]
Link: https://lore.kernel.org/all/20250708164408.79863-2-abdelrahmanfekry375@gmail.com/ [2]
Signed-off-by: Abdelrahman Fekry <abdelrahmanfekry375@...il.com>
---
drivers/staging/media/atomisp/include/hmm/hmm.h | 4 +---
.../media/atomisp/pci/atomisp_compat_css20.c | 12 ------------
drivers/staging/media/atomisp/pci/hmm/hmm.c | 14 +++++++++++++-
3 files changed, 14 insertions(+), 16 deletions(-)
diff --git a/drivers/staging/media/atomisp/include/hmm/hmm.h b/drivers/staging/media/atomisp/include/hmm/hmm.h
index a7aef27f54de..da85d835ec10 100644
--- a/drivers/staging/media/atomisp/include/hmm/hmm.h
+++ b/drivers/staging/media/atomisp/include/hmm/hmm.h
@@ -33,7 +33,7 @@ int hmm_load(ia_css_ptr virt, void *data, unsigned int bytes);
int hmm_store(ia_css_ptr virt, const void *data, unsigned int bytes);
int hmm_set(ia_css_ptr virt, int c, unsigned int bytes);
int hmm_flush(ia_css_ptr virt, unsigned int bytes);
-
+int hmm_get_mmu_base_addr(struct device *dev, unsigned int *mmu_base_addr);
/*
* get kernel memory physical address from ISP virtual address.
*/
@@ -65,6 +65,4 @@ void hmm_flush_vmap(ia_css_ptr virt);
*/
int hmm_mmap(struct vm_area_struct *vma, ia_css_ptr virt);
-extern struct hmm_bo_device bo_device;
-
#endif
diff --git a/drivers/staging/media/atomisp/pci/atomisp_compat_css20.c b/drivers/staging/media/atomisp/pci/atomisp_compat_css20.c
index be5f37f4a6fd..b4913cb32a64 100644
--- a/drivers/staging/media/atomisp/pci/atomisp_compat_css20.c
+++ b/drivers/staging/media/atomisp/pci/atomisp_compat_css20.c
@@ -157,18 +157,6 @@ void atomisp_load_uint32(hrt_address addr, uint32_t *data)
*data = atomisp_css2_hw_load_32(addr);
}
-static int hmm_get_mmu_base_addr(struct device *dev, unsigned int *mmu_base_addr)
-{
- if (!sh_mmu_mrfld.get_pd_base) {
- dev_err(dev, "get mmu base address failed.\n");
- return -EINVAL;
- }
-
- *mmu_base_addr = sh_mmu_mrfld.get_pd_base(&bo_device.mmu,
- bo_device.mmu.base_address);
- return 0;
-}
-
static void __dump_pipe_config(struct atomisp_sub_device *asd,
struct atomisp_stream_env *stream_env,
unsigned int pipe_id)
diff --git a/drivers/staging/media/atomisp/pci/hmm/hmm.c b/drivers/staging/media/atomisp/pci/hmm/hmm.c
index 8d64e5fd812c..321166e58bb5 100644
--- a/drivers/staging/media/atomisp/pci/hmm/hmm.c
+++ b/drivers/staging/media/atomisp/pci/hmm/hmm.c
@@ -24,7 +24,7 @@
#include "mmu/isp_mmu.h"
#include "mmu/sh_mmu_mrfld.h"
-struct hmm_bo_device bo_device;
+static struct hmm_bo_device bo_device;
static ia_css_ptr dummy_ptr = mmgr_EXCEPTION;
int hmm_init(void)
@@ -488,3 +488,15 @@ void hmm_vunmap(ia_css_ptr virt)
hmm_bo_vunmap(bo);
}
+
+int hmm_get_mmu_base_addr(struct device *dev, unsigned int *mmu_base_addr)
+{
+ if (!sh_mmu_mrfld.get_pd_base) {
+ dev_err(dev, "get mmu base address failed.\n");
+ return -EINVAL;
+ }
+
+ *mmu_base_addr = sh_mmu_mrfld.get_pd_base(&bo_device.mmu,
+ bo_device.mmu.base_address);
+ return 0;
+}
--
2.25.1
Powered by blists - more mailing lists