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

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

Merge "msm: camera: Fix direction in dma buf ops" into dev/msm-4.14-camx

parents 503d71d8 6a7bff74

drivers/media/platform/msm/camera/cam_req_mgr/cam_mem_mgr.c

+4 −3
Original line number Diff line number Diff line
@@ -318,10 +318,10 @@ int cam_mem_mgr_cache_ops(struct cam_mem_cache_ops_cmd *cmd) 
	if (dmabuf_flag & ION_FLAG_CACHED) {

		switch (cmd->mem_cache_ops) {

		case CAM_MEM_CLEAN_CACHE:

			cache_dir = DMA_FROM_DEVICE;

			cache_dir = DMA_TO_DEVICE;

			break;

		case CAM_MEM_INV_CACHE:

			cache_dir = DMA_TO_DEVICE;

			cache_dir = DMA_FROM_DEVICE;

			break;

		case CAM_MEM_CLEAN_INV_CACHE:

			cache_dir = DMA_BIDIRECTIONAL;
@@ -338,7 +338,8 @@ int cam_mem_mgr_cache_ops(struct cam_mem_cache_ops_cmd *cmd) 
	}



	rc = dma_buf_begin_cpu_access(tbl.bufq[idx].dma_buf,

		cache_dir);

		(cmd->mem_cache_ops == CAM_MEM_CLEAN_INV_CACHE) ?

		DMA_BIDIRECTIONAL : DMA_TO_DEVICE);

	if (rc) {

		CAM_ERR(CAM_MEM, "dma begin access failed rc=%d", rc);

		goto end;