Skip to content

Commit

Permalink
backend: Remove extras field from pisp_be_config
Browse files Browse the repository at this point in the history 
Remove the various extras fields from struct pisp_be_config. These
fields are not used by the driver nor the hardware, so do not belong
in this structure.

Also put the tiles array at the top of struct pisp_be_tiles_config to
ensure any size change to struct pisp_be_config does not move the
tiles struct out of alignment.

This is a userland breaking change, and the backend kernel driver must
be updated accordingly.

Signed-off-by: Naushir Patuck <[email protected]>
  • Loading branch information
@naushir
naushir committed May 1, 2024
1 parent f615a08 commit 45bb6b2
Show file tree
Hide file tree
Showing 6 changed files with 104 additions and 99 deletions.
100 changes: 50 additions & 50 deletions src/libpisp/backend/backend.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,13 @@ void BackEnd::SetGlobal(pisp_be_global_config const &global)
if (global.rgb_enables & PISP_BE_RGB_ENABLE_HOG)
throw std::runtime_error("HOG output is not supported.");

be_config_.dirty_flags_bayer |=
be_config_extra_.dirty_flags_bayer |=
(global.bayer_enables & ~be_config_.global.bayer_enables); // label anything newly enabled as dirty
be_config_.dirty_flags_rgb |=
be_config_extra_.dirty_flags_rgb |=
(global.rgb_enables & ~be_config_.global.rgb_enables); // label anything newly enabled as dirty
be_config_.global = global;
be_config_.global.pad[0] = be_config_.global.pad[1] = be_config_.global.pad[2] = 0;
be_config_.dirty_flags_extra |= PISP_BE_DIRTY_GLOBAL;
be_config_extra_.dirty_flags_extra |= PISP_BE_DIRTY_GLOBAL;
}

void BackEnd::GetGlobal(pisp_be_global_config &global) const
Expand All @@ -61,7 +61,7 @@ void BackEnd::GetGlobal(pisp_be_global_config &global) const
void BackEnd::SetInputFormat(pisp_image_format_config const &input_format)
{
be_config_.input_format = input_format;
be_config_.dirty_flags_bayer |= PISP_BE_BAYER_ENABLE_INPUT;
be_config_extra_.dirty_flags_bayer |= PISP_BE_BAYER_ENABLE_INPUT;
retile_ = true;
}

Expand All @@ -73,41 +73,41 @@ void BackEnd::SetInputBuffer(pisp_be_input_buffer_config const &input_buffer)
void BackEnd::SetDecompress(pisp_decompress_config const &decompress)
{
be_config_.decompress = decompress;
be_config_.dirty_flags_bayer |= PISP_BE_BAYER_ENABLE_DECOMPRESS;
be_config_extra_.dirty_flags_bayer |= PISP_BE_BAYER_ENABLE_DECOMPRESS;
}

void BackEnd::SetDpc(pisp_be_dpc_config const &dpc)
{
be_config_.dpc = dpc;
be_config_.dpc.pad = 0;
be_config_.dirty_flags_bayer |= PISP_BE_BAYER_ENABLE_DPC;
be_config_extra_.dirty_flags_bayer |= PISP_BE_BAYER_ENABLE_DPC;
}

void BackEnd::SetGeq(pisp_be_geq_config const &geq)
{
be_config_.geq = geq;
be_config_.geq.slope_sharper &= (PISP_BE_GEQ_SLOPE | PISP_BE_GEQ_SHARPER);
be_config_.dirty_flags_bayer |= PISP_BE_BAYER_ENABLE_GEQ;
be_config_extra_.dirty_flags_bayer |= PISP_BE_BAYER_ENABLE_GEQ;
}

void BackEnd::SetTdnInputFormat(pisp_image_format_config const &tdn_input_format)
{
be_config_.tdn_input_format = tdn_input_format;
be_config_.dirty_flags_bayer |= PISP_BE_BAYER_ENABLE_TDN_INPUT; // TDN input address will always be written
be_config_extra_.dirty_flags_bayer |= PISP_BE_BAYER_ENABLE_TDN_INPUT; // TDN input address will always be written
finalise_tiling_ = true;
}

