Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 70f66ea2 authored by Sylwester Nawrocki's avatar Sylwester Nawrocki Committed by Mauro Carvalho Chehab
Browse files

[media] s5p-fimc: Move scaler details handling to the register API file 



Signed-off-by: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent b241c6d6

drivers/media/video/s5p-fimc/fimc-capture.c

+1 −5
Original line number Original line Diff line number Diff line
@@ -237,7 +237,6 @@ static int start_streaming(struct vb2_queue *q) 
	struct fimc_ctx *ctx = q->drv_priv;

	struct fimc_ctx *ctx = q->drv_priv;

	struct fimc_dev *fimc = ctx->fimc_dev;

	struct fimc_dev *fimc = ctx->fimc_dev;

	struct s5p_fimc_isp_info *isp_info;

	struct s5p_fimc_isp_info *isp_info;

	struct samsung_fimc_variant *variant = ctx->fimc_dev->variant;

	int ret;

	int ret;





	ret = v4l2_subdev_call(fimc->vid_cap.sd, video, s_stream, 1);

	ret = v4l2_subdev_call(fimc->vid_cap.sd, video, s_stream, 1);
@@ -261,9 +260,6 @@ static int start_streaming(struct vb2_queue *q) 
		}

		}

		fimc_hw_set_input_path(ctx);

		fimc_hw_set_input_path(ctx);

		fimc_hw_set_prescaler(ctx);

		fimc_hw_set_prescaler(ctx);

		if (variant->has_mainscaler_ext)

			fimc_hw_set_mainscaler_ext(ctx);

		else

		fimc_hw_set_mainscaler(ctx);

		fimc_hw_set_mainscaler(ctx);

		fimc_hw_set_target_format(ctx);

		fimc_hw_set_target_format(ctx);

		fimc_hw_set_rotation(ctx);

		fimc_hw_set_rotation(ctx);

drivers/media/video/s5p-fimc/fimc-core.c

+1 −5
Original line number Original line Diff line number Diff line
@@ -578,7 +578,6 @@ static void fimc_dma_run(void *priv) 
{

{

	struct fimc_ctx *ctx = priv;

	struct fimc_ctx *ctx = priv;

	struct fimc_dev *fimc;

	struct fimc_dev *fimc;

	struct samsung_fimc_variant *variant = ctx->fimc_dev->variant;

	unsigned long flags;

	unsigned long flags;

	u32 ret;

	u32 ret;
@@ -613,9 +612,6 @@ static void fimc_dma_run(void *priv) 
		}

		}





		fimc_hw_set_prescaler(ctx);

		fimc_hw_set_prescaler(ctx);

		if (variant->has_mainscaler_ext)

			fimc_hw_set_mainscaler_ext(ctx);

		else

		fimc_hw_set_mainscaler(ctx);

		fimc_hw_set_mainscaler(ctx);

		fimc_hw_set_target_format(ctx);

		fimc_hw_set_target_format(ctx);

		fimc_hw_set_rotation(ctx);

		fimc_hw_set_rotation(ctx);

drivers/media/video/s5p-fimc/fimc-core.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -574,7 +574,6 @@ void fimc_hw_en_lastirq(struct fimc_dev *fimc, int enable); 
void fimc_hw_en_irq(struct fimc_dev *fimc, int enable);

void fimc_hw_en_irq(struct fimc_dev *fimc, int enable);

void fimc_hw_set_prescaler(struct fimc_ctx *ctx);

void fimc_hw_set_prescaler(struct fimc_ctx *ctx);

void fimc_hw_set_mainscaler(struct fimc_ctx *ctx);

void fimc_hw_set_mainscaler(struct fimc_ctx *ctx);

void fimc_hw_set_mainscaler_ext(struct fimc_ctx *ctx);

void fimc_hw_en_capture(struct fimc_ctx *ctx);

void fimc_hw_en_capture(struct fimc_ctx *ctx);

void fimc_hw_set_effect(struct fimc_ctx *ctx);

void fimc_hw_set_effect(struct fimc_ctx *ctx);

void fimc_hw_set_in_dma(struct fimc_ctx *ctx);

void fimc_hw_set_in_dma(struct fimc_ctx *ctx);

drivers/media/video/s5p-fimc/fimc-reg.c

