mirror of
https://github.com/torvalds/linux.git
synced 2026-07-27 17:47:41 +02:00
staging: media: atomisp: reduce load_primary_binaries() stack usage
The load_primary_binaries() function is overly complex and has som large
variables on the stack, which can cause warnings depending on CONFIG_FRAME_WARN
setting:
drivers/staging/media/atomisp/pci/sh_css.c: In function 'load_primary_binaries':
drivers/staging/media/atomisp/pci/sh_css.c:5260:1: error: the frame size of 1560 bytes is larger than 1536 bytes [-Werror=frame-larger-than=]
Half of the stack usage is for the prim_descr[] array, but only one
member of the array is used at any given time.
Reduce the stack usage by turning the array into a single structure.
Fixes: a49d25364d ("staging/atomisp: Add support for the Intel IPU v2")
Cc: stable@vger.kernel.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@intel.com>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
This commit is contained in:
parent
f14d52b67e
commit
f4d51e55dd
|
|
@ -5019,7 +5019,6 @@ static int load_primary_binaries(
|
|||
struct ia_css_capture_settings *mycs;
|
||||
unsigned int i;
|
||||
bool need_extra_yuv_scaler = false;
|
||||
struct ia_css_binary_descr prim_descr[MAX_NUM_PRIMARY_STAGES];
|
||||
|
||||
IA_CSS_ENTER_PRIVATE("");
|
||||
assert(pipe);
|
||||
|
|
@ -5188,15 +5187,16 @@ static int load_primary_binaries(
|
|||
|
||||
/* Primary */
|
||||
for (i = 0; i < mycs->num_primary_stage; i++) {
|
||||
struct ia_css_binary_descr prim_descr;
|
||||
struct ia_css_frame_info *local_vf_info = NULL;
|
||||
|
||||
if (pipe->enable_viewfinder[IA_CSS_PIPE_OUTPUT_STAGE_0] &&
|
||||
(i == mycs->num_primary_stage - 1))
|
||||
local_vf_info = &vf_info;
|
||||
ia_css_pipe_get_primary_binarydesc(pipe, &prim_descr[i],
|
||||
ia_css_pipe_get_primary_binarydesc(pipe, &prim_descr,
|
||||
&prim_in_info, &prim_out_info,
|
||||
local_vf_info, i);
|
||||
err = ia_css_binary_find(&prim_descr[i], &mycs->primary_binary[i]);
|
||||
err = ia_css_binary_find(&prim_descr, &mycs->primary_binary[i]);
|
||||
if (err) {
|
||||
IA_CSS_LEAVE_ERR_PRIVATE(err);
|
||||
return err;
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user