void BackEnd::SetTdnDecompress(pisp_decompress_config const &tdn_decompress)
{
be_config_.tdn_decompress = tdn_decompress;
be_config_.dirty_flags_bayer |= PISP_BE_BAYER_ENABLE_TDN_DECOMPRESS;
be_config_extra_.dirty_flags_bayer |= PISP_BE_BAYER_ENABLE_TDN_DECOMPRESS;
}

void BackEnd::SetTdn(pisp_be_tdn_config const &tdn)
{
be_config_.tdn = tdn;
be_config_.tdn.pad = 0;
be_config_.dirty_flags_bayer |= PISP_BE_BAYER_ENABLE_TDN;
be_config_extra_.dirty_flags_bayer |= PISP_BE_BAYER_ENABLE_TDN;
}

void BackEnd::GetTdn(pisp_be_tdn_config &tdn) const
Expand All @@ -118,13 +118,13 @@ void BackEnd::GetTdn(pisp_be_tdn_config &tdn) const
void BackEnd::SetTdnCompress(pisp_compress_config const &tdn_compress)
{
be_config_.tdn_compress = tdn_compress;
be_config_.dirty_flags_bayer |= PISP_BE_BAYER_ENABLE_TDN_COMPRESS;
be_config_extra_.dirty_flags_bayer |= PISP_BE_BAYER_ENABLE_TDN_COMPRESS;
}

void BackEnd::SetTdnOutputFormat(pisp_image_format_config const &tdn_output_format)
{
be_config_.tdn_output_format = tdn_output_format;
be_config_.dirty_flags_bayer |= PISP_BE_BAYER_ENABLE_TDN_OUTPUT; // TDN output address will always be written
be_config_extra_.dirty_flags_bayer |= PISP_BE_BAYER_ENABLE_TDN_OUTPUT; // TDN output address will always be written
finalise_tiling_ = true;
}

Expand All @@ -137,14 +137,14 @@ void BackEnd::SetSdn(pisp_be_sdn_config const &sdn)
{
be_config_.sdn = sdn;
be_config_.sdn.pad = 0;
be_config_.dirty_flags_bayer |= PISP_BE_BAYER_ENABLE_SDN;
be_config_extra_.dirty_flags_bayer |= PISP_BE_BAYER_ENABLE_SDN;
}

void BackEnd::SetBlc(pisp_bla_config const &blc)
{
be_config_.blc = blc;
be_config_.blc.pad[0] = be_config_.blc.pad[1] = 0;
be_config_.dirty_flags_bayer |= PISP_BE_BAYER_ENABLE_BLC;
be_config_extra_.dirty_flags_bayer |= PISP_BE_BAYER_ENABLE_BLC;
}

