| Message ID | 015ad590-979a-4815-b60a-7506c70e9ee7@xs4all.nl (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [for,v6.6] media: bt8xx: bttv_risc_packed(): remove field checks | expand |
On 11 September 2023 at 12:05 pm, Hans Verkuil wrote: > Do not turn on the vcr_hack based on the btv->field value. > > This was a change in the bttv vb2 conversion that caused > green lines at the bottom of the picture in tvtime. > > It was originally added to the vb2 conversion based on > faulty information that without this there would be glitches > in the video. However, later tests suggest that this is a > problem in the utilities used to test this since tvtime > behaves fine. > > This patch reverts the bttv driver to the original pre-vb2 > behavior w.r.t. vcr_hack. > > Fixes: b7ec3212a73a ("media: bttv: convert to vb2") > Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> > --- > drivers/media/pci/bt8xx/bttv-risc.c | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/drivers/media/pci/bt8xx/bttv-risc.c b/drivers/media/pci/bt8xx/bttv-risc.c > index 436baf6c8b08..241a696e374a 100644 > --- a/drivers/media/pci/bt8xx/bttv-risc.c > +++ b/drivers/media/pci/bt8xx/bttv-risc.c > @@ -68,9 +68,7 @@ bttv_risc_packed(struct bttv *btv, struct btcx_riscmem *risc, > sg = sglist; > for (line = 0; line < store_lines; line++) { > if ((line >= (store_lines - VCR_HACK_LINES)) && > - (btv->opt_vcr_hack || > - (V4L2_FIELD_HAS_BOTH(btv->field) || > - btv->field == V4L2_FIELD_ALTERNATE))) > + btv->opt_vcr_hack) > continue; > while (offset && offset >= sg_dma_len(sg)) { > offset -= sg_dma_len(sg); It works! Thank you! Tested-by: Christian Zigotzky <chzigotzky@xenosoft.de>
diff --git a/drivers/media/pci/bt8xx/bttv-risc.c b/drivers/media/pci/bt8xx/bttv-risc.c index 436baf6c8b08..241a696e374a 100644 --- a/drivers/media/pci/bt8xx/bttv-risc.c +++ b/drivers/media/pci/bt8xx/bttv-risc.c @@ -68,9 +68,7 @@ bttv_risc_packed(struct bttv *btv, struct btcx_riscmem *risc, sg = sglist; for (line = 0; line < store_lines; line++) { if ((line >= (store_lines - VCR_HACK_LINES)) && - (btv->opt_vcr_hack || - (V4L2_FIELD_HAS_BOTH(btv->field) || - btv->field == V4L2_FIELD_ALTERNATE))) + btv->opt_vcr_hack) continue; while (offset && offset >= sg_dma_len(sg)) { offset -= sg_dma_len(sg);
Do not turn on the vcr_hack based on the btv->field value. This was a change in the bttv vb2 conversion that caused green lines at the bottom of the picture in tvtime. It was originally added to the vb2 conversion based on faulty information that without this there would be glitches in the video. However, later tests suggest that this is a problem in the utilities used to test this since tvtime behaves fine. This patch reverts the bttv driver to the original pre-vb2 behavior w.r.t. vcr_hack. Fixes: b7ec3212a73a ("media: bttv: convert to vb2") Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> --- drivers/media/pci/bt8xx/bttv-risc.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)