UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Eugen Hristev <eugen.hristev@microchip.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
This commit is contained in:
Eugen Hristev 2021-04-13 12:57:07 +02:00 committed by Mauro Carvalho Chehab
parent ffeeb01d11
commit d3b2ee5478
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/media/platform/atmel/atmel-isc-base.c
View File

@ -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)

3
drivers/media/platform/atmel/atmel-isc.h
View File

@ -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 {
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;

9
drivers/media/platform/atmel/atmel-sama5d2-isc.c
View File

@ -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)
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;