Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4e32db22 authored by Jeyaprakash Soundrapandian's avatar Jeyaprakash Soundrapandian Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: memmgr: Remove the region flag from request_mem API" into dev/msm-4.9-camx

parents ddcb9d34 a037cd16

drivers/media/platform/msm/camera/cam_cdm/cam_cdm_hw_core.c

+1 −2
Original line number Diff line number Diff line
@@ -618,8 +618,7 @@ int cam_hw_cdm_alloc_genirq_mem(void *hw_priv) 
	genirq_alloc_cmd.align = 0;

	genirq_alloc_cmd.size = (8 * CAM_CDM_HWFIFO_SIZE);

	genirq_alloc_cmd.smmu_hdl = cdm_core->iommu_hdl.non_secure;

	genirq_alloc_cmd.flags = 0;

	genirq_alloc_cmd.region = CAM_MEM_MGR_REGION_NON_SECURE_IO;

	genirq_alloc_cmd.flags = CAM_MEM_FLAG_HW_READ_WRITE;

	rc = cam_mem_mgr_request_mem(&genirq_alloc_cmd,

		&genirq_alloc_out);

	if (rc) {

drivers/media/platform/msm/camera/cam_core/Makefile

+1 −0
Original line number Diff line number Diff line 
ccflags-y += -Idrivers/media/platform/msm/camera/cam_req_mgr

ccflags-y += -Idrivers/media/platform/msm/camera/cam_sync

ccflags-y += -Idrivers/media/platform/msm/camera/cam_smmu/



obj-$(CONFIG_SPECTRA_CAMERA) += cam_context.o cam_context_utils.o cam_node.o cam_subdev.o

drivers/media/platform/msm/camera/cam_icp/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ ccflags-y += -Idrivers/media/platform/msm/camera/cam_icp/icp_hw/icp_hw_mgr 
ccflags-y += -Idrivers/media/platform/msm/camera/cam_icp/fw_inc

ccflags-y += -Idrivers/media/platform/msm/camera

ccflags-y += -Idrivers/media/platform/msm/camera/cam_cpas/include

ccflags-y += -Idrivers/media/platform/msm/camera/cam_smmu/



obj-$(CONFIG_SPECTRA_CAMERA) += icp_hw/

obj-$(CONFIG_SPECTRA_CAMERA) += cam_icp_subdev.o cam_icp_context.o hfi.o

drivers/media/platform/msm/camera/cam_icp/icp_hw/icp_hw_mgr/cam_icp_hw_mgr.c

+3 −2
Original line number Diff line number Diff line
@@ -416,7 +416,8 @@ static int cam_icp_alloc_shared_mem(struct cam_mem_mgr_memory_desc *qtbl) 
	memset(&out, 0, sizeof(out));

	alloc.size = SZ_1M;

	alloc.align = 0;

	alloc.region = CAM_MEM_MGR_REGION_SHARED;

	alloc.flags = CAM_MEM_FLAG_HW_READ_WRITE |

		CAM_MEM_FLAG_HW_SHARED_ACCESS;

	alloc.smmu_hdl = icp_hw_mgr.iommu_hdl;

	rc = cam_mem_mgr_request_mem(&alloc, &out);

	if (rc)
@@ -462,7 +463,7 @@ static int cam_icp_allocate_hfi_mem(void) 
	int rc;



	rc = cam_smmu_get_region_info(icp_hw_mgr.iommu_hdl,

		CAM_MEM_MGR_REGION_SHARED,

		CAM_SMMU_REGION_SHARED,

		&icp_hw_mgr.hfi_mem.shmem);

	if (rc) {

		pr_err("Unable to get shared memory info\n");

drivers/media/platform/msm/camera/cam_isp/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ ccflags-y += -Idrivers/media/platform/msm/camera/utils 
ccflags-y += -Idrivers/media/platform/msm/camera/cam_sync

ccflags-y += -Idrivers/media/platform/msm/camera/cam_core

ccflags-y += -Idrivers/media/platform/msm/camera/cam_isp/isp_hw_mgr/include

ccflags-y += -Idrivers/media/platform/msm/camera/cam_smmu/



obj-$(CONFIG_SPECTRA_CAMERA) += isp_hw_mgr/

obj-$(CONFIG_SPECTRA_CAMERA) += cam_isp_dev.o cam_isp_context.o