* [PATCH] patches: fix v4l2 patch
@ 2015-06-26 15:49 Florian Grandel
2015-06-28 18:05 ` Hauke Mehrtens
2015-07-01 14:06 ` [PATCH v2] " Florian Grandel
0 siblings, 2 replies; 6+ messages in thread
From: Florian Grandel @ 2015-06-26 15:49 UTC (permalink / raw)
To: Luis R. Rodriguez; +Cc: backports, Florian Grandel
Fix to support next-20160626.
Signed-off-by: Florian Grandel <fgrandel@gmail.com>
---
.../media/0005-dma-no-sync/v4l2.patch | 30 +++-------------------
1 file changed, 4 insertions(+), 26 deletions(-)
diff --git a/patches/collateral-evolutions/media/0005-dma-no-sync/v4l2.patch b/patches/collateral-evolutions/media/0005-dma-no-sync/v4l2.patch
index deeddd9..9b3329b 100644
--- a/patches/collateral-evolutions/media/0005-dma-no-sync/v4l2.patch
+++ b/patches/collateral-evolutions/media/0005-dma-no-sync/v4l2.patch
@@ -1,25 +1,3 @@
---- a/drivers/media/v4l2-core/videobuf2-dma-contig.c
-+++ b/drivers/media/v4l2-core/videobuf2-dma-contig.c
-@@ -570,7 +570,9 @@ static void vb2_dc_put_userptr(void *buf
- if (sgt) {
- DEFINE_DMA_ATTRS(attrs);
-
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0)
- dma_set_attr(DMA_ATTR_SKIP_CPU_SYNC, &attrs);
-+#endif
- /*
- * No need to sync to CPU, it's already synced to the CPU
- * since the finish() memop will have been called before this.
-@@ -637,7 +639,9 @@ static void *vb2_dc_get_userptr(void *al
- unsigned long dma_align = dma_get_cache_alignment();
- DEFINE_DMA_ATTRS(attrs);
-
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0)
- dma_set_attr(DMA_ATTR_SKIP_CPU_SYNC, &attrs);
-+#endif
-
- /* Only cache aligned DMA transfers are reliable */
- if (!IS_ALIGNED(vaddr | size, dma_align)) {
--- a/drivers/media/v4l2-core/videobuf2-dma-sg.c
+++ b/drivers/media/v4l2-core/videobuf2-dma-sg.c
@@ -109,7 +109,9 @@ static void *vb2_dma_sg_alloc(void *allo
@@ -42,17 +20,17 @@
dprintk(1, "%s: Freeing buffer of %d pages\n", __func__,
buf->num_pages);
dma_unmap_sg_attrs(buf->dev, sgt->sgl, sgt->orig_nents,
-@@ -242,7 +246,9 @@ static void *vb2_dma_sg_get_userptr(void
- struct sg_table *sgt;
+@@ -235,7 +239,9 @@ static void *vb2_dma_sg_get_userptr(void
DEFINE_DMA_ATTRS(attrs);
+ struct frame_vector *vec;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0)
dma_set_attr(DMA_ATTR_SKIP_CPU_SYNC, &attrs);
+#endif
-
buf = kzalloc(sizeof *buf, GFP_KERNEL);
if (!buf)
-@@ -354,7 +360,9 @@ static void vb2_dma_sg_put_userptr(void
+ return NULL;
+@@ -292,7 +298,9 @@ static void vb2_dma_sg_put_userptr(void
int i = buf->num_pages;
DEFINE_DMA_ATTRS(attrs);
--
1.9.1
--
To unsubscribe from this list: send the line "unsubscribe backports" in
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] patches: fix v4l2 patch
2015-06-26 15:49 [PATCH] patches: fix v4l2 patch Florian Grandel
@ 2015-06-28 18:05 ` Hauke Mehrtens
2015-07-01 13:59 ` Florian Grandel
2015-07-01 14:06 ` [PATCH v2] " Florian Grandel
1 sibling, 1 reply; 6+ messages in thread
From: Hauke Mehrtens @ 2015-06-28 18:05 UTC (permalink / raw)
To: Florian Grandel, Luis R. Rodriguez; +Cc: backports
On 06/26/2015 05:49 PM, Florian Grandel wrote:
> Fix to support next-20160626.
>
> Signed-off-by: Florian Grandel <fgrandel@gmail.com>
> ---
> .../media/0005-dma-no-sync/v4l2.patch | 30 +++-------------------
> 1 file changed, 4 insertions(+), 26 deletions(-)
>
> diff --git a/patches/collateral-evolutions/media/0005-dma-no-sync/v4l2.patch b/patches/collateral-evolutions/media/0005-dma-no-sync/v4l2.patch
> index deeddd9..9b3329b 100644
> --- a/patches/collateral-evolutions/media/0005-dma-no-sync/v4l2.patch
> +++ b/patches/collateral-evolutions/media/0005-dma-no-sync/v4l2.patch
> @@ -1,25 +1,3 @@
> ---- a/drivers/media/v4l2-core/videobuf2-dma-contig.c
> -+++ b/drivers/media/v4l2-core/videobuf2-dma-contig.c
> -@@ -570,7 +570,9 @@ static void vb2_dc_put_userptr(void *buf
> - if (sgt) {
> - DEFINE_DMA_ATTRS(attrs);
> -
> -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0)
> - dma_set_attr(DMA_ATTR_SKIP_CPU_SYNC, &attrs);
> -+#endif
> - /*
> - * No need to sync to CPU, it's already synced to the CPU
> - * since the finish() memop will have been called before this.
> -@@ -637,7 +639,9 @@ static void *vb2_dc_get_userptr(void *al
> - unsigned long dma_align = dma_get_cache_alignment();
> - DEFINE_DMA_ATTRS(attrs);
> -
> -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0)
> - dma_set_attr(DMA_ATTR_SKIP_CPU_SYNC, &attrs);
> -+#endif
> -
> - /* Only cache aligned DMA transfers are reliable */
> - if (!IS_ALIGNED(vaddr | size, dma_align)) {
This part is still needed.
> --- a/drivers/media/v4l2-core/videobuf2-dma-sg.c
> +++ b/drivers/media/v4l2-core/videobuf2-dma-sg.c
> @@ -109,7 +109,9 @@ static void *vb2_dma_sg_alloc(void *allo
> @@ -42,17 +20,17 @@
> dprintk(1, "%s: Freeing buffer of %d pages\n", __func__,
> buf->num_pages);
> dma_unmap_sg_attrs(buf->dev, sgt->sgl, sgt->orig_nents,
> -@@ -242,7 +246,9 @@ static void *vb2_dma_sg_get_userptr(void
> - struct sg_table *sgt;
> +@@ -235,7 +239,9 @@ static void *vb2_dma_sg_get_userptr(void
> DEFINE_DMA_ATTRS(attrs);
> + struct frame_vector *vec;
>
> +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0)
> dma_set_attr(DMA_ATTR_SKIP_CPU_SYNC, &attrs);
> +#endif
> -
> buf = kzalloc(sizeof *buf, GFP_KERNEL);
> if (!buf)
> -@@ -354,7 +360,9 @@ static void vb2_dma_sg_put_userptr(void
> + return NULL;
> +@@ -292,7 +298,9 @@ static void vb2_dma_sg_put_userptr(void
> int i = buf->num_pages;
> DEFINE_DMA_ATTRS(attrs);
>
>
--
To unsubscribe from this list: send the line "unsubscribe backports" in
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] patches: fix v4l2 patch
2015-06-28 18:05 ` Hauke Mehrtens
@ 2015-07-01 13:59 ` Florian Grandel
0 siblings, 0 replies; 6+ messages in thread
From: Florian Grandel @ 2015-07-01 13:59 UTC (permalink / raw)
To: Hauke Mehrtens, Luis R. Rodriguez; +Cc: backports
On 06/28/2015 08:05 PM, Hauke Mehrtens wrote:
> On 06/26/2015 05:49 PM, Florian Grandel wrote:
>> Fix to support next-20160626.
>>
>> Signed-off-by: Florian Grandel <fgrandel@gmail.com>
>> ---
>> .../media/0005-dma-no-sync/v4l2.patch | 30 +++-------------------
>> 1 file changed, 4 insertions(+), 26 deletions(-)
>>
>> diff --git a/patches/collateral-evolutions/media/0005-dma-no-sync/v4l2.patch b/patches/collateral-evolutions/media/0005-dma-no-sync/v4l2.patch
>> index deeddd9..9b3329b 100644
>> --- a/patches/collateral-evolutions/media/0005-dma-no-sync/v4l2.patch
>> +++ b/patches/collateral-evolutions/media/0005-dma-no-sync/v4l2.patch
>> @@ -1,25 +1,3 @@
>> ---- a/drivers/media/v4l2-core/videobuf2-dma-contig.c
>> -+++ b/drivers/media/v4l2-core/videobuf2-dma-contig.c
>> -@@ -570,7 +570,9 @@ static void vb2_dc_put_userptr(void *buf
>> - if (sgt) {
>> - DEFINE_DMA_ATTRS(attrs);
>> -
>> -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0)
>> - dma_set_attr(DMA_ATTR_SKIP_CPU_SYNC, &attrs);
>> -+#endif
>> - /*
>> - * No need to sync to CPU, it's already synced to the CPU
>> - * since the finish() memop will have been called before this.
>> -@@ -637,7 +639,9 @@ static void *vb2_dc_get_userptr(void *al
>> - unsigned long dma_align = dma_get_cache_alignment();
>> - DEFINE_DMA_ATTRS(attrs);
>> -
>> -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0)
>> - dma_set_attr(DMA_ATTR_SKIP_CPU_SYNC, &attrs);
>> -+#endif
>> -
>> - /* Only cache aligned DMA transfers are reliable */
>> - if (!IS_ALIGNED(vaddr | size, dma_align)) {
>
> This part is still needed.
Oups! You're right of course. Thanks for spotting this right away.
>> --- a/drivers/media/v4l2-core/videobuf2-dma-sg.c
>> +++ b/drivers/media/v4l2-core/videobuf2-dma-sg.c
>> @@ -109,7 +109,9 @@ static void *vb2_dma_sg_alloc(void *allo
>> @@ -42,17 +20,17 @@
>> dprintk(1, "%s: Freeing buffer of %d pages\n", __func__,
>> buf->num_pages);
>> dma_unmap_sg_attrs(buf->dev, sgt->sgl, sgt->orig_nents,
>> -@@ -242,7 +246,9 @@ static void *vb2_dma_sg_get_userptr(void
>> - struct sg_table *sgt;
>> +@@ -235,7 +239,9 @@ static void *vb2_dma_sg_get_userptr(void
>> DEFINE_DMA_ATTRS(attrs);
>> + struct frame_vector *vec;
>>
>> +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0)
>> dma_set_attr(DMA_ATTR_SKIP_CPU_SYNC, &attrs);
>> +#endif
>> -
>> buf = kzalloc(sizeof *buf, GFP_KERNEL);
>> if (!buf)
>> -@@ -354,7 +360,9 @@ static void vb2_dma_sg_put_userptr(void
>> + return NULL;
>> +@@ -292,7 +298,9 @@ static void vb2_dma_sg_put_userptr(void
>> int i = buf->num_pages;
>> DEFINE_DMA_ATTRS(attrs);
>>
>>
>
>
--
Florian Grandel
Softwareentwickler
Mühlener Straße 7
72160 Horb a.N.
Tel: +49 173 9748059
Skype: fgrandel
GTalk: fgrandel@gmail.com
--
To unsubscribe from this list: send the line "unsubscribe backports" in
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v2] patches: fix v4l2 patch
2015-06-26 15:49 [PATCH] patches: fix v4l2 patch Florian Grandel
2015-06-28 18:05 ` Hauke Mehrtens
@ 2015-07-01 14:06 ` Florian Grandel
2015-07-01 21:31 ` Hauke Mehrtens
1 sibling, 1 reply; 6+ messages in thread
From: Florian Grandel @ 2015-07-01 14:06 UTC (permalink / raw)
To: Luis R. Rodriguez; +Cc: backports, Florian Grandel
Fix to support next-20160626.
Signed-off-by: Florian Grandel <fgrandel@gmail.com>
---
.../media/0005-dma-no-sync/v4l2.patch.orig | 67 ++++++++++++++++++++++
1 file changed, 67 insertions(+)
create mode 100644 patches/collateral-evolutions/media/0005-dma-no-sync/v4l2.patch.orig
diff --git a/patches/collateral-evolutions/media/0005-dma-no-sync/v4l2.patch.orig b/patches/collateral-evolutions/media/0005-dma-no-sync/v4l2.patch.orig
new file mode 100644
index 0000000..7c99937
--- /dev/null
+++ b/patches/collateral-evolutions/media/0005-dma-no-sync/v4l2.patch.orig
@@ -0,0 +1,67 @@
+<<<<<<< HEAD
+--- a/drivers/media/v4l2-core/videobuf2-dma-contig.c
++++ b/drivers/media/v4l2-core/videobuf2-dma-contig.c
+@@ -470,7 +470,9 @@ static void vb2_dc_put_userptr(void *buf
+ if (sgt) {
+ DEFINE_DMA_ATTRS(attrs);
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0)
+ dma_set_attr(DMA_ATTR_SKIP_CPU_SYNC, &attrs);
++#endif
+ /*
+ * No need to sync to CPU, it's already synced to the CPU
+ * since the finish() memop will have been called before this.
+@@ -534,7 +536,9 @@ static void *vb2_dc_get_userptr(void *al
+ unsigned long dma_align = dma_get_cache_alignment();
+ DEFINE_DMA_ATTRS(attrs);
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0)
+ dma_set_attr(DMA_ATTR_SKIP_CPU_SYNC, &attrs);
++#endif
+
+ /* Only cache aligned DMA transfers are reliable */
+ if (!IS_ALIGNED(vaddr | size, dma_align)) {
+=======
+>>>>>>> patches: fix v4l2 patch
+--- a/drivers/media/v4l2-core/videobuf2-dma-sg.c
++++ b/drivers/media/v4l2-core/videobuf2-dma-sg.c
+@@ -109,7 +109,9 @@ static void *vb2_dma_sg_alloc(void *allo
+ int num_pages;
+ DEFINE_DMA_ATTRS(attrs);
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0)
+ dma_set_attr(DMA_ATTR_SKIP_CPU_SYNC, &attrs);
++#endif
+
+ if (WARN_ON(alloc_ctx == NULL))
+ return NULL;
+@@ -185,7 +187,9 @@ static void vb2_dma_sg_put(void *buf_pri
+ if (atomic_dec_and_test(&buf->refcount)) {
+ DEFINE_DMA_ATTRS(attrs);
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0)
+ dma_set_attr(DMA_ATTR_SKIP_CPU_SYNC, &attrs);
++#endif
+ dprintk(1, "%s: Freeing buffer of %d pages\n", __func__,
+ buf->num_pages);
+ dma_unmap_sg_attrs(buf->dev, sgt->sgl, sgt->orig_nents,
+@@ -235,7 +239,9 @@ static void *vb2_dma_sg_get_userptr(void
+ DEFINE_DMA_ATTRS(attrs);
+ struct frame_vector *vec;
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0)
+ dma_set_attr(DMA_ATTR_SKIP_CPU_SYNC, &attrs);
++#endif
+ buf = kzalloc(sizeof *buf, GFP_KERNEL);
+ if (!buf)
+ return NULL;
+@@ -292,7 +298,9 @@ static void vb2_dma_sg_put_userptr(void
+ int i = buf->num_pages;
+ DEFINE_DMA_ATTRS(attrs);
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0)
+ dma_set_attr(DMA_ATTR_SKIP_CPU_SYNC, &attrs);
++#endif
+
+ dprintk(1, "%s: Releasing userspace buffer of %d pages\n",
+ __func__, buf->num_pages);
--
1.9.1
--
To unsubscribe from this list: send the line "unsubscribe backports" in
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v2] patches: fix v4l2 patch
2015-07-01 14:06 ` [PATCH v2] " Florian Grandel
@ 2015-07-01 21:31 ` Hauke Mehrtens
2015-07-02 11:06 ` Florian Grandel
0 siblings, 1 reply; 6+ messages in thread
From: Hauke Mehrtens @ 2015-07-01 21:31 UTC (permalink / raw)
To: Florian Grandel, Luis R. Rodriguez; +Cc: backports
On 07/01/2015 04:06 PM, Florian Grandel wrote:
> Fix to support next-20160626.
>
> Signed-off-by: Florian Grandel <fgrandel@gmail.com>
> ---
> .../media/0005-dma-no-sync/v4l2.patch.orig | 67 ++++++++++++++++++++++
> 1 file changed, 67 insertions(+)
> create mode 100644 patches/collateral-evolutions/media/0005-dma-no-sync/v4l2.patch.orig
Why do you want to add a .orig file?
A similar fix is already in backports. It went into in this commit:
https://git.kernel.org/cgit/linux/kernel/git/backports/backports.git/commit/?id=c1a416852f24d166c51d8203703a1bddff1ad6f8
The current release based on kernel next-20160626 was compile tested
against all the last minor versions of kernel 3.0 to 4.1 on x86. There
could still be some problems with different kernel configurations or
with different architectures.
>
> diff --git a/patches/collateral-evolutions/media/0005-dma-no-sync/v4l2.patch.orig b/patches/collateral-evolutions/media/0005-dma-no-sync/v4l2.patch.orig
> new file mode 100644
> index 0000000..7c99937
> --- /dev/null
> +++ b/patches/collateral-evolutions/media/0005-dma-no-sync/v4l2.patch.orig
> @@ -0,0 +1,67 @@
> +<<<<<<< HEAD
> +--- a/drivers/media/v4l2-core/videobuf2-dma-contig.c
> ++++ b/drivers/media/v4l2-core/videobuf2-dma-contig.c
> +@@ -470,7 +470,9 @@ static void vb2_dc_put_userptr(void *buf
> + if (sgt) {
> + DEFINE_DMA_ATTRS(attrs);
> +
> ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0)
> + dma_set_attr(DMA_ATTR_SKIP_CPU_SYNC, &attrs);
> ++#endif
> + /*
> + * No need to sync to CPU, it's already synced to the CPU
> + * since the finish() memop will have been called before this.
> +@@ -534,7 +536,9 @@ static void *vb2_dc_get_userptr(void *al
> + unsigned long dma_align = dma_get_cache_alignment();
> + DEFINE_DMA_ATTRS(attrs);
> +
> ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0)
> + dma_set_attr(DMA_ATTR_SKIP_CPU_SYNC, &attrs);
> ++#endif
> +
> + /* Only cache aligned DMA transfers are reliable */
> + if (!IS_ALIGNED(vaddr | size, dma_align)) {
> +=======
> +>>>>>>> patches: fix v4l2 patch
It looks like you want to add a merge conflict here.
> +--- a/drivers/media/v4l2-core/videobuf2-dma-sg.c
> ++++ b/drivers/media/v4l2-core/videobuf2-dma-sg.c
> +@@ -109,7 +109,9 @@ static void *vb2_dma_sg_alloc(void *allo
> + int num_pages;
> + DEFINE_DMA_ATTRS(attrs);
> +
> ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0)
> + dma_set_attr(DMA_ATTR_SKIP_CPU_SYNC, &attrs);
> ++#endif
> +
> + if (WARN_ON(alloc_ctx == NULL))
> + return NULL;
> +@@ -185,7 +187,9 @@ static void vb2_dma_sg_put(void *buf_pri
> + if (atomic_dec_and_test(&buf->refcount)) {
> + DEFINE_DMA_ATTRS(attrs);
> +
> ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0)
> + dma_set_attr(DMA_ATTR_SKIP_CPU_SYNC, &attrs);
> ++#endif
> + dprintk(1, "%s: Freeing buffer of %d pages\n", __func__,
> + buf->num_pages);
> + dma_unmap_sg_attrs(buf->dev, sgt->sgl, sgt->orig_nents,
> +@@ -235,7 +239,9 @@ static void *vb2_dma_sg_get_userptr(void
> + DEFINE_DMA_ATTRS(attrs);
> + struct frame_vector *vec;
> +
> ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0)
> + dma_set_attr(DMA_ATTR_SKIP_CPU_SYNC, &attrs);
> ++#endif
> + buf = kzalloc(sizeof *buf, GFP_KERNEL);
> + if (!buf)
> + return NULL;
> +@@ -292,7 +298,9 @@ static void vb2_dma_sg_put_userptr(void
> + int i = buf->num_pages;
> + DEFINE_DMA_ATTRS(attrs);
> +
> ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0)
> + dma_set_attr(DMA_ATTR_SKIP_CPU_SYNC, &attrs);
> ++#endif
> +
> + dprintk(1, "%s: Releasing userspace buffer of %d pages\n",
> + __func__, buf->num_pages);
>
--
To unsubscribe from this list: send the line "unsubscribe backports" in
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2] patches: fix v4l2 patch
2015-07-01 21:31 ` Hauke Mehrtens
@ 2015-07-02 11:06 ` Florian Grandel
0 siblings, 0 replies; 6+ messages in thread
From: Florian Grandel @ 2015-07-02 11:06 UTC (permalink / raw)
To: Hauke Mehrtens, Luis R. Rodriguez; +Cc: backports
Hi Hauke,
I seem to have no luck with this patch. :-(
On 07/01/2015 11:31 PM, Hauke Mehrtens wrote:
> On 07/01/2015 04:06 PM, Florian Grandel wrote:
>> Fix to support next-20160626.
>>
>> Signed-off-by: Florian Grandel <fgrandel@gmail.com>
>> ---
>> .../media/0005-dma-no-sync/v4l2.patch.orig | 67 ++++++++++++++++++++++
>> 1 file changed, 67 insertions(+)
>> create mode 100644 patches/collateral-evolutions/media/0005-dma-no-sync/v4l2.patch.orig
>
> Why do you want to add a .orig file?
Of course the orig file slipped in inadvertently.
> A similar fix is already in backports. It went into in this commit:
> https://git.kernel.org/cgit/linux/kernel/git/backports/backports.git/commit/?id=c1a416852f24d166c51d8203703a1bddff1ad6f8
>
> The current release based on kernel next-20160626 was compile tested
> against all the last minor versions of kernel 3.0 to 4.1 on x86. There
> could still be some problems with different kernel configurations or
> with different architectures.
>
>>
>> diff --git a/patches/collateral-evolutions/media/0005-dma-no-sync/v4l2.patch.orig b/patches/collateral-evolutions/media/0005-dma-no-sync/v4l2.patch.orig
>> new file mode 100644
>> index 0000000..7c99937
>> --- /dev/null
>> +++ b/patches/collateral-evolutions/media/0005-dma-no-sync/v4l2.patch.orig
>> @@ -0,0 +1,67 @@
>> +<<<<<<< HEAD
>> +--- a/drivers/media/v4l2-core/videobuf2-dma-contig.c
>> ++++ b/drivers/media/v4l2-core/videobuf2-dma-contig.c
>> +@@ -470,7 +470,9 @@ static void vb2_dc_put_userptr(void *buf
>> + if (sgt) {
>> + DEFINE_DMA_ATTRS(attrs);
>> +
>> ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0)
>> + dma_set_attr(DMA_ATTR_SKIP_CPU_SYNC, &attrs);
>> ++#endif
>> + /*
>> + * No need to sync to CPU, it's already synced to the CPU
>> + * since the finish() memop will have been called before this.
>> +@@ -534,7 +536,9 @@ static void *vb2_dc_get_userptr(void *al
>> + unsigned long dma_align = dma_get_cache_alignment();
>> + DEFINE_DMA_ATTRS(attrs);
>> +
>> ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0)
>> + dma_set_attr(DMA_ATTR_SKIP_CPU_SYNC, &attrs);
>> ++#endif
>> +
>> + /* Only cache aligned DMA transfers are reliable */
>> + if (!IS_ALIGNED(vaddr | size, dma_align)) {
>> +=======
>> +>>>>>>> patches: fix v4l2 patch
>
> It looks like you want to add a merge conflict here.
Yep. I was probably asleep already when I prepared that commit.
>> +--- a/drivers/media/v4l2-core/videobuf2-dma-sg.c
>> ++++ b/drivers/media/v4l2-core/videobuf2-dma-sg.c
>> +@@ -109,7 +109,9 @@ static void *vb2_dma_sg_alloc(void *allo
>> + int num_pages;
>> + DEFINE_DMA_ATTRS(attrs);
>> +
>> ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0)
>> + dma_set_attr(DMA_ATTR_SKIP_CPU_SYNC, &attrs);
>> ++#endif
>> +
>> + if (WARN_ON(alloc_ctx == NULL))
>> + return NULL;
>> +@@ -185,7 +187,9 @@ static void vb2_dma_sg_put(void *buf_pri
>> + if (atomic_dec_and_test(&buf->refcount)) {
>> + DEFINE_DMA_ATTRS(attrs);
>> +
>> ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0)
>> + dma_set_attr(DMA_ATTR_SKIP_CPU_SYNC, &attrs);
>> ++#endif
>> + dprintk(1, "%s: Freeing buffer of %d pages\n", __func__,
>> + buf->num_pages);
>> + dma_unmap_sg_attrs(buf->dev, sgt->sgl, sgt->orig_nents,
>> +@@ -235,7 +239,9 @@ static void *vb2_dma_sg_get_userptr(void
>> + DEFINE_DMA_ATTRS(attrs);
>> + struct frame_vector *vec;
>> +
>> ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0)
>> + dma_set_attr(DMA_ATTR_SKIP_CPU_SYNC, &attrs);
>> ++#endif
>> + buf = kzalloc(sizeof *buf, GFP_KERNEL);
>> + if (!buf)
>> + return NULL;
>> +@@ -292,7 +298,9 @@ static void vb2_dma_sg_put_userptr(void
>> + int i = buf->num_pages;
>> + DEFINE_DMA_ATTRS(attrs);
>> +
>> ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0)
>> + dma_set_attr(DMA_ATTR_SKIP_CPU_SYNC, &attrs);
>> ++#endif
>> +
>> + dprintk(1, "%s: Releasing userspace buffer of %d pages\n",
>> + __func__, buf->num_pages);
>>
As you say: this has already been fixed elsewhere and the artifact you
got here is nonsense. :-D
Please forget about the patch. I'm really sorry for the noise.
Florian
--
To unsubscribe from this list: send the line "unsubscribe backports" in
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2015-07-02 11:06 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-06-26 15:49 [PATCH] patches: fix v4l2 patch Florian Grandel
2015-06-28 18:05 ` Hauke Mehrtens
2015-07-01 13:59 ` Florian Grandel
2015-07-01 14:06 ` [PATCH v2] " Florian Grandel
2015-07-01 21:31 ` Hauke Mehrtens
2015-07-02 11:06 ` Florian Grandel
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.