+18 −31
Original line number Original line Diff line number Diff line
@@ -314,6 +314,7 @@ static void fimc_hw_set_scaler(struct fimc_ctx *ctx) 
void fimc_hw_set_mainscaler(struct fimc_ctx *ctx)

void fimc_hw_set_mainscaler(struct fimc_ctx *ctx)

{

{

	struct fimc_dev *dev = ctx->fimc_dev;

	struct fimc_dev *dev = ctx->fimc_dev;

	struct samsung_fimc_variant *variant = dev->variant;

	struct fimc_scaler *sc = &ctx->scaler;

	struct fimc_scaler *sc = &ctx->scaler;

	u32 cfg;

	u32 cfg;
@@ -323,40 +324,26 @@ void fimc_hw_set_mainscaler(struct fimc_ctx *ctx) 
	fimc_hw_set_scaler(ctx);

	fimc_hw_set_scaler(ctx);





	cfg = readl(dev->regs + S5P_CISCCTRL);

	cfg = readl(dev->regs + S5P_CISCCTRL);

	cfg &= ~S5P_CISCCTRL_MHRATIO_MASK;

	cfg &= ~S5P_CISCCTRL_MVRATIO_MASK;

	cfg |= S5P_CISCCTRL_MHRATIO(sc->main_hratio);

	cfg |= S5P_CISCCTRL_MVRATIO(sc->main_vratio);



	writel(cfg, dev->regs + S5P_CISCCTRL);

}





void fimc_hw_set_mainscaler_ext(struct fimc_ctx *ctx)

	if (variant->has_mainscaler_ext) {

{

		cfg &= ~(S5P_CISCCTRL_MHRATIO_MASK | S5P_CISCCTRL_MVRATIO_MASK);

	struct fimc_dev *dev = ctx->fimc_dev;

	struct fimc_scaler *sc = &ctx->scaler;

	u32 cfg, cfg_ext;



	dbg("main_hratio= 0x%X  main_vratio= 0x%X",

		sc->main_hratio, sc->main_vratio);



	fimc_hw_set_scaler(ctx);



	cfg = readl(dev->regs + S5P_CISCCTRL);

	cfg &= ~S5P_CISCCTRL_MHRATIO_MASK;

	cfg &= ~S5P_CISCCTRL_MVRATIO_MASK;

		cfg |= S5P_CISCCTRL_MHRATIO_EXT(sc->main_hratio);

		cfg |= S5P_CISCCTRL_MHRATIO_EXT(sc->main_hratio);

		cfg |= S5P_CISCCTRL_MVRATIO_EXT(sc->main_vratio);

		cfg |= S5P_CISCCTRL_MVRATIO_EXT(sc->main_vratio);



		writel(cfg, dev->regs + S5P_CISCCTRL);

		writel(cfg, dev->regs + S5P_CISCCTRL);





	cfg_ext = readl(dev->regs + S5P_CIEXTEN);

		cfg = readl(dev->regs + S5P_CIEXTEN);

	cfg_ext &= ~S5P_CIEXTEN_MHRATIO_EXT_MASK;

	cfg_ext &= ~S5P_CIEXTEN_MVRATIO_EXT_MASK;

	cfg_ext |= S5P_CIEXTEN_MHRATIO_EXT(sc->main_hratio);

	cfg_ext |= S5P_CIEXTEN_MVRATIO_EXT(sc->main_vratio);





	writel(cfg_ext, dev->regs + S5P_CIEXTEN);

		cfg &= ~(S5P_CIEXTEN_MVRATIO_EXT_MASK |

			 S5P_CIEXTEN_MHRATIO_EXT_MASK);

		cfg |= S5P_CIEXTEN_MHRATIO_EXT(sc->main_hratio);

		cfg |= S5P_CIEXTEN_MVRATIO_EXT(sc->main_vratio);

		writel(cfg, dev->regs + S5P_CIEXTEN);

	} else {

		cfg &= ~(S5P_CISCCTRL_MHRATIO_MASK | S5P_CISCCTRL_MVRATIO_MASK);

		cfg |= S5P_CISCCTRL_MHRATIO(sc->main_hratio);

		cfg |= S5P_CISCCTRL_MVRATIO(sc->main_vratio);

		writel(cfg, dev->regs + S5P_CISCCTRL);

	}

}

}





void fimc_hw_en_capture(struct fimc_ctx *ctx)

void fimc_hw_en_capture(struct fimc_ctx *ctx)