Skip to content

Commit 1c2c57b

Browse files
Jacopo MondiHans Verkuil
authored andcommitted
media: uapi: pisp_be_config: Add extra config fields
Complete the pisp_be_config strcture by adding fields that even if not written to the HW are relevant to complete the uAPI and put it in par with the BSP driver. Fixes: c6c49ba ("media: uapi: Add Raspberry Pi PiSP Back End uAPI") Signed-off-by: Jacopo Mondi <[email protected]> Signed-off-by: Sakari Ailus <[email protected]> Signed-off-by: Hans Verkuil <[email protected]>
1 parent 639065c commit 1c2c57b

File tree

1 file changed

+41
-0
lines changed

1 file changed

+41
-0
lines changed

include/uapi/linux/media/raspberrypi/pisp_be_config.h

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -716,6 +716,13 @@ struct pisp_be_hog_buffer_config {
716716
/**
717717
* struct pisp_be_config - RaspberryPi PiSP Back End Processing configuration
718718
*
719+
* @input_buffer: Input buffer addresses
720+
* @tdn_input_buffer: TDN input buffer addresses
721+
* @stitch_input_buffer: Stitch input buffer addresses
722+
* @tdn_output_buffer: TDN output buffer addresses
723+
* @stitch_output_buffer: Stitch output buffer addresses
724+
* @output_buffer: Output buffers addresses
725+
* @hog_buffer: HOG buffer addresses
719726
* @global: Global PiSP configuration
720727
* @input_format: Input image format
721728
* @decompress: Decompress configuration
@@ -753,8 +760,30 @@ struct pisp_be_hog_buffer_config {
753760
* @resample: Resampling configuration
754761
* @output_format: Output format configuration
755762
* @hog: HOG configuration
763+
* @axi: AXI bus configuration
764+
* @lsc_extra: LSC extra info
765+
* @cac_extra: CAC extra info
766+
* @downscale_extra: Downscaler extra info
767+
* @resample_extra: Resample extra info
768+
* @crop: Crop configuration
769+
* @hog_format: HOG format info
770+
* @dirty_flags_bayer: Bayer enable dirty flags
771+
* (:c:type:`pisp_be_bayer_enable`)
772+
* @dirty_flags_rgb: RGB enable dirty flags
773+
* (:c:type:`pisp_be_rgb_enable`)
774+
* @dirty_flags_extra: Extra dirty flags
756775
*/
757776
struct pisp_be_config {
777+
/* I/O configuration: */
778+
struct pisp_be_input_buffer_config input_buffer;
779+
struct pisp_be_tdn_input_buffer_config tdn_input_buffer;
780+
struct pisp_be_stitch_input_buffer_config stitch_input_buffer;
781+
struct pisp_be_tdn_output_buffer_config tdn_output_buffer;
782+
struct pisp_be_stitch_output_buffer_config stitch_output_buffer;
783+
struct pisp_be_output_buffer_config
784+
output_buffer[PISP_BACK_END_NUM_OUTPUTS];
785+
struct pisp_be_hog_buffer_config hog_buffer;
786+
/* Processing configuration: */
758787
struct pisp_be_global_config global;
759788
struct pisp_image_format_config input_format;
760789
struct pisp_decompress_config decompress;
@@ -793,6 +822,18 @@ struct pisp_be_config {
793822
struct pisp_be_output_format_config
794823
output_format[PISP_BACK_END_NUM_OUTPUTS];
795824
struct pisp_be_hog_config hog;
825+
struct pisp_be_axi_config axi;
826+
/* Non-register fields: */
827+
struct pisp_be_lsc_extra lsc_extra;
828+
struct pisp_be_cac_extra cac_extra;
829+
struct pisp_be_downscale_extra
830+
downscale_extra[PISP_BACK_END_NUM_OUTPUTS];
831+
struct pisp_be_resample_extra resample_extra[PISP_BACK_END_NUM_OUTPUTS];
832+
struct pisp_be_crop_config crop;
833+
struct pisp_image_format_config hog_format;
834+
__u32 dirty_flags_bayer; /* these use pisp_be_bayer_enable */
835+
__u32 dirty_flags_rgb; /* use pisp_be_rgb_enable */
836+
__u32 dirty_flags_extra; /* these use pisp_be_dirty_t */
796837
} __attribute__((packed));
797838

798839
/**

0 commit comments

Comments
 (0)