Commit 88bb507a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'media/v5.11-3' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media 

Pull media fixes from Mauro Carvalho Chehab:
 "The rockship rkisp1 driver will be promoted from staging in 5.11.

  While not too late, do a few uAPI changes which are needed to better
  support its functionalities"

* tag 'media/v5.11-3' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
  media: rockchip: rkisp1: extend uapi array sizes
  media: rockchip: rkisp1: carry ip version information
  media: rockchip: rkisp1: reduce number of histogram grid elements in uapi
  media: rkisp1: stats: mask the hist_bins values
  media: rkisp1: stats: remove a wrong cast to u8
  media: rkisp1: uapi: change hist_bins array type from __u16 to __u32
parents 1048ba83 ef357e02

Documentation/admin-guide/media/rkisp1.rst

+16 −0
Original line number Diff line number Diff line
@@ -13,6 +13,22 @@ This file documents the driver for the Rockchip ISP1 that is part of RK3288 
and RK3399 SoCs. The driver is located under drivers/staging/media/rkisp1

and uses the Media-Controller API.



Revisions

=========



There exist multiple smaller revisions to this ISP that got introduced in

later SoCs. Revisions can be found in the enum :c:type:`rkisp1_cif_isp_version`

in the UAPI and the revision of the ISP inside the running SoC can be read

in the field hw_revision of struct media_device_info as returned by

ioctl MEDIA_IOC_DEVICE_INFO.



Versions in use are:



- RKISP1_V10: used at least in rk3288 and rk3399

- RKISP1_V11: declared in the original vendor code, but not used

- RKISP1_V12: used at least in rk3326 and px30

- RKISP1_V13: used at least in rk1808



Topology

========

.. _rkisp1_topology_graph:

drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c

+12 −9
Original line number Diff line number Diff line
@@ -104,6 +104,7 @@ 
struct rkisp1_match_data {

	const char * const *clks;

	unsigned int size;

	enum rkisp1_cif_isp_version isp_ver;

};



