git.openwrt.org Git - openwrt/staging/pepe2k.git/blob

   1 From a452251cc286f2799969f047698c76fe3d7862b9 Mon Sep 17 00:00:00 2001
   2 From: Naushir Patuck <naush@raspberrypi.com>
   3 Date: Thu, 16 Jan 2025 10:13:57 +0000
   4 Subject: [PATCH] drivers: media: pisp_be: Remove unused fields in struct
   5  pisp_be_config
   6
   7 These fields should not be set by either the user or the kernel driver
   8 so remove them. Replace them with padding bytes to maintain backward
   9 compatibility with existing userland applications.
  10
  11 Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
  12 ---
  13  .../linux/media/raspberrypi/pisp_be_config.h  | 42 ++-----------------
  14  1 file changed, 4 insertions(+), 38 deletions(-)
  15
  16 --- a/include/uapi/linux/media/raspberrypi/pisp_be_config.h
  17 +++ b/include/uapi/linux/media/raspberrypi/pisp_be_config.h
  18 @@ -716,13 +716,6 @@ struct pisp_be_hog_buffer_config {
  19  /**
  20   * struct pisp_be_config - RaspberryPi PiSP Back End Processing configuration
  21   *
  22 - * @input_buffer:              Input buffer addresses
  23 - * @tdn_input_buffer:          TDN input buffer addresses
  24 - * @stitch_input_buffer:       Stitch input buffer addresses
  25 - * @tdn_output_buffer:         TDN output buffer addresses
  26 - * @stitch_output_buffer:      Stitch output buffer addresses
  27 - * @output_buffer:             Output buffers addresses
  28 - * @hog_buffer:                        HOG buffer addresses
  29   * @global:                    Global PiSP configuration
  30   * @input_format:              Input image format
  31   * @decompress:                        Decompress configuration
  32 @@ -761,28 +754,10 @@ struct pisp_be_hog_buffer_config {
  33   * @output_format:             Output format configuration
  34   * @hog:                       HOG configuration
  35   * @axi:                       AXI bus configuration
  36 - * @lsc_extra:                 LSC extra info
  37 - * @cac_extra:                 CAC extra info
  38 - * @downscale_extra:           Downscaler extra info
  39 - * @resample_extra:            Resample extra info
  40 - * @crop:                      Crop configuration
  41 - * @hog_format:                        HOG format info
  42 - * @dirty_flags_bayer:         Bayer enable dirty flags
  43 - *                             (:c:type:`pisp_be_bayer_enable`)
  44 - * @dirty_flags_rgb:           RGB enable dirty flags
  45 - *                             (:c:type:`pisp_be_rgb_enable`)
  46 - * @dirty_flags_extra:         Extra dirty flags
  47   */
  48  struct pisp_be_config {
  49 -       /* I/O configuration: */
  50 -       struct pisp_be_input_buffer_config input_buffer;
  51 -       struct pisp_be_tdn_input_buffer_config tdn_input_buffer;
  52 -       struct pisp_be_stitch_input_buffer_config stitch_input_buffer;
  53 -       struct pisp_be_tdn_output_buffer_config tdn_output_buffer;
  54 -       struct pisp_be_stitch_output_buffer_config stitch_output_buffer;
  55 -       struct pisp_be_output_buffer_config
  56 -                               output_buffer[PISP_BACK_END_NUM_OUTPUTS];
  57 -       struct pisp_be_hog_buffer_config hog_buffer;
  58 +       /* For backward compatibility */
  59 +       uint8_t pad0[112];
  60         /* Processing configuration: */
  61         struct pisp_be_global_config global;
  62         struct pisp_image_format_config input_format;
  63 @@ -823,17 +798,8 @@ struct pisp_be_config {
  64                                 output_format[PISP_BACK_END_NUM_OUTPUTS];
  65         struct pisp_be_hog_config hog;
  66         struct pisp_be_axi_config axi;
  67 -       /* Non-register fields: */
  68 -       struct pisp_be_lsc_extra lsc_extra;
  69 -       struct pisp_be_cac_extra cac_extra;
  70 -       struct pisp_be_downscale_extra
  71 -                               downscale_extra[PISP_BACK_END_NUM_OUTPUTS];
  72 -       struct pisp_be_resample_extra resample_extra[PISP_BACK_END_NUM_OUTPUTS];
  73 -       struct pisp_be_crop_config crop;
  74 -       struct pisp_image_format_config hog_format;
  75 -       __u32 dirty_flags_bayer; /* these use pisp_be_bayer_enable */
  76 -       __u32 dirty_flags_rgb; /* use pisp_be_rgb_enable */
  77 -       __u32 dirty_flags_extra; /* these use pisp_be_dirty_t */
  78 +       /* For backward compatibility */
  79 +       uint8_t pad1[84];
  80  } __attribute__((packed));
  81
  82  /**