void BackEnd::GetBlc(pisp_bla_config &blc) const
Expand All @@ -156,7 +156,7 @@ void BackEnd::SetStitchInputFormat(pisp_image_format_config const &stitch_input_
{
be_config_.stitch_input_format = stitch_input_format;
be_config_.stitch.pad = 0;
be_config_.dirty_flags_bayer |= PISP_BE_BAYER_ENABLE_STITCH_INPUT;
be_config_extra_.dirty_flags_bayer |= PISP_BE_BAYER_ENABLE_STITCH_INPUT;
finalise_tiling_ = true;
}

Expand All @@ -168,25 +168,25 @@ void BackEnd::GetStitchInputFormat(pisp_image_format_config &stitch_input_format
void BackEnd::SetStitchDecompress(pisp_decompress_config const &stitch_decompress)
{
be_config_.stitch_decompress = stitch_decompress;
be_config_.dirty_flags_bayer |= PISP_BE_BAYER_ENABLE_STITCH_DECOMPRESS;
be_config_extra_.dirty_flags_bayer |= PISP_BE_BAYER_ENABLE_STITCH_DECOMPRESS;
}

void BackEnd::SetStitch(pisp_be_stitch_config const &stitch)
{
be_config_.stitch = stitch;
be_config_.dirty_flags_bayer |= PISP_BE_BAYER_ENABLE_STITCH;
be_config_extra_.dirty_flags_bayer |= PISP_BE_BAYER_ENABLE_STITCH;
}

void BackEnd::SetStitchCompress(pisp_compress_config const &stitch_compress)
{
be_config_.stitch_compress = stitch_compress;
be_config_.dirty_flags_bayer |= PISP_BE_BAYER_ENABLE_STITCH_COMPRESS;
be_config_extra_.dirty_flags_bayer |= PISP_BE_BAYER_ENABLE_STITCH_COMPRESS;
}

void BackEnd::SetStitchOutputFormat(pisp_image_format_config const &stitch_output_format)
{
be_config_.stitch_output_format = stitch_output_format;
be_config_.dirty_flags_bayer |= PISP_BE_BAYER_ENABLE_STITCH_OUTPUT;
be_config_extra_.dirty_flags_bayer |= PISP_BE_BAYER_ENABLE_STITCH_OUTPUT;
finalise_tiling_ = true;
}

Expand All @@ -198,14 +198,14 @@ void BackEnd::GetStitchOutputFormat(pisp_image_format_config &stitch_output_form
void BackEnd::SetCdn(pisp_be_cdn_config const &cdn)
{
be_config_.cdn = cdn;
be_config_.dirty_flags_bayer |= PISP_BE_BAYER_ENABLE_CDN;
be_config_extra_.dirty_flags_bayer |= PISP_BE_BAYER_ENABLE_CDN;
}

void BackEnd::SetWbg(pisp_wbg_config const &wbg)
{
be_config_.wbg = wbg;
be_config_.wbg.pad[0] = be_config_.wbg.pad[1] = 0;
be_config_.dirty_flags_bayer |= PISP_BE_BAYER_ENABLE_WBG;
be_config_extra_.dirty_flags_bayer |= PISP_BE_BAYER_ENABLE_WBG;
}

void BackEnd::GetWbg(pisp_wbg_config &wbg)
Expand All @@ -218,23 +218,23 @@ void BackEnd::SetLsc(pisp_be_lsc_config const &lsc, pisp_be_lsc_extra lsc_extra)
// Should not need a finalise_tile if only the cell coefficients have changed.
finalise_tiling_ |= be_config_.lsc.grid_step_x != lsc.grid_step_x || be_config_.lsc.grid_step_y != lsc.grid_step_y;
be_config_.lsc = lsc;
be_config_.dirty_flags_bayer |= PISP_BE_BAYER_ENABLE_LSC;
be_config_.lsc_extra = lsc_extra;
be_config_extra_.dirty_flags_bayer |= PISP_BE_BAYER_ENABLE_LSC;
be_config_extra_.lsc = lsc_extra;
}

void BackEnd::SetCac(pisp_be_cac_config const &cac, pisp_be_cac_extra cac_extra)
{
finalise_tiling_ |= be_config_.cac.grid_step_x != cac.grid_step_x || be_config_.cac.grid_step_y != cac.grid_step_y;
be_config_.cac = cac;
be_config_.cac_extra = cac_extra;
be_config_.dirty_flags_bayer |= PISP_BE_BAYER_ENABLE_CAC;
be_config_extra_.cac = cac_extra;
be_config_extra_.dirty_flags_bayer |= PISP_BE_BAYER_ENABLE_CAC;
}

void BackEnd::SetDebin(pisp_be_debin_config const &debin)
{
be_config_.debin = debin;
be_config_.debin.pad[0] = be_config_.debin.pad[1] = 0;
be_config_.dirty_flags_bayer |= PISP_BE_BAYER_ENABLE_DEBIN;
be_config_extra_.dirty_flags_bayer |= PISP_BE_BAYER_ENABLE_DEBIN;
}

void BackEnd::GetDebin(pisp_be_debin_config &debin)
Expand All @@ -245,14 +245,14 @@ void BackEnd::GetDebin(pisp_be_debin_config &debin)
void BackEnd::SetTonemap(pisp_be_tonemap_config const &tonemap)
{
be_config_.tonemap = tonemap;
be_config_.dirty_flags_bayer |= PISP_BE_BAYER_ENABLE_TONEMAP;
be_config_extra_.dirty_flags_bayer |= PISP_BE_BAYER_ENABLE_TONEMAP;
}

void BackEnd::SetDemosaic(pisp_be_demosaic_config const &demosaic)
{
be_config_.demosaic = demosaic;
be_config_.demosaic.pad[0] = be_config_.demosaic.pad[1] = 0;
be_config_.dirty_flags_bayer |= PISP_BE_BAYER_ENABLE_DEMOSAIC;
be_config_extra_.dirty_flags_bayer |= PISP_BE_BAYER_ENABLE_DEMOSAIC;
}

void BackEnd::GetDemosaic(pisp_be_demosaic_config &demosaic) const
Expand All @@ -264,21 +264,21 @@ void BackEnd::SetCcm(pisp_be_ccm_config const &ccm)
{
be_config_.ccm = ccm;
be_config_.ccm.pad[0] = be_config_.ccm.pad[1] = 0;
be_config_.dirty_flags_rgb |= PISP_BE_RGB_ENABLE_CCM;
be_config_extra_.dirty_flags_rgb |= PISP_BE_RGB_ENABLE_CCM;
}

void BackEnd::SetSatControl(pisp_be_sat_control_config const &sat_control)
{
be_config_.sat_control = sat_control;
be_config_.sat_control.pad = 0;
be_config_.dirty_flags_rgb |= PISP_BE_RGB_ENABLE_SAT_CONTROL;
be_config_extra_.dirty_flags_rgb |= PISP_BE_RGB_ENABLE_SAT_CONTROL;
}

void BackEnd::SetYcbcr(pisp_be_ccm_config const &ycbcr)
{
be_config_.ycbcr = ycbcr;
be_config_.ycbcr.pad[0] = be_config_.ycbcr.pad[1] = 0;
be_config_.dirty_flags_rgb |= PISP_BE_RGB_ENABLE_YCBCR;
be_config_extra_.dirty_flags_rgb |= PISP_BE_RGB_ENABLE_YCBCR;
}

void BackEnd::GetYcbcr(pisp_be_ccm_config &ycbcr)
Expand All @@ -290,7 +290,7 @@ void BackEnd::SetFalseColour(pisp_be_false_colour_config const &false_colour)
{
be_config_.false_colour = false_colour;
be_config_.false_colour.pad[0] = be_config_.false_colour.pad[1] = be_config_.false_colour.pad[2] = 0;
be_config_.dirty_flags_rgb |= PISP_BE_RGB_ENABLE_FALSE_COLOUR;
be_config_extra_.dirty_flags_rgb |= PISP_BE_RGB_ENABLE_FALSE_COLOUR;
}

void BackEnd::SetSharpen(pisp_be_sharpen_config const &sharpen)
Expand All @@ -303,7 +303,7 @@ void BackEnd::SetSharpen(pisp_be_sharpen_config const &sharpen)
be_config_.sharpen.pad4[0] = be_config_.sharpen.pad4[1] = be_config_.sharpen.pad4[2] = 0;
be_config_.sharpen.pad5 = be_config_.sharpen.pad6 = be_config_.sharpen.pad7 = be_config_.sharpen.pad8 =
be_config_.sharpen.pad9 = 0;
be_config_.dirty_flags_rgb |= PISP_BE_RGB_ENABLE_SHARPEN;
be_config_extra_.dirty_flags_rgb |= PISP_BE_RGB_ENABLE_SHARPEN;
}

void BackEnd::GetSharpen(pisp_be_sharpen_config &sharpen)
Expand All @@ -315,20 +315,20 @@ void BackEnd::SetShFcCombine(pisp_be_sh_fc_combine_config const &sh_fc_combine)
{
be_config_.sh_fc_combine = sh_fc_combine;
be_config_.sh_fc_combine.pad = 0;
be_config_.dirty_flags_extra |= PISP_BE_DIRTY_SH_FC_COMBINE;
be_config_extra_.dirty_flags_extra |= PISP_BE_DIRTY_SH_FC_COMBINE;
}

void BackEnd::SetYcbcrInverse(pisp_be_ccm_config const &ycbcr_inverse)
{
be_config_.ycbcr_inverse = ycbcr_inverse;
be_config_.ycbcr_inverse.pad[0] = be_config_.ycbcr_inverse.pad[1] = 0;
be_config_.dirty_flags_rgb |= PISP_BE_RGB_ENABLE_YCBCR_INVERSE;
be_config_extra_.dirty_flags_rgb |= PISP_BE_RGB_ENABLE_YCBCR_INVERSE;
}

void BackEnd::SetGamma(pisp_be_gamma_config const &gamma)
{
be_config_.gamma = gamma;
be_config_.dirty_flags_rgb |= PISP_BE_RGB_ENABLE_GAMMA;
be_config_extra_.dirty_flags_rgb |= PISP_BE_RGB_ENABLE_GAMMA;
}

void BackEnd::GetGamma(pisp_be_gamma_config &gamma)
Expand All @@ -339,23 +339,23 @@ void BackEnd::GetGamma(pisp_be_gamma_config &gamma)
void BackEnd::SetCrop(pisp_be_crop_config const &crop)
{
for (unsigned int i = 0; i < variant_.BackEndNumBranches(0); i++)
be_config_.crop[i] = crop;
be_config_.dirty_flags_extra |= PISP_BE_DIRTY_CROP;
be_config_extra_.crop[i] = crop;
be_config_extra_.dirty_flags_extra |= PISP_BE_DIRTY_CROP;
retile_ = true;
}

void BackEnd::SetCrop(unsigned int i, pisp_be_crop_config const &crop)
{
PISP_ASSERT(i < variant_.BackEndNumBranches(0));
be_config_.crop[i] = crop;
be_config_.dirty_flags_extra |= PISP_BE_DIRTY_CROP;
be_config_extra_.crop[i] = crop;
be_config_extra_.dirty_flags_extra |= PISP_BE_DIRTY_CROP;
retile_ = true;
}

void BackEnd::SetCsc(unsigned int i, pisp_be_ccm_config const &csc)
{
be_config_.csc[i] = csc;
be_config_.dirty_flags_bayer |= PISP_BE_RGB_ENABLE_CSC(i);
be_config_extra_.dirty_flags_bayer |= PISP_BE_RGB_ENABLE_CSC(i);
}

void BackEnd::GetCsc(unsigned int i, pisp_be_ccm_config &csc)
Expand All @@ -367,31 +367,31 @@ void BackEnd::SetDownscale(unsigned int i, pisp_be_downscale_config const &downs
pisp_be_downscale_extra const &downscale_extra)
{
be_config_.downscale[i] = downscale;
be_config_.downscale_extra[i] = downscale_extra;
be_config_.dirty_flags_rgb |= PISP_BE_RGB_ENABLE_DOWNSCALE(i);
be_config_extra_.downscale[i] = downscale_extra;
be_config_extra_.dirty_flags_rgb |= PISP_BE_RGB_ENABLE_DOWNSCALE(i);
retile_ = true;
}

void BackEnd::SetDownscale(unsigned int i, pisp_be_downscale_extra const &downscale_extra)
{
be_config_.downscale_extra[i] = downscale_extra;
be_config_.dirty_flags_rgb |= PISP_BE_RGB_ENABLE_DOWNSCALE(i);
be_config_extra_.downscale[i] = downscale_extra;
be_config_extra_.dirty_flags_rgb |= PISP_BE_RGB_ENABLE_DOWNSCALE(i);
retile_ = true;
}

void BackEnd::SetResample(unsigned int i, pisp_be_resample_config const &resample,
pisp_be_resample_extra const &resample_extra)
{
be_config_.resample[i] = resample;
be_config_.resample_extra[i] = resample_extra;
be_config_.dirty_flags_rgb |= PISP_BE_RGB_ENABLE_RESAMPLE(i);
be_config_extra_.resample[i] = resample_extra;
be_config_extra_.dirty_flags_rgb |= PISP_BE_RGB_ENABLE_RESAMPLE(i);
retile_ = true;
}

void BackEnd::SetResample(unsigned int i, pisp_be_resample_extra const &resample_extra)
{
be_config_.resample_extra[i] = resample_extra;
be_config_.dirty_flags_rgb |= PISP_BE_RGB_ENABLE_RESAMPLE(i);
be_config_extra_.resample[i] = resample_extra;
be_config_extra_.dirty_flags_rgb |= PISP_BE_RGB_ENABLE_RESAMPLE(i);
retile_ = true;
}

Expand All @@ -400,7 +400,7 @@ void BackEnd::SetOutputFormat(unsigned int i, pisp_be_output_format_config const
PISP_ASSERT(i < variant_.BackEndNumBranches(0));
be_config_.output_format[i] = output_format;
be_config_.output_format[i].pad[0] = be_config_.output_format[i].pad[1] = be_config_.output_format[i].pad[2] = 0;
be_config_.dirty_flags_rgb |= PISP_BE_RGB_ENABLE_OUTPUT(i);
be_config_extra_.dirty_flags_rgb |= PISP_BE_RGB_ENABLE_OUTPUT(i);
// Should only need a retile if the transform has changed, othwise a finalise_tile will do.
retile_ = true;
}
Expand Down
14 changes: 14 additions & 0 deletions src/libpisp/backend/backend.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,19 @@ class BackEnd
}

