Commit 2ede3975 authored by Eugen Hristev's avatar Eugen Hristev Committed by Mauro Carvalho Chehab
Browse files

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



The CSC submodule is a part of the atmel-isc pipeline, and stands for
Color Space Conversion. It is used to apply a matrix transformation to
RGB pixels to convert them to the YUV components.
The CSC 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_csc 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 cd5af394

drivers/media/platform/atmel/atmel-isc-base.c

+1 −7
Original line number Original line Diff line number Diff line
@@ -654,13 +654,7 @@ static void isc_set_pipeline(struct isc_device *isc, u32 pipeline) 
	regmap_bulk_write(regmap, ISC_GAM_GENTRY, gamma, GAMMA_ENTRIES);

	regmap_bulk_write(regmap, ISC_GAM_GENTRY, gamma, GAMMA_ENTRIES);

	regmap_bulk_write(regmap, ISC_GAM_RENTRY, gamma, GAMMA_ENTRIES);

	regmap_bulk_write(regmap, ISC_GAM_RENTRY, gamma, GAMMA_ENTRIES);





	/* Convert RGB to YUV */

	isc->config_csc(isc);

	regmap_write(regmap, ISC_CSC_YR_YG, 0x42 | (0x81 << 16));

	regmap_write(regmap, ISC_CSC_YB_OY, 0x19 | (0x10 << 16));

	regmap_write(regmap, ISC_CSC_CBR_CBG, 0xFDA | (0xFB6 << 16));

	regmap_write(regmap, ISC_CSC_CBB_OCB, 0x70 | (0x80 << 16));

	regmap_write(regmap, ISC_CSC_CRR_CRG, 0x70 | (0xFA2 << 16));

	regmap_write(regmap, ISC_CSC_CRB_OCR, 0xFEE | (0x80 << 16));





	regmap_write(regmap, ISC_CBC_BRIGHT, ctrls->brightness);

	regmap_write(regmap, ISC_CBC_BRIGHT, ctrls->brightness);

	regmap_write(regmap, ISC_CBC_CONTRAST, ctrls->contrast);

	regmap_write(regmap, ISC_CBC_CONTRAST, ctrls->contrast);

drivers/media/platform/atmel/atmel-isc.h

+7 −0
Original line number Original line Diff line number Diff line
@@ -192,6 +192,9 @@ struct isc_ctrls { 
 *

 *

 * @max_width:		maximum frame width, dependent on the internal RAM

 * @max_width:		maximum frame width, dependent on the internal RAM

 * @max_height:		maximum frame height, dependent on the internal RAM

 * @max_height:		maximum frame height, dependent on the internal RAM

 *

 * @config_csc:		pointer to a function that initializes product

 *			specific CSC module

 */

 */

struct isc_device {

struct isc_device {

	struct regmap		*regmap;

	struct regmap		*regmap;
@@ -259,6 +262,10 @@ struct isc_device { 




	u32		max_width;

	u32		max_width;

	u32		max_height;

	u32		max_height;



	struct {

		void (*config_csc)(struct isc_device *isc);

	};

};

};





extern struct isc_format formats_list[];

extern struct isc_format formats_list[];

drivers/media/platform/atmel/atmel-sama5d2-isc.c

+15 −0
Original line number Original line Diff line number Diff line
@@ -54,6 +54,19 @@ 




#define ISC_CLK_MAX_DIV		255

#define ISC_CLK_MAX_DIV		255





static void isc_sama5d2_config_csc(struct isc_device *isc)

{

	struct regmap *regmap = isc->regmap;



	/* Convert RGB to YUV */

	regmap_write(regmap, ISC_CSC_YR_YG, 0x42 | (0x81 << 16));

	regmap_write(regmap, ISC_CSC_YB_OY, 0x19 | (0x10 << 16));

	regmap_write(regmap, ISC_CSC_CBR_CBG, 0xFDA | (0xFB6 << 16));

	regmap_write(regmap, ISC_CSC_CBB_OCB, 0x70 | (0x80 << 16));

	regmap_write(regmap, ISC_CSC_CRR_CRG, 0x70 | (0xFA2 << 16));

	regmap_write(regmap, ISC_CSC_CRB_OCR, 0xFEE | (0x80 << 16));

}



/* 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 */
@@ -198,6 +211,8 @@ static int atmel_isc_probe(struct platform_device *pdev) 
	isc->max_width = ISC_SAMA5D2_MAX_SUPPORT_WIDTH;

	isc->max_width = ISC_SAMA5D2_MAX_SUPPORT_WIDTH;

	isc->max_height = ISC_SAMA5D2_MAX_SUPPORT_HEIGHT;

	isc->max_height = ISC_SAMA5D2_MAX_SUPPORT_HEIGHT;





	isc->config_csc = isc_sama5d2_config_csc;



	/* sama5d2-isc - 8 bits per beat */

	/* sama5d2-isc - 8 bits per beat */

	isc->dcfg = ISC_DCFG_YMBSIZE_BEATS8 | ISC_DCFG_CMBSIZE_BEATS8;

	isc->dcfg = ISC_DCFG_YMBSIZE_BEATS8 | ISC_DCFG_CMBSIZE_BEATS8;