diff --git a/drivers/media/platform/tegra/camera/fusa-capture/capture-isp.c b/drivers/media/platform/tegra/camera/fusa-capture/capture-isp.c index f135a11b..319e5a0d 100644 --- a/drivers/media/platform/tegra/camera/fusa-capture/capture-isp.c +++ b/drivers/media/platform/tegra/camera/fusa-capture/capture-isp.c @@ -1605,6 +1605,7 @@ static int pin_isp_capture_request_buffers_locked( &desc->lac1_surface, &desc->h0_surface, &desc->h1_surface, &desc->hist_raw24_surface, &desc->pru_bad_surface, &desc->ltm_surface, + &desc->h2_surface, }; 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->h1_surface, &desc_mem->hist_raw24_surface, &desc_mem->pru_bad_surface, &desc_mem->ltm_surface, + &desc_mem->h2_surface, }; BUILD_BUG_ON(ARRAY_SIZE(stats_surfaces) != diff --git a/include/soc/tegra/camrtc-capture.h b/include/soc/tegra/camrtc-capture.h index 2ffc8d91..19500660 100644 --- a/include/soc/tegra/camrtc-capture.h +++ b/include/soc/tegra/camrtc-capture.h @@ -4797,6 +4797,20 @@ struct isp_capture_descriptor { */ 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. * @@ -4842,9 +4856,6 @@ struct isp_capture_descriptor { } surface_configs; /**< Configuration for input surfaces. */ - /** Reserved */ - uint32_t pad2__; - /** * Undefined in RCE-FW interface. *