protected:
struct BeConfigExtra
{
// Non-register fields:
pisp_be_lsc_extra lsc;
pisp_be_cac_extra cac;
pisp_be_downscale_extra downscale[PISP_BACK_END_NUM_OUTPUTS];
pisp_be_resample_extra resample[PISP_BACK_END_NUM_OUTPUTS];
pisp_be_crop_config crop[PISP_BACK_END_NUM_OUTPUTS];
uint32_t dirty_flags_bayer; //these use pisp_be_bayer_enable
uint32_t dirty_flags_rgb; //use pisp_be_rgb_enable
uint32_t dirty_flags_extra; //these use pisp_be_dirty_t
};

void finaliseConfig();
void updateSmartResize();
void updateTiles();
Expand All @@ -160,6 +173,7 @@ class BackEnd
Config config_;
const PiSPVariant &variant_;
pisp_be_config be_config_;
BeConfigExtra be_config_extra_;
pisp_image_format_config max_input_;
bool retile_;
bool finalise_tiling_;
Expand Down
2 changes: 1 addition & 1 deletion src/libpisp/backend/backend_debug.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -546,7 +546,7 @@ void BackEnd::SetJsonConfig(const std::string &json_str)
}

// Clear any dirty flags so no reconfiguration happens on the next Prepare() call.
be_config_.dirty_flags_bayer = be_config_.dirty_flags_rgb = be_config_.dirty_flags_extra = 0;
be_config_extra_.dirty_flags_bayer = be_config_extra_.dirty_flags_rgb = be_config_extra_.dirty_flags_extra = 0;
// But do retile the pipeline to get the tile structures setup correctly.
retile_ = true;
}
Expand Down
Loading

0 comments on commit 45bb6b2

Please sign in to comment.