redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

MLK-16536-1 video: fbdev: dcss: use kfifo 'out' to be next read offset

Browse source 
The kfifo 'out' points to the first byte of data to be
consumed next time. So use it to get the data offset to
be accessed by CTXLD and remove unused field 'fifo_in'
from 'struct ctxld_commit'.

Signed-off-by: Fancy Fang <chen.fang@nxp.com>
Reviewed-by: Robby Cai <robby.cai@nxp.com>
This commit is contained in:
Fancy Fang 2017-09-19 18:34:10 +08:00 committed by Jason Liu
parent cfffa52a71
commit e569f36704
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
drivers/video/fbdev/mxc/imx_dcss.c
View file

@ -253,7 +253,6 @@ struct ctxld_commit {
struct list_head list;
struct work_struct work;
void *data;
uint32_t fifo_in; /* kfifo's 'in' value */
uint32_t sb_data_len;
uint32_t sb_hp_data_len;
uint32_t db_data_len;
@ -2221,7 +2220,7 @@ static void dtg_irq_clear(unsigned long hwirq,
static void dcss_ctxld_config(struct work_struct *work)
{
int ret;
uint32_t dsb_len, nsgl, esize;
uint32_t dsb_len, nsgl, esize, offset;
struct dcss_info *info;
struct platform_device *pdev;
struct dcss_channels *chans;
@ -2246,10 +2245,12 @@ static void dcss_ctxld_config(struct work_struct *work)
BUG_ON(1);
}
offset = cfifo->fifo.kfifo.out & cfifo->fifo.kfifo.mask;
/* configure sb buffer */
if (cc->sb_data_len) {
/* cfifo first store sb and than store db */
writel(cfifo->dma_handle + cc->fifo_in * kfifo_esize(&cfifo->fifo),
writel(cfifo->dma_handle + offset * kfifo_esize(&cfifo->fifo),
info->base + chans->ctxld_addr + CTXLD_SB_BASE_ADDR);
writel(cc->sb_hp_data_len |
((cc->sb_data_len - cc->sb_hp_data_len) << 16),
@ -2259,7 +2260,7 @@ static void dcss_ctxld_config(struct work_struct *work)
/* configure db buffer */
if (cc->db_data_len) {
writel(cfifo->dma_handle +
(cc->fifo_in + cc->sb_data_len) *
(offset + cc->sb_data_len) *
kfifo_esize(&cfifo->fifo),
info->base + chans->ctxld_addr + CTXLD_DB_BASE_ADDR);
writel(cc->db_data_len,
@ -2342,8 +2343,6 @@ restart:
unit = (struct ctxld_unit *)cb->sb_addr;
cc->fifo_in = cfifo->fifo.kfifo.in & cfifo->fifo.kfifo.mask;
if (cb->sb_data_len) {
count = kfifo_in(&cfifo->fifo, cb->sb_addr, cb->sb_data_len);
if (count != cb->sb_data_len) {