mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-18 15:51:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

media: mali-c55: Fully reset the ISP configuration

Browse Source 
The Mali C55 driver uses an auto-suspend delay of 2000 milli-seconds.

As the delay is quite large, it is certainly possible that two
consecutive calls to enable_streams() do not go through a suspend of the
peripheral, meaning we cannot rely on POW register values for the ISP
configuration.

To prevent a streaming session to be initialized with settings from the
previous one, reset the full ISP configuration to know state disabling or
bypassing all the ISP blocks the driver supports.

Cc: stable@vger.kernel.org
Fixes: d5f281f3dd ("media: mali-c55: Add Mali-C55 ISP driver")
Reviewed-by: Daniel Scally <dan.scally@ideasonboard.com>
Signed-off-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
Signed-off-by: Hans Verkuil <hverkuil+cisco@kernel.org>
This commit is contained in:
Jacopo Mondi
2026-01-19 12:50:26 +01:00
committed by Hans Verkuil
parent d5c24b71da
commit 26ad493bea
1 changed files with 50 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
drivers/media/platform/arm/mali-c55/mali-c55-params.c
View File

@@ -781,6 +781,43 @@ void mali_c55_params_init_isp_config(struct mali_c55 *mali_c55,
MALI_C55_REG_BYPASS_3_SQUARE_BE,
MALI_C55_REG_BYPASS_3_SQUARE_BE);
/* Bypass the sensor offset correction (BLS) module */
mali_c55_ctx_update_bits(mali_c55, MALI_C55_REG_BYPASS_3,
MALI_C55_REG_BYPASS_3_SENSOR_OFFSET_PRE_SH,
MALI_C55_REG_BYPASS_3_SENSOR_OFFSET_PRE_SH);
/* Configure 1x digital gain. */
mali_c55_ctx_update_bits(mali_c55, MALI_C55_REG_DIGITAL_GAIN,
MALI_C55_DIGITAL_GAIN_MASK, 256);
/* Set all AWB gains to 1x. at both AWB configuration points*/
mali_c55_ctx_update_bits(mali_c55, MALI_C55_REG_AWB_GAINS1,
MALI_C55_AWB_GAIN00_MASK, 256);
mali_c55_ctx_update_bits(mali_c55, MALI_C55_REG_AWB_GAINS1,
MALI_C55_AWB_GAIN01_MASK,
MALI_C55_AWB_GAIN01(256));
mali_c55_ctx_update_bits(mali_c55, MALI_C55_REG_AWB_GAINS2,
MALI_C55_AWB_GAIN10_MASK, 256);
mali_c55_ctx_update_bits(mali_c55, MALI_C55_REG_AWB_GAINS2,
MALI_C55_AWB_GAIN11_MASK,
MALI_C55_AWB_GAIN11(256));
mali_c55_ctx_update_bits(mali_c55, MALI_C55_REG_AWB_GAINS1_AEXP,
MALI_C55_AWB_GAIN00_MASK, 256);
mali_c55_ctx_update_bits(mali_c55, MALI_C55_REG_AWB_GAINS1_AEXP,
MALI_C55_AWB_GAIN01_MASK,
MALI_C55_AWB_GAIN01(256));
mali_c55_ctx_update_bits(mali_c55, MALI_C55_REG_AWB_GAINS2_AEXP,
MALI_C55_AWB_GAIN10_MASK, 256);
mali_c55_ctx_update_bits(mali_c55, MALI_C55_REG_AWB_GAINS2_AEXP,
MALI_C55_AWB_GAIN11_MASK,
MALI_C55_AWB_GAIN11(256));
/* Bypass mesh shading corrections (LSC). */
mali_c55_ctx_update_bits(mali_c55, MALI_C55_REG_MESH_SHADING_CONFIG,
MALI_C55_MESH_SHADING_ENABLE_MASK,
false);
/* Bypass the temper module */
mali_c55_ctx_write(mali_c55, MALI_C55_REG_BYPASS_2,
MALI_C55_REG_BYPASS_2_TEMPER);
@@ -802,6 +839,19 @@ void mali_c55_params_init_isp_config(struct mali_c55 *mali_c55,
/* Disable the colour correction matrix */
mali_c55_ctx_write(mali_c55, MALI_C55_REG_CCM_ENABLE, 0);
/* Disable AWB stats. */
mali_c55_ctx_update_bits(mali_c55, MALI_C55_REG_METERING_CONFIG,
MALI_C55_AWB_DISABLE_MASK,
MALI_C55_AWB_DISABLE_MASK);
/* Disable auto-exposure 1024-bin histograms at both tap points. */
mali_c55_ctx_update_bits(mali_c55, MALI_C55_REG_METERING_CONFIG,
MALI_C55_AEXP_HIST_DISABLE_MASK,
MALI_C55_AEXP_HIST_DISABLE);
mali_c55_ctx_update_bits(mali_c55, MALI_C55_REG_METERING_CONFIG,
MALI_C55_AEXP_IHIST_DISABLE_MASK,
MALI_C55_AEXP_IHIST_DISABLE);
}
void mali_c55_unregister_params(struct mali_c55 *mali_c55)