Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 241779
b: refs/heads/master
c: 70f66ea
h: refs/heads/master
i:
  241777: d09b3de
  241775: c3118f2
v: v3
  • Loading branch information
Sylwester Nawrocki authored and Mauro Carvalho Chehab committed Mar 21, 2011
1 parent 5b3644e commit 1cd7fbb
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 43 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b241c6d6f4ceddddfd8097c702dcfdd6b38fbe18
refs/heads/master: 70f66ea2aafbd9022a5dcdfd823538e540873585
6 changes: 1 addition & 5 deletions trunk/drivers/media/video/s5p-fimc/fimc-capture.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,6 @@ static int start_streaming(struct vb2_queue *q)
struct fimc_ctx *ctx = q->drv_priv;
struct fimc_dev *fimc = ctx->fimc_dev;
struct s5p_fimc_isp_info *isp_info;
struct samsung_fimc_variant *variant = ctx->fimc_dev->variant;
int ret;

ret = v4l2_subdev_call(fimc->vid_cap.sd, video, s_stream, 1);
Expand All @@ -261,10 +260,7 @@ static int start_streaming(struct vb2_queue *q)
}
fimc_hw_set_input_path(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_rotation(ctx);
fimc_hw_set_effect(ctx);
Expand Down
6 changes: 1 addition & 5 deletions trunk/drivers/media/video/s5p-fimc/fimc-core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -578,7 +578,6 @@ static void fimc_dma_run(void *priv)
{
struct fimc_ctx *ctx = priv;
struct fimc_dev *fimc;
struct samsung_fimc_variant *variant = ctx->fimc_dev->variant;
unsigned long flags;
u32 ret;

Expand Down Expand Up @@ -613,10 +612,7 @@ static void fimc_dma_run(void *priv)
}

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_rotation(ctx);
fimc_hw_set_effect(ctx);
Expand Down
1 change: 0 additions & 1 deletion trunk/drivers/media/video/s5p-fimc/fimc-core.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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_set_prescaler(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_set_effect(struct fimc_ctx *ctx);
void fimc_hw_set_in_dma(struct fimc_ctx *ctx);
Expand Down
49 changes: 18 additions & 31 deletions trunk/drivers/media/video/s5p-fimc/fimc-reg.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -314,6 +314,7 @@ static void fimc_hw_set_scaler(struct fimc_ctx *ctx)
void fimc_hw_set_mainscaler(struct fimc_ctx *ctx)
{
struct fimc_dev *dev = ctx->fimc_dev;
struct samsung_fimc_variant *variant = dev->variant;
struct fimc_scaler *sc = &ctx->scaler;
u32 cfg;

Expand All @@ -323,40 +324,26 @@ void fimc_hw_set_mainscaler(struct fimc_ctx *ctx)
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(sc->main_hratio);
cfg |= S5P_CISCCTRL_MVRATIO(sc->main_vratio);

writel(cfg, dev->regs + S5P_CISCCTRL);
}
if (variant->has_mainscaler_ext) {
cfg &= ~(S5P_CISCCTRL_MHRATIO_MASK | S5P_CISCCTRL_MVRATIO_MASK);
cfg |= S5P_CISCCTRL_MHRATIO_EXT(sc->main_hratio);
cfg |= S5P_CISCCTRL_MVRATIO_EXT(sc->main_vratio);
writel(cfg, dev->regs + S5P_CISCCTRL);

void fimc_hw_set_mainscaler_ext(struct fimc_ctx *ctx)
{
struct fimc_dev *dev = ctx->fimc_dev;
struct fimc_scaler *sc = &ctx->scaler;
u32 cfg, cfg_ext;
cfg = readl(dev->regs + S5P_CIEXTEN);

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_MVRATIO_EXT(sc->main_vratio);

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

cfg_ext = 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)
Expand Down

0 comments on commit 1cd7fbb

Please sign in to comment.