/* ----------------------------------------------------------------------------
@@ -411,15 +412,16 @@ static const char * const rk3399_isp_clks[] = { 
	"hclk",

};



static const struct rkisp1_match_data rk3399_isp_clk_data = {

static const struct rkisp1_match_data rk3399_isp_match_data = {

	.clks = rk3399_isp_clks,

	.size = ARRAY_SIZE(rk3399_isp_clks),

	.isp_ver = RKISP1_V10,

};



static const struct of_device_id rkisp1_of_match[] = {

	{

		.compatible = "rockchip,rk3399-cif-isp",

		.data = &rk3399_isp_clk_data,

		.data = &rk3399_isp_match_data,

	},

	{},

};
@@ -457,15 +459,15 @@ static void rkisp1_debug_init(struct rkisp1_device *rkisp1) 


static int rkisp1_probe(struct platform_device *pdev)

{

	const struct rkisp1_match_data *clk_data;

	const struct rkisp1_match_data *match_data;

	struct device *dev = &pdev->dev;

	struct rkisp1_device *rkisp1;

	struct v4l2_device *v4l2_dev;

	unsigned int i;

	int ret, irq;



	clk_data = of_device_get_match_data(&pdev->dev);

	if (!clk_data)

	match_data = of_device_get_match_data(&pdev->dev);

	if (!match_data)

		return -ENODEV;



	rkisp1 = devm_kzalloc(dev, sizeof(*rkisp1), GFP_KERNEL);
@@ -494,15 +496,16 @@ static int rkisp1_probe(struct platform_device *pdev) 


	rkisp1->irq = irq;



	for (i = 0; i < clk_data->size; i++)

		rkisp1->clks[i].id = clk_data->clks[i];

	ret = devm_clk_bulk_get(dev, clk_data->size, rkisp1->clks);

	for (i = 0; i < match_data->size; i++)

		rkisp1->clks[i].id = match_data->clks[i];

	ret = devm_clk_bulk_get(dev, match_data->size, rkisp1->clks);

	if (ret)

		return ret;

	rkisp1->clk_size = clk_data->size;

	rkisp1->clk_size = match_data->size;



	pm_runtime_enable(&pdev->dev);



	rkisp1->media_dev.hw_revision = match_data->isp_ver;

	strscpy(rkisp1->media_dev.model, RKISP1_DRIVER_NAME,

		sizeof(rkisp1->media_dev.model));

	rkisp1->media_dev.dev = &pdev->dev;

drivers/media/platform/rockchip/rkisp1/rkisp1-params.c

+3 −2
Original line number Diff line number Diff line
@@ -391,7 +391,7 @@ static void rkisp1_goc_config(struct rkisp1_params *params, 
				RKISP1_CIF_ISP_CTRL_ISP_GAMMA_OUT_ENA);

	rkisp1_write(params->rkisp1, arg->mode, RKISP1_CIF_ISP_GAMMA_OUT_MODE);



	for (i = 0; i < RKISP1_CIF_ISP_GAMMA_OUT_MAX_SAMPLES; i++)

	for (i = 0; i < RKISP1_CIF_ISP_GAMMA_OUT_MAX_SAMPLES_V10; i++)

		rkisp1_write(params->rkisp1, arg->gamma_y[i],

			     RKISP1_CIF_ISP_GAMMA_OUT_Y_0 + i * 4);

}
@@ -589,7 +589,6 @@ static void rkisp1_hst_config(struct rkisp1_params *params, 
		RKISP1_CIF_ISP_HIST_WEIGHT_22TO03,

		RKISP1_CIF_ISP_HIST_WEIGHT_13TO43,

		RKISP1_CIF_ISP_HIST_WEIGHT_04TO34,

		RKISP1_CIF_ISP_HIST_WEIGHT_44,

	};

	const u8 *weight;

	unsigned int i;
@@ -622,6 +621,8 @@ static void rkisp1_hst_config(struct rkisp1_params *params, 
							    weight[2],

							    weight[3]),

				 hist_weight_regs[i]);



	rkisp1_write(params->rkisp1, weight[0] & 0x1F, RKISP1_CIF_ISP_HIST_WEIGHT_44);

}



static void

drivers/media/platform/rockchip/rkisp1/rkisp1-regs.h

+1 −0
Original line number Diff line number Diff line
@@ -365,6 +365,7 @@ 
#define RKISP1_CIF_ISP_MAX_HIST_PREDIVIDER		0x0000007F

#define RKISP1_CIF_ISP_HIST_ROW_NUM			5

#define RKISP1_CIF_ISP_HIST_COLUMN_NUM			5

#define RKISP1_CIF_ISP_HIST_GET_BIN(x)			((x) & 0x000FFFFF)



/* AUTO FOCUS MEASUREMENT:  ISP_AFM_CTRL */

#define RKISP1_ISP_AFM_CTRL_ENABLE			BIT(0)

drivers/media/platform/rockchip/rkisp1/rkisp1-stats.c

+6 −5
Original line number Diff line number Diff line
@@ -203,7 +203,7 @@ static void rkisp1_stats_get_aec_meas(struct rkisp1_stats *stats, 
	unsigned int i;



	pbuf->meas_type |= RKISP1_CIF_ISP_STAT_AUTOEXP;

	for (i = 0; i < RKISP1_CIF_ISP_AE_MEAN_MAX; i++)

	for (i = 0; i < RKISP1_CIF_ISP_AE_MEAN_MAX_V10; i++)

		pbuf->params.ae.exp_mean[i] =

			(u8)rkisp1_read(rkisp1,

					RKISP1_CIF_ISP_EXP_MEAN_00 + i * 4);
@@ -233,10 +233,11 @@ static void rkisp1_stats_get_hst_meas(struct rkisp1_stats *stats, 
	unsigned int i;



	pbuf->meas_type |= RKISP1_CIF_ISP_STAT_HIST;

	for (i = 0; i < RKISP1_CIF_ISP_HIST_BIN_N_MAX; i++)

		pbuf->params.hist.hist_bins[i] =

			(u8)rkisp1_read(rkisp1,

					RKISP1_CIF_ISP_HIST_BIN_0 + i * 4);

	for (i = 0; i < RKISP1_CIF_ISP_HIST_BIN_N_MAX_V10; i++) {

		u32 reg_val = rkisp1_read(rkisp1, RKISP1_CIF_ISP_HIST_BIN_0 + i * 4);



		pbuf->params.hist.hist_bins[i] = RKISP1_CIF_ISP_HIST_GET_BIN(reg_val);

	}

}



static void rkisp1_stats_get_bls_meas(struct rkisp1_stats *stats,