diff options
| author | Philippe Langlais <philippe.langlais@linaro.org> | 2011-05-11 14:17:18 +0200 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@stericsson.com> | 2011-09-19 15:15:15 +0200 |
| commit | 33b8d4dc78fae2d2b48f0a60d3901baef687ec06 (patch) | |
| tree | 7986bf61a9e3d7cdbe86c537bd4b73259e4dc8a4 /drivers/video/mcde | |
| parent | a15e7eb24cc6b014d311207105e86ce368786228 (diff) | |
video: mcde: Change color convert offset fields
This patch changes the order of the color convert offset in such a way
that they make more sense when setting up the color convert for a
specific platform. Now the offsets are in line with the order in the
multiplication matrix.
ST-Ericsson ID: 338207
ST-Ericsson Linux next: Not tested, ER 282779
ST-Ericsson FOSS-OUT ID: Trivial
Change-Id: Ia39ca4ac52e5c21ff32739de207f0445aaf0e25c
Signed-off-by: Marcel Tunnissen <Marcel.Tuennissen@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/22274
Tested-by: Marcel TUNNISSEN <marcel.tuennissen@stericsson.com>
Reviewed-by: QATEST
Reviewed-by: Linus WALLEIJ <linus.walleij@stericsson.com>
Conflicts:
arch/arm/mach-ux500/board-pdp-mcde.c
Diffstat (limited to 'drivers/video/mcde')
| -rw-r--r-- | drivers/video/mcde/mcde_hw.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/video/mcde/mcde_hw.c b/drivers/video/mcde/mcde_hw.c index 9844dc1b2f7..2bfd0c1f6ef 100644 --- a/drivers/video/mcde/mcde_hw.c +++ b/drivers/video/mcde/mcde_hw.c @@ -207,9 +207,9 @@ struct col_regs { u16 cr_red; u16 cr_green; u16 cr_blue; - u16 off_red; - u16 off_green; - u16 off_blue; + u16 off_y; + u16 off_cb; + u16 off_cr; }; struct tv_regs { @@ -733,10 +733,10 @@ static void update_col_registers(enum mcde_chnl chnl_id, struct col_regs *regs) MCDE_RGBCONV4A_CB_GREEN(regs->cb_green)); mcde_wreg(MCDE_RGBCONV5A + idx * MCDE_RGBCONV5A_GROUPOFFSET, MCDE_RGBCONV5A_CB_BLUE(regs->cb_blue) | - MCDE_RGBCONV5A_OFF_RED(regs->off_red)); + MCDE_RGBCONV5A_OFF_RED(regs->off_cr)); mcde_wreg(MCDE_RGBCONV6A + idx * MCDE_RGBCONV6A_GROUPOFFSET, - MCDE_RGBCONV6A_OFF_GREEN(regs->off_green) | - MCDE_RGBCONV6A_OFF_BLUE(regs->off_blue)); + MCDE_RGBCONV6A_OFF_GREEN(regs->off_y) | + MCDE_RGBCONV6A_OFF_BLUE(regs->off_cb)); } /* MCDE internal helpers */ @@ -2519,9 +2519,9 @@ void mcde_chnl_set_col_convert(struct mcde_chnl_state *chnl, chnl->col_regs.cr_red = col_convert->matrix[2][0]; chnl->col_regs.cr_green = col_convert->matrix[2][1]; chnl->col_regs.cr_blue = col_convert->matrix[2][2]; - chnl->col_regs.off_red = col_convert->offset[0]; - chnl->col_regs.off_green = col_convert->offset[1]; - chnl->col_regs.off_blue = col_convert->offset[2]; + chnl->col_regs.off_y = col_convert->offset[0]; + chnl->col_regs.off_cb = col_convert->offset[1]; + chnl->col_regs.off_cr = col_convert->offset[2]; dev_vdbg(&mcde_dev->dev, "%s exit\n", __func__); } |