samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "msm: camera: common: Define debugflag to allocate usecase info" into camera-kernel.lnx.4.0

Browse Source
This commit is contained in:
Haritha Chintalapati
2020-08-25 16:42:58 -07:00
committed by Gerrit - the friendly Code Review server
parent bf8c7d2856 23fc6a670c
commit 28c2e8b5ef
3 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/cam_req_mgr/cam_mem_mgr.c
View File

@@ -733,6 +733,9 @@ int cam_mem_mgr_alloc_and_map(struct cam_mem_mgr_alloc_cmd *cmd)
} }
} }
if (cmd->flags & CAM_MEM_FLAG_KMD_DEBUG_FLAG)
tbl.dbg_buf_idx = idx;
tbl.bufq[idx].kmdvaddr = kvaddr; tbl.bufq[idx].kmdvaddr = kvaddr;
tbl.bufq[idx].vaddr = hw_vaddr; tbl.bufq[idx].vaddr = hw_vaddr;
tbl.bufq[idx].dma_buf = dmabuf; tbl.bufq[idx].dma_buf = dmabuf;
@@ -1023,6 +1026,7 @@ void cam_mem_mgr_deinit(void)
bitmap_zero(tbl.bitmap, tbl.bits); bitmap_zero(tbl.bitmap, tbl.bits);
kfree(tbl.bitmap); kfree(tbl.bitmap);
tbl.bitmap = NULL; tbl.bitmap = NULL;
tbl.dbg_buf_idx = -1;
mutex_unlock(&tbl.m_lock); mutex_unlock(&tbl.m_lock);
mutex_destroy(&tbl.m_lock); mutex_destroy(&tbl.m_lock);
} }

2
drivers/cam_req_mgr/cam_mem_mgr.h
View File

@@ -71,6 +71,7 @@ struct cam_mem_buf_queue {
* @bufq: array of buffers * @bufq: array of buffers
* @dentry: Debugfs entry * @dentry: Debugfs entry
* @alloc_profile_enable: Whether to enable alloc profiling * @alloc_profile_enable: Whether to enable alloc profiling
* @dbg_buf_idx: debug buffer index to get usecases info
*/ */
struct cam_mem_table { struct cam_mem_table {
struct mutex m_lock; struct mutex m_lock;
@@ -79,6 +80,7 @@ struct cam_mem_table {
struct cam_mem_buf_queue bufq[CAM_MEM_BUFQ_MAX]; struct cam_mem_buf_queue bufq[CAM_MEM_BUFQ_MAX];
struct dentry *dentry; struct dentry *dentry;
bool alloc_profile_enable; bool alloc_profile_enable;
size_t dbg_buf_idx;
}; };
/** /**

2
include/uapi/camera/media/cam_req_mgr.h
View File

@@ -284,6 +284,8 @@ struct cam_req_mgr_link_control {
#define CAM_MEM_FLAG_HW_SHARED_ACCESS (1<<11) #define CAM_MEM_FLAG_HW_SHARED_ACCESS (1<<11)
#define CAM_MEM_FLAG_CDSP_OUTPUT (1<<12) #define CAM_MEM_FLAG_CDSP_OUTPUT (1<<12)
#define CAM_MEM_FLAG_DISABLE_DELAYED_UNMAP (1<<13) #define CAM_MEM_FLAG_DISABLE_DELAYED_UNMAP (1<<13)
#define CAM_MEM_FLAG_KMD_DEBUG_FLAG (1<<14)
#define CAM_MEM_MMU_MAX_HANDLE 16 #define CAM_MEM_MMU_MAX_HANDLE 16