Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-24 05:02:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

media: bttv: remove tvnorm field from bttv_buffer

Browse Source 
Instead of storing the tvnorm in each bttv buffer separately, just use the
global bttv tvnorm because the tvnorm does not change per buffer.

Signed-off-by: Deborah Brouwer <deborah.brouwer@collabora.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
This commit is contained in:
Deborah Brouwer 2023-07-14 19:16:04 -07:00 committed by Mauro Carvalho Chehab
parent 9764252d4b
commit 87df33be05
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/media/pci/bt8xx/bttv-driver.c
View File

@ -1553,7 +1553,7 @@ static int bttv_prepare_buffer(struct videobuf_queue *q,struct bttv *btv,
/* alloc + fill struct bttv_buffer (if changed) */
if (buf->vb.width != width || buf->vb.height != height ||
buf->vb.field != field ||
buf->tvnorm != norm || btv->fmt != fmt ||
btv->tvnorm != norm || btv->fmt != fmt ||
buf->crop.top != c.rect.top ||
buf->crop.left != c.rect.left ||
buf->crop.width != c.rect.width ||
@ -1561,7 +1561,7 @@ static int bttv_prepare_buffer(struct videobuf_queue *q,struct bttv *btv,
buf->vb.width = width;
buf->vb.height = height;
buf->vb.field = field;
buf->tvnorm = norm;
btv->tvnorm = norm;
buf->crop = c.rect;
redo_dma_risc = 1;
}

2
drivers/media/pci/bt8xx/bttv-risc.c
View File

@ -606,7 +606,7 @@ bttv_buffer_activate_video(struct bttv *btv,
int
bttv_buffer_risc(struct bttv *btv, struct bttv_buffer *buf)
{
const struct bttv_tvnorm *tvnorm = bttv_tvnorms + buf->tvnorm;
const struct bttv_tvnorm *tvnorm = bttv_tvnorms + btv->tvnorm;
struct videobuf_dmabuf *dma=videobuf_to_dma(&buf->vb);
dprintk("%d: buffer field: %s format: 0x%08x size: %dx%d\n",

1
drivers/media/pci/bt8xx/bttvp.h
View File

@ -145,7 +145,6 @@ struct bttv_buffer {
struct videobuf_buffer vb;
/* bttv specific */
unsigned int tvnorm;
int btformat;
int btswap;
struct bttv_geometry geo;