nv-tegra-mirror/linux-nv-oot
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nv-oot.git synced 2025-12-22 17:25:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

oot: capture-isp: Add h2 surface

Browse Source 
Add h2 surface pinning in the capture-isp driver.
Also add image_def_mr2 to capture descriptor.

Jira CT26X-1728
Bug 4716542

Change-Id: Ib1657e7cebb335e78fb4eed855a6dad309c397f7
Signed-off-by: Akihiro Mizusawa <amizusawa@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/3164329
GVS: buildbot_gerritrpt <buildbot_gerritrpt@nvidia.com>
Reviewed-by: Chinniah Poosapadi <cpoosapadi@nvidia.com>
Reviewed-by: Frank Chen <frankc@nvidia.com>
This commit is contained in:
Akihiro Mizusawa
2024-06-27 15:05:44 -05:00
committed by mobile promotions
parent 0b77774c92
commit 1f825ee8cd
2 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/media/platform/tegra/camera/fusa-capture/capture-isp.c
View File

@@ -1605,6 +1605,7 @@ static int pin_isp_capture_request_buffers_locked(
&desc->lac1_surface, &desc->h0_surface, &desc->lac1_surface, &desc->h0_surface,
&desc->h1_surface, &desc->hist_raw24_surface, &desc->h1_surface, &desc->hist_raw24_surface,
&desc->pru_bad_surface, &desc->ltm_surface, &desc->pru_bad_surface, &desc->ltm_surface,
&desc->h2_surface,
}; };
struct memoryinfo_surface *meminfo_surfaces[] = { struct memoryinfo_surface *meminfo_surfaces[] = {
@@ -1613,6 +1614,7 @@ static int pin_isp_capture_request_buffers_locked(
&desc_mem->lac1_surface, &desc_mem->h0_surface, &desc_mem->lac1_surface, &desc_mem->h0_surface,
&desc_mem->h1_surface, &desc_mem->hist_raw24_surface, &desc_mem->h1_surface, &desc_mem->hist_raw24_surface,
&desc_mem->pru_bad_surface, &desc_mem->ltm_surface, &desc_mem->pru_bad_surface, &desc_mem->ltm_surface,
&desc_mem->h2_surface,
}; };
BUILD_BUG_ON(ARRAY_SIZE(stats_surfaces) != BUILD_BUG_ON(ARRAY_SIZE(stats_surfaces) !=

17
include/soc/tegra/camrtc-capture.h
View File

@@ -4797,6 +4797,20 @@ struct isp_capture_descriptor {
*/ */
uint32_t mr_image_def1; uint32_t mr_image_def1;
/**
* Program identification. Used internally by ISP 7.
*
* @rststar
* +-------+---------------------------------------------------+
* | Bits | Description |
* +=======+===================================================+
* | 15:0 | Program ID [0,UINT16_MAX]. Should be set to a |
* | | unique value for each push buffer. |
* +-------+---------------------------------------------------+
* @endrst
*/
uint32_t mr_image_def2;
/** /**
* Surface control settings for multi-exposure. * Surface control settings for multi-exposure.
* *
@@ -4842,9 +4856,6 @@ struct isp_capture_descriptor {
} surface_configs; } surface_configs;
/**< Configuration for input surfaces. */ /**< Configuration for input surfaces. */
/** Reserved */
uint32_t pad2__;
/** /**
* Undefined in RCE-FW interface. * Undefined in RCE-FW interface.
* *