Home Explore Help
Sign In
samsung-sm8650
/
android_kernel_samsung_sm8650-modules
2
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

msm: camera: ope: Support 32 bit arch

Update datatypes to work with 32 bit kernel.

CRs-Fixed: 2594541
Change-Id: I72d628152134770d7e09c3684443e25c47d9d1dc
Signed-off-by: Trishansh Bhardwaj <[email protected]>
Trishansh Bhardwaj 5 years ago
parent
3bbd97274f
commit
4aad75a2f9
2 changed files with 7 additions and 7 deletions
Unified View Show Diff Stats
  1. 3 3
      drivers/cam_ope/ope_hw_mgr/cam_ope_hw_mgr.c
  2. 4 4
      drivers/cam_ope/ope_hw_mgr/ope_hw/ope_core.c

+ 3 - 3
drivers/cam_ope/ope_hw_mgr/cam_ope_hw_mgr.c
View File 

@@ -1363,7 +1363,7 @@ static int cam_ope_mgr_process_cmd_io_buf_req(struct cam_ope_hw_mgr *hw_mgr,
 
 {
 
 {
 
 	int rc = 0;
 
 	int rc = 0;
 
 	int i, j, k, l;
 
 	int i, j, k, l;
 
-	uint64_t iova_addr;
 
+	dma_addr_t iova_addr;
 
 	size_t len;
 
 	size_t len;
 
 	struct ope_frame_process *in_frame_process;
 
 	struct ope_frame_process *in_frame_process;
 
 	struct ope_frame_set *in_frame_set;
 
 	struct ope_frame_set *in_frame_set;
 
@@ -1522,8 +1522,8 @@ static int cam_ope_mgr_process_cmd_buf_req(struct cam_ope_hw_mgr *hw_mgr,
 
 {
 
 {
 
 	int rc = 0;
 
 	int rc = 0;
 
 	int i, j;
 
 	int i, j;
 
-	uint64_t iova_addr;
 
-	uint64_t iova_cdm_addr;
 
+	dma_addr_t iova_addr;
 
+	dma_addr_t iova_cdm_addr;
 
 	uintptr_t cpu_addr;
 
 	uintptr_t cpu_addr;
 
 	size_t len;
 
 	size_t len;
 
 	struct ope_frame_process *frame_process;
 
 	struct ope_frame_process *frame_process;

+ 4 - 4
drivers/cam_ope/ope_hw_mgr/ope_hw/ope_core.c
View File 

@@ -462,7 +462,7 @@ static uint32_t *ope_create_frame_cmd_prefetch_dis(
 
 	struct ope_bus_wr_io_port_cdm_info *wr_cdm_info;
 
 	struct ope_bus_wr_io_port_cdm_info *wr_cdm_info;
 
 	struct ope_bus_rd_io_port_cdm_info *rd_cdm_info;
 
 	struct ope_bus_rd_io_port_cdm_info *rd_cdm_info;
 
 	struct ope_frame_process *frm_proc;
 
 	struct ope_frame_process *frm_proc;
 
-	uint64_t iova_addr;
 
+	dma_addr_t iova_addr;
 
 	uintptr_t cpu_addr;
 
 	uintptr_t cpu_addr;
 
 	size_t buf_len;
 
 	size_t buf_len;
 
 	uint32_t print_idx;
 
 	uint32_t print_idx;
 
@@ -574,7 +574,7 @@ static uint32_t *ope_create_frame_cmd_batch(struct cam_ope_hw_mgr *hw_mgr,
 
 	struct ope_bus_wr_io_port_cdm_info *wr_cdm_info;
 
 	struct ope_bus_wr_io_port_cdm_info *wr_cdm_info;
 
 	struct ope_bus_rd_io_port_cdm_info *rd_cdm_info;
 
 	struct ope_bus_rd_io_port_cdm_info *rd_cdm_info;
 
 	struct ope_frame_process *frm_proc;
 
 	struct ope_frame_process *frm_proc;
 
-	uint64_t iova_addr;
 
+	dma_addr_t iova_addr;
 
 	uintptr_t cpu_addr;
 
 	uintptr_t cpu_addr;
 
 	size_t buf_len;
 
 	size_t buf_len;
 
 	uint32_t print_idx;
 
 	uint32_t print_idx;
 
@@ -729,7 +729,7 @@ static uint32_t *ope_create_frame_cmd(struct cam_ope_hw_mgr *hw_mgr,
 
 	struct ope_bus_wr_io_port_cdm_info *wr_cdm_info;
 
 	struct ope_bus_wr_io_port_cdm_info *wr_cdm_info;
 
 	struct ope_bus_rd_io_port_cdm_info *rd_cdm_info;
 
 	struct ope_bus_rd_io_port_cdm_info *rd_cdm_info;
 
 	struct ope_frame_process *frm_proc;
 
 	struct ope_frame_process *frm_proc;
 
-	uint64_t iova_addr;
 
+	dma_addr_t iova_addr;
 
 	uintptr_t cpu_addr;
 
 	uintptr_t cpu_addr;
 
 	size_t buf_len;
 
 	size_t buf_len;
 
 	uint32_t print_idx;
 
 	uint32_t print_idx;
 
@@ -833,7 +833,7 @@ static uint32_t *ope_create_stripe_cmd(struct cam_ope_hw_mgr *hw_mgr,
 
 	int rc = 0, i, j, k;
 
 	int rc = 0, i, j, k;
 
 	uint32_t temp[3];
 
 	uint32_t temp[3];
 
 	struct cdm_dmi_cmd *dmi_cmd;
 
 	struct cdm_dmi_cmd *dmi_cmd;
 
-	uint64_t iova_addr;
 
+	dma_addr_t iova_addr;
 
 	uintptr_t cpu_addr;
 
 	uintptr_t cpu_addr;
 
 	size_t buf_len;
 
 	size_t buf_len;
 
 	uint32_t print_idx;
 
 	uint32_t print_idx;