ich777/media_build
1
0
Fork 0
mirror of https://github.com/tbsdtv/media_build.git synced 2025-07-23 04:13:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update backport patches for <5.0

Browse Source
This commit is contained in:
CrazyCat
2023-04-29 00:38:43 +03:00
parent aecd126b7e
commit 5fe43495f8
1 changed files with 44 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
backports/v5.0_saa7146.patch Normal file
View File

@@ -0,0 +1,44 @@
diff --git a/drivers/media/common/saa7146/saa7146_core.c b/drivers/media/common/saa7146/saa7146_core.c
index bcb957883044..793c5b5f3b24 100644
--- a/drivers/media/common/saa7146/saa7146_core.c
+++ b/drivers/media/common/saa7146/saa7146_core.c
@@ -237,7 +237,7 @@ int saa7146_pgtable_alloc(struct pci_dev *pci, struct saa7146_pgtable *pt)
int saa7146_pgtable_build_single(struct pci_dev *pci, struct saa7146_pgtable *pt,
struct scatterlist *list, int sglen)
{
- struct sg_dma_page_iter dma_iter;
+ struct sg_page_iter dma_iter;
__le32 *ptr, fill;
int nr_pages = 0;
int i;
@@ -251,7 +251,7 @@ int saa7146_pgtable_build_single(struct pci_dev *pci, struct saa7146_pgtable *pt
pt->offset = list->offset;
ptr = pt->cpu;
- for_each_sg_dma_page(list, &dma_iter, sglen, 0) {
+ for_each_sg_page(list, &dma_iter, sglen, 0) {
*ptr++ = cpu_to_le32(sg_page_iter_dma_address(&dma_iter));
nr_pages++;
}
diff --git a/drivers/media/common/saa7146/saa7146_video.c b/drivers/media/common/saa7146/saa7146_video.c
index 040489e15ea0..b409e1a0cae1 100644
--- a/drivers/media/common/saa7146/saa7146_video.c
+++ b/drivers/media/common/saa7146/saa7146_video.c
@@ -99,7 +99,7 @@ static int saa7146_pgtable_build(struct saa7146_dev *dev, struct saa7146_buf *bu
struct saa7146_pgtable *pt1 = &buf->pt[0];
struct saa7146_pgtable *pt2 = &buf->pt[1];
struct saa7146_pgtable *pt3 = &buf->pt[2];
- struct sg_dma_page_iter dma_iter;
+ struct sg_page_iter dma_iter;
__le32 *ptr1, *ptr2, *ptr3;
__le32 fill;
@@ -138,7 +138,7 @@ static int saa7146_pgtable_build(struct saa7146_dev *dev, struct saa7146_buf *bu
ptr2 = pt2->cpu;
ptr3 = pt3->cpu;
- for_each_sg_dma_page(list, &dma_iter, length, 0)
+ for_each_sg_page(list, &dma_iter, length, 0)
*ptr1++ = cpu_to_le32(sg_page_iter_dma_address(&dma_iter) - list->offset);
/* if we have a user buffer, the first page may not be