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 09:11:26 +03:00
Code Issues Packages Projects Releases Wiki Activity

include: soc: tegra: fix divergence to firmware-api

Browse Source 
Fix minor differences to firmware-api that can cause conflicts
when propagating changes to kernel headers.

Jira CAMERASW-15815

Change-Id: I23239a246cdae69a8818a6ed0e2e8d23ee337f10
Signed-off-by: Mika Liljeberg <mliljeberg@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/2988968
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/2994200
GVS: Gerrit_Virtual_Submit <buildbot_gerritrpt@nvidia.com>
Reviewed-by: Matti Ryttylainen <mryttylainen@nvidia.com>
Reviewed-by: Viktor Horsmanheimo <viktorh@nvidia.com>
This commit is contained in:
Mika Liljeberg
2023-09-29 11:04:46 +03:00
committed by mobile promotions
parent f7c66766b7
commit 4e0255fbae
3 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -145,7 +145,7 @@ typedef struct syncpoint_info {
* of stats data per window. * of stats data per window.
* FM = 32 byte header + (64 x 64 x 2 x 4) bytes. FM can have 64 x 64 windows * FM = 32 byte header + (64 x 64 x 2 x 4) bytes. FM can have 64 x 64 windows
* with each window having 2 bytes of data for each color channel. * with each window having 2 bytes of data for each color channel.
* AFM = 32 byte header + 8 byte statistics data + 8 byte padding per ROI. * AFM = 32 byte header + 8 byte statistics data + 8 byte pad per ROI.
* LAC = 32 byte header + ( (32 x 32) x ((4 + 2 + 2) x 4) ) * LAC = 32 byte header + ( (32 x 32) x ((4 + 2 + 2) x 4) )
* Each ROI has 32x32 windows with each window containing 8 * Each ROI has 32x32 windows with each window containing 8
* bytes of data per color channel. * bytes of data per color channel.
@@ -180,7 +180,7 @@ typedef struct syncpoint_info {
#define ISP6_STATS_HIST_RAW24_MAX_SIZE MK_SIZE(1056) #define ISP6_STATS_HIST_RAW24_MAX_SIZE MK_SIZE(1056)
/** Local Tone Mapping (LTM) unit statistics data size in bytes */ /** Local Tone Mapping (LTM) unit statistics data size in bytes */
#define ISP6_STATS_LTM_MAX_SIZE MK_SIZE(1056) #define ISP6_STATS_LTM_MAX_SIZE MK_SIZE(1056)
/* Stats buffer addresses must be aligned to 64 byte (ATOM) boundaries */ /* Stats buffer addresses muse be aligned to 64 byte (ATOM) boundaries */
#define ISP6_ALIGN_STAT_OFFSET(_offset) \ #define ISP6_ALIGN_STAT_OFFSET(_offset) \
(((uint32_t)(_offset) + MK_U32(63)) & ~(MK_U32(63))) (((uint32_t)(_offset) + MK_U32(63)) & ~(MK_U32(63)))
@@ -377,8 +377,6 @@ typedef struct syncpoint_info {
#define CAPTURE_CHANNEL_FLAG_SEMI_PLANAR MK_U32(0x0008) #define CAPTURE_CHANNEL_FLAG_SEMI_PLANAR MK_U32(0x0008)
/** Channel supports phase-detection auto-focus */ /** Channel supports phase-detection auto-focus */
#define CAPTURE_CHANNEL_FLAG_PDAF MK_U32(0x0010) #define CAPTURE_CHANNEL_FLAG_PDAF MK_U32(0x0010)
/** Channel outputs to Focus Metric Lite module (FML) */
#define CAPTURE_CHANNEL_FLAG_FMLITE MK_U32(0x0020)
/** Channel outputs sensor embedded data */ /** Channel outputs sensor embedded data */
#define CAPTURE_CHANNEL_FLAG_EMBDATA MK_U32(0x0040) #define CAPTURE_CHANNEL_FLAG_EMBDATA MK_U32(0x0040)
/** Channel outputs to ISPA */ /** Channel outputs to ISPA */
@@ -559,6 +557,7 @@ struct capture_channel_config {
* Determines the size of the ring buffer. * Determines the size of the ring buffer.
*/ */
uint32_t queue_depth; uint32_t queue_depth;
/** Size of the buffer reserved for each capture request. */ /** Size of the buffer reserved for each capture request. */
uint32_t request_size; uint32_t request_size;
@@ -1027,7 +1026,9 @@ struct capture_status {
* Programming NOTIFY v0.0.0" for details. * Programming NOTIFY v0.0.0" for details.
*/ */
#define CAPTURE_STATUS_CHANSEL_NOMATCH MK_U32(15) #define CAPTURE_STATUS_CHANSEL_NOMATCH MK_U32(15)
/** Capture status for invalid VI capture settings.
/**
* Invalid VI capture settings.
* Value of @ref err_data "err_data" is undefined. * Value of @ref err_data "err_data" is undefined.
*/ */
#define CAPTURE_STATUS_INVALID_CAP_SETTINGS MK_U32(16) #define CAPTURE_STATUS_INVALID_CAP_SETTINGS MK_U32(16)
@@ -1365,10 +1366,10 @@ struct vi_pfsd_config {
* @brief Memory surface specs passed from KMD to RCE * @brief Memory surface specs passed from KMD to RCE
*/ */
struct memoryinfo_surface { struct memoryinfo_surface {
/** Surface iova address */ /** Surface iova address */
uint64_t base_address; uint64_t base_address;
/** Surface size */ /** Surface size */
uint64_t size; uint64_t size;
}; };
/** /**
@@ -2744,7 +2745,7 @@ struct isp_capture_descriptor_memoryinfo {
/** RAW24 Histogram Unit statistics buffer */ /** RAW24 Histogram Unit statistics buffer */
struct memoryinfo_surface hist_raw24_surface; struct memoryinfo_surface hist_raw24_surface;
/** Base address of ISP PB2 memory */ /** Base address of ISP PB2 memory */
struct memoryinfo_surface isp_pb2_mem; // TODO move to programm desc meminfo struct memoryinfo_surface isp_pb2_mem;
/** Engine result record – written by Falcon */ /** Engine result record – written by Falcon */
struct memoryinfo_surface engine_status; struct memoryinfo_surface engine_status;
/** Memory surface for watermark ring buffer written by ISP FW */ /** Memory surface for watermark ring buffer written by ISP FW */

8
include/soc/tegra/camrtc-common.h
View File

@@ -27,16 +27,16 @@
#define CAMRTC_ALIGN(_n) __attribute__((aligned(_n))) #define CAMRTC_ALIGN(_n) __attribute__((aligned(_n)))
#endif #endif
#ifndef U64_C #ifndef U64_C
#define U64_C(_x_) ((uint64_t)(_x_##ULL)) #define U64_C(_x_) (uint64_t)(_x_##ULL)
#endif #endif
#ifndef U32_C #ifndef U32_C
#define U32_C(_x_) ((uint32_t)(_x_##UL)) #define U32_C(_x_) (uint32_t)(_x_##UL)
#endif #endif
#ifndef U16_C #ifndef U16_C
#define U16_C(_x_) ((uint16_t)(_x_##U)) #define U16_C(_x_) (uint16_t)(_x_##U)
#endif #endif
#ifndef U8_C #ifndef U8_C
#define U8_C(_x_) ((uint8_t)(_x_##U)) #define U8_C(_x_) (uint8_t)(_x_##U)
#endif #endif
#endif #endif

2
include/soc/tegra/camrtc-trace.h
View File

@@ -231,7 +231,7 @@ struct camrtc_event_struct {
// camrtc_trace_event_rtos_ids // camrtc_trace_event_rtos_ids
#define camrtc_trace_rtos_id(_subid) \ #define camrtc_trace_rtos_id(_subid) \
CAMRTC_EVENT_MAKE_ID(CAMRTC_EVENT_TYPE_ARRAY, \ CAMRTC_EVENT_MAKE_ID(CAMRTC_EVENT_TYPE_ARRAY, \
CAMRTC_EVENT_MODULE_RTOS, (_subid)) CAMRTC_EVENT_MODULE_RTOS, (_subid))
#define camrtc_trace_rtos_task_switched_in \ #define camrtc_trace_rtos_task_switched_in \
camrtc_trace_rtos_id(1) camrtc_trace_rtos_id(1)