Commit d3b2ee54 authored by Eugen Hristev's avatar Eugen Hristev Committed by Mauro Carvalho Chehab

media: atmel: atmel-isc: extract CBC submodule config into separate function

The CBC submodule is a part of the atmel-isc pipeline, and stands for
Contrast Brightness Control. It is used to apply gains and offsets to the
luma (Y) and chroma (U, V) components of the YUV elements.
The CBC submodule should be initialized in the product specific driver
as it's product specific. Other products can implement it differently

[hverkuil: made isc_sama5d2_config_cbc static]
Signed-off-by: default avatarEugen Hristev <eugen.hristev@microchip.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent ffeeb01d
...@@ -655,9 +655,7 @@ static void isc_set_pipeline(struct isc_device *isc, u32 pipeline) ...@@ -655,9 +655,7 @@ static void isc_set_pipeline(struct isc_device *isc, u32 pipeline)
regmap_bulk_write(regmap, ISC_GAM_RENTRY, gamma, GAMMA_ENTRIES); regmap_bulk_write(regmap, ISC_GAM_RENTRY, gamma, GAMMA_ENTRIES);
isc->config_csc(isc); isc->config_csc(isc);
isc->config_cbc(isc);
regmap_write(regmap, ISC_CBC_BRIGHT, ctrls->brightness);
regmap_write(regmap, ISC_CBC_CONTRAST, ctrls->contrast);
} }
static int isc_update_profile(struct isc_device *isc) static int isc_update_profile(struct isc_device *isc)
......
...@@ -203,6 +203,8 @@ struct isc_reg_offsets { ...@@ -203,6 +203,8 @@ struct isc_reg_offsets {
* *
* @config_csc: pointer to a function that initializes product * @config_csc: pointer to a function that initializes product
* specific CSC module * specific CSC module
* @config_cbc: pointer to a function that initializes product
* specific CBC module
* *
* @offsets: struct holding the product specific register offsets * @offsets: struct holding the product specific register offsets
*/ */
...@@ -275,6 +277,7 @@ struct isc_device { ...@@ -275,6 +277,7 @@ struct isc_device {
struct { struct {
void (*config_csc)(struct isc_device *isc); void (*config_csc)(struct isc_device *isc);
void (*config_cbc)(struct isc_device *isc);
}; };
struct isc_reg_offsets offsets; struct isc_reg_offsets offsets;
......
...@@ -73,6 +73,14 @@ static void isc_sama5d2_config_csc(struct isc_device *isc) ...@@ -73,6 +73,14 @@ static void isc_sama5d2_config_csc(struct isc_device *isc)
0xFEE | (0x80 << 16)); 0xFEE | (0x80 << 16));
} }
static void isc_sama5d2_config_cbc(struct isc_device *isc)
{
struct regmap *regmap = isc->regmap;
regmap_write(regmap, ISC_CBC_BRIGHT, isc->ctrls.brightness);
regmap_write(regmap, ISC_CBC_CONTRAST, isc->ctrls.contrast);
}
/* Gamma table with gamma 1/2.2 */ /* Gamma table with gamma 1/2.2 */
static const u32 isc_sama5d2_gamma_table[][GAMMA_ENTRIES] = { static const u32 isc_sama5d2_gamma_table[][GAMMA_ENTRIES] = {
/* 0 --> gamma 1/1.8 */ /* 0 --> gamma 1/1.8 */
...@@ -218,6 +226,7 @@ static int atmel_isc_probe(struct platform_device *pdev) ...@@ -218,6 +226,7 @@ static int atmel_isc_probe(struct platform_device *pdev)
isc->max_height = ISC_SAMA5D2_MAX_SUPPORT_HEIGHT; isc->max_height = ISC_SAMA5D2_MAX_SUPPORT_HEIGHT;
isc->config_csc = isc_sama5d2_config_csc; isc->config_csc = isc_sama5d2_config_csc;
isc->config_cbc = isc_sama5d2_config_cbc;
isc->offsets.csc = ISC_SAMA5D2_CSC_OFFSET; isc->offsets.csc = ISC_SAMA5D2_CSC_OFFSET;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment