[PATCH] drm/radeon: Include swiotlb.h if SWIOTLB configured.

[PATCH] drm/radeon: Include swiotlb.h if SWIOTLB configured.

[Huacai Chen]

When SWIOTLB is configured, if without this patch kernel compilation
fails with such error messages:

drivers/gpu/drm/radeon/radeon_ttm.c: In function 'radeon_ttm_tt_populate':
drivers/gpu/drm/radeon/radeon_ttm.c:606:2: error: implicit declaration of function 'swiotlb_nr_tbl'
drivers/gpu/drm/radeon/radeon_ttm.c:607:3: warning: passing argument 2 of 'ttm_dma_populate' from incompatible pointer type
include/drm/ttm/ttm_page_alloc.h:81:12: note: expected 'struct device *' but argument is of type 'struct device *'
drivers/gpu/drm/radeon/radeon_ttm.c: In function 'radeon_ttm_tt_unpopulate':
drivers/gpu/drm/radeon/radeon_ttm.c:653:3: warning: passing argument 2 of 'ttm_dma_unpopulate' from incompatible pointer type
include/drm/ttm/ttm_page_alloc.h:82:13: note: expected 'struct device *' but argument is of type 'struct device *'

Signed-off-by: Huacai Chen <chenhc@lemote.com>
Signed-off-by: Hongliang Tao <taohl@lemote.com>
Signed-off-by: Hua Yan <yanh@lemote.com>
Cc: dri-devel@lists.freedesktop.org
---
 drivers/gpu/drm/radeon/radeon_ttm.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
index 5b71c71..fc3ac22 100644
--- a/drivers/gpu/drm/radeon/radeon_ttm.c
+++ b/drivers/gpu/drm/radeon/radeon_ttm.c
@@ -41,6 +41,10 @@
 #include "radeon_reg.h"
 #include "radeon.h"
 
+#ifdef CONFIG_SWIOTLB
+#include <linux/swiotlb.h>
+#endif
+
 #define DRM_FILE_PAGE_OFFSET (0x100000000ULL >> PAGE_SHIFT)
 
 static int radeon_ttm_debugfs_init(struct radeon_device *rdev);
-- 
1.7.7.3

Re: [PATCH] drm/radeon: Include swiotlb.h if SWIOTLB configured.

[Konrad Rzeszutek Wilk]

On Mon, Aug 13, 2012 at 05:26:03PM +0800, Huacai Chen wrote:
> When SWIOTLB is configured, if without this patch kernel compilation
> fails with such error messages:
> 
> drivers/gpu/drm/radeon/radeon_ttm.c: In function 'radeon_ttm_tt_populate':
> drivers/gpu/drm/radeon/radeon_ttm.c:606:2: error: implicit declaration of function 'swiotlb_nr_tbl'
> drivers/gpu/drm/radeon/radeon_ttm.c:607:3: warning: passing argument 2 of 'ttm_dma_populate' from incompatible pointer type
> include/drm/ttm/ttm_page_alloc.h:81:12: note: expected 'struct device *' but argument is of type 'struct device *'
> drivers/gpu/drm/radeon/radeon_ttm.c: In function 'radeon_ttm_tt_unpopulate':
> drivers/gpu/drm/radeon/radeon_ttm.c:653:3: warning: passing argument 2 of 'ttm_dma_unpopulate' from incompatible pointer type
> include/drm/ttm/ttm_page_alloc.h:82:13: note: expected 'struct device *' but argument is of type 'struct device *'
> 
> Signed-off-by: Huacai Chen <chenhc@lemote.com>
> Signed-off-by: Hongliang Tao <taohl@lemote.com>
> Signed-off-by: Hua Yan <yanh@lemote.com>
> Cc: dri-devel@lists.freedesktop.org

Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>

> ---
>  drivers/gpu/drm/radeon/radeon_ttm.c |    4 ++++
>  1 files changed, 4 insertions(+), 0 deletions(-)
> 
> diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
> index 5b71c71..fc3ac22 100644
> --- a/drivers/gpu/drm/radeon/radeon_ttm.c
> +++ b/drivers/gpu/drm/radeon/radeon_ttm.c
> @@ -41,6 +41,10 @@
>  #include "radeon_reg.h"
>  #include "radeon.h"
>  
> +#ifdef CONFIG_SWIOTLB
> +#include <linux/swiotlb.h>
> +#endif
> +
>  #define DRM_FILE_PAGE_OFFSET (0x100000000ULL >> PAGE_SHIFT)
>  
>  static int radeon_ttm_debugfs_init(struct radeon_device *rdev);
> -- 
> 1.7.7.3
> 
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel

[PATCH] drm/radeon: Include swiotlb.h if SWIOTLB configured.

[Huacai Chen]

When SWIOTLB is configured, if without this patch kernel compilation
fails.

Signed-off-by: Huacai Chen <chenhc@lemote.com>
Signed-off-by: Hongliang Tao <taohl@lemote.com>
Signed-off-by: Hua Yan <yanh@lemote.com>
Cc: dri-devel@lists.freedesktop.org
---
 drivers/gpu/drm/radeon/radeon_ttm.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
index 5b71c71..fc3ac22 100644
--- a/drivers/gpu/drm/radeon/radeon_ttm.c
+++ b/drivers/gpu/drm/radeon/radeon_ttm.c
@@ -41,6 +41,10 @@
 #include "radeon_reg.h"
 #include "radeon.h"
 
+#ifdef CONFIG_SWIOTLB
+#include <linux/swiotlb.h>
+#endif
+
 #define DRM_FILE_PAGE_OFFSET (0x100000000ULL >> PAGE_SHIFT)
 
 static int radeon_ttm_debugfs_init(struct radeon_device *rdev);
-- 
1.7.7.3

Re: [PATCH] drm/radeon: Include swiotlb.h if SWIOTLB configured.

[Paul Menzel]

[-- Attachment #1: Type: text/plain, Size: 1739 bytes --]

Dear Chen,


thanks for your patch.

Firstly, is Chen your first or last name? If it is your first name, your
From address should be switched.

Am Montag, den 13.08.2012, 10:09 +0800 schrieb Huacai Chen:
> When SWIOTLB is configured, if without this patch kernel compilation
> fails.

Secondly, could you please always paste part of the error message into
the commit message so that people hitting this problem and searching for
it on the WWW have a higher chance finding your patch.

Thirdly, do you know why this was not caught beforehand and compilation
worked before?

> Signed-off-by: Huacai Chen <chenhc@lemote.com>

Lastly, the addresses in your From line and Signed-off-by line disagree.
You can easily fix that, by adding

    From: Huacai Chen <chenhc@lemote.com>

to the beginning of your message.

> Signed-off-by: Hongliang Tao <taohl@lemote.com>
> Signed-off-by: Hua Yan <yanh@lemote.com>
> Cc: dri-devel@lists.freedesktop.org
> ---
>  drivers/gpu/drm/radeon/radeon_ttm.c |    4 ++++
>  1 files changed, 4 insertions(+), 0 deletions(-)
> 
> diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
> index 5b71c71..fc3ac22 100644
> --- a/drivers/gpu/drm/radeon/radeon_ttm.c
> +++ b/drivers/gpu/drm/radeon/radeon_ttm.c
> @@ -41,6 +41,10 @@
>  #include "radeon_reg.h"
>  #include "radeon.h"
>  
> +#ifdef CONFIG_SWIOTLB
> +#include <linux/swiotlb.h>
> +#endif
> +
>  #define DRM_FILE_PAGE_OFFSET (0x100000000ULL >> PAGE_SHIFT)
>  
>  static int radeon_ttm_debugfs_init(struct radeon_device *rdev);

With the clarification above

    Acked-by: Paul Menzel <paulepanter@users.sourceforge.net>

can be added to your patch.


Thanks,

Paul

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 198 bytes --]

Re: [PATCH] drm/radeon: Include swiotlb.h if SWIOTLB configured.

[Huacai Chen]

On Mon, Aug 13, 2012 at 3:00 PM, Paul Menzel
<paulepanter@users.sourceforge.net> wrote:
> Dear Chen,
>
>
> thanks for your patch.
>
> Firstly, is Chen your first or last name? If it is your first name, your
> From address should be switched.
Chen is may last name.

>
> Am Montag, den 13.08.2012, 10:09 +0800 schrieb Huacai Chen:
>> When SWIOTLB is configured, if without this patch kernel compilation
>> fails.
>
> Secondly, could you please always paste part of the error message into
> the commit message so that people hitting this problem and searching for
> it on the WWW have a higher chance finding your patch.
>
OK, I'll paste error message.

> Thirdly, do you know why this was not caught beforehand and compilation
> worked before?
Maybe radeon is mostly used on X86 and swiotlb.h is included
indirectly on X86 platform. This patch is split from my MIPS patchset,
on MIPS machines compilation always failed.

>
>> Signed-off-by: Huacai Chen <chenhc@lemote.com>
>
> Lastly, the addresses in your From line and Signed-off-by line disagree.
> You can easily fix that, by adding
My patch is generated by git format-patch and there is surely a From
line in the beginning (from chenhc@lemote.com), but the mail is sent
out by gmail, so I don't know how to make From line and Signed-off-by
agree.

>
>     From: Huacai Chen <chenhc@lemote.com>
>
> to the beginning of your message.
>
>> Signed-off-by: Hongliang Tao <taohl@lemote.com>
>> Signed-off-by: Hua Yan <yanh@lemote.com>
>> Cc: dri-devel@lists.freedesktop.org
>> ---
>>  drivers/gpu/drm/radeon/radeon_ttm.c |    4 ++++
>>  1 files changed, 4 insertions(+), 0 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
>> index 5b71c71..fc3ac22 100644
>> --- a/drivers/gpu/drm/radeon/radeon_ttm.c
>> +++ b/drivers/gpu/drm/radeon/radeon_ttm.c
>> @@ -41,6 +41,10 @@
>>  #include "radeon_reg.h"
>>  #include "radeon.h"
>>
>> +#ifdef CONFIG_SWIOTLB
>> +#include <linux/swiotlb.h>
>> +#endif
>> +
>>  #define DRM_FILE_PAGE_OFFSET (0x100000000ULL >> PAGE_SHIFT)
>>
>>  static int radeon_ttm_debugfs_init(struct radeon_device *rdev);
>
> With the clarification above
>
>     Acked-by: Paul Menzel <paulepanter@users.sourceforge.net>
>
> can be added to your patch.
>
>
> Thanks,
>
> Paul

Re: [PATCH] drm/radeon: Include swiotlb.h if SWIOTLB configured.

[Paul Menzel]

[-- Attachment #1: Type: text/plain, Size: 1883 bytes --]

Dear Huacai,


Am Montag, den 13.08.2012, 15:16 +0800 schrieb Huacai Chen:
> On Mon, Aug 13, 2012 at 3:00 PM, Paul Menzel wrote:

> > thanks for your patch.
> >
> > Firstly, is Chen your first or last name? If it is your first name, your
> > From address should be switched.
> Chen is may last name.

I am sorry then.

> > Am Montag, den 13.08.2012, 10:09 +0800 schrieb Huacai Chen:
> >> When SWIOTLB is configured, if without this patch kernel compilation
> >> fails.
> >
> > Secondly, could you please always paste part of the error message into
> > the commit message so that people hitting this problem and searching for
> > it on the WWW have a higher chance finding your patch.
> >
> OK, I'll paste error message.
> 
> > Thirdly, do you know why this was not caught beforehand and compilation
> > worked before?
> Maybe radeon is mostly used on X86 and swiotlb.h is included
> indirectly on X86 platform. This patch is split from my MIPS patchset,
> on MIPS machines compilation always failed.

Ah, I thought your patches had already been submitted.

> >> Signed-off-by: Huacai Chen <chenhc@lemote.com>
> >
> > Lastly, the addresses in your From line and Signed-off-by line disagree.
> > You can easily fix that, by adding
> My patch is generated by git format-patch and there is surely a From
> line in the beginning (from chenhc@lemote.com),

It should be `From: Huacai Chen <chenhc@lemote.com>`.

> but the mail is sent out by gmail, so I don't know how to make From
> line and Signed-off-by agree.

Do you copy the content of the file created by `git format-patch` into
the Gmail Web compositor?

If yes, just do not delete the `From` *and* `Date` lines from the
beginning as for example Alex Deucher is doing [1].

[…]


Thanks,

Paul


[1] http://lists.freedesktop.org/archives/dri-devel/2012-July/025200.html

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 198 bytes --]

Re: [PATCH] drm/radeon: Include swiotlb.h if SWIOTLB configured.

[Huacai Chen]

On Mon, Aug 13, 2012 at 3:50 PM, Paul Menzel
<paulepanter@users.sourceforge.net> wrote:
> Dear Huacai,
>
>
> Am Montag, den 13.08.2012, 15:16 +0800 schrieb Huacai Chen:
>> On Mon, Aug 13, 2012 at 3:00 PM, Paul Menzel wrote:
>
>> > thanks for your patch.
>> >
>> > Firstly, is Chen your first or last name? If it is your first name, your
>> > From address should be switched.
>> Chen is may last name.
>
> I am sorry then.
>
>> > Am Montag, den 13.08.2012, 10:09 +0800 schrieb Huacai Chen:
>> >> When SWIOTLB is configured, if without this patch kernel compilation
>> >> fails.
>> >
>> > Secondly, could you please always paste part of the error message into
>> > the commit message so that people hitting this problem and searching for
>> > it on the WWW have a higher chance finding your patch.
>> >
>> OK, I'll paste error message.
>>
>> > Thirdly, do you know why this was not caught beforehand and compilation
>> > worked before?
>> Maybe radeon is mostly used on X86 and swiotlb.h is included
>> indirectly on X86 platform. This patch is split from my MIPS patchset,
>> on MIPS machines compilation always failed.
>
> Ah, I thought your patches had already been submitted.
My MIPS patchset is under review (not accepted now), I think this drm
patch is important and should be accept first, so sent it
independently.

>
>> >> Signed-off-by: Huacai Chen <chenhc@lemote.com>
>> >
>> > Lastly, the addresses in your From line and Signed-off-by line disagree.
>> > You can easily fix that, by adding
>> My patch is generated by git format-patch and there is surely a From
>> line in the beginning (from chenhc@lemote.com),
>
> It should be `From: Huacai Chen <chenhc@lemote.com>`.
Yes, git format-patch generate `From: Huacai Chen <chenhc@lemote.com>`

>
>> but the mail is sent out by gmail, so I don't know how to make From
>> line and Signed-off-by agree.
>
> Do you copy the content of the file created by `git format-patch` into
> the Gmail Web compositor?
>
> If yes, just do not delete the `From` *and* `Date` lines from the
> beginning as for example Alex Deucher is doing [1].
No, I use git send-email to send the patch but use gmail's server
(mail server of lemote.com is too weak). The original patch is begin
with:
-----
From 70e1e058da3d39c52b7dba3e8fa754e7ed41828c Mon Sep 17 00:00:00 2001
From: Huacai Chen <chenhc@lemote.com>
Date: Thu, 2 Aug 2012 17:02:59 +0800
Subject: [PATCH] drm/radeon: Include swiotlb.h if SWIOTLB configured.

When SWIOTLB is configured, if without this patch kernel compilation
fails with error messages:
----
Do you means I need to copy the From line and paste it after the Subject line?

>
> […]
>
>
> Thanks,
>
> Paul
>
>
> [1] http://lists.freedesktop.org/archives/dri-devel/2012-July/025200.html

Re: [PATCH] drm/radeon: Include swiotlb.h if SWIOTLB configured.

[Huacai Chen]

On Mon, Aug 13, 2012 at 3:50 PM, Paul Menzel
<paulepanter@users.sourceforge.net> wrote:
> Dear Huacai,
>
>
> Am Montag, den 13.08.2012, 15:16 +0800 schrieb Huacai Chen:
>> On Mon, Aug 13, 2012 at 3:00 PM, Paul Menzel wrote:
>
>> > thanks for your patch.
>> >
>> > Firstly, is Chen your first or last name? If it is your first name, your
>> > From address should be switched.
>> Chen is may last name.
>
> I am sorry then.
>
>> > Am Montag, den 13.08.2012, 10:09 +0800 schrieb Huacai Chen:
>> >> When SWIOTLB is configured, if without this patch kernel compilation
>> >> fails.
>> >
>> > Secondly, could you please always paste part of the error message into
>> > the commit message so that people hitting this problem and searching for
>> > it on the WWW have a higher chance finding your patch.
>> >
>> OK, I'll paste error message.
>>
>> > Thirdly, do you know why this was not caught beforehand and compilation
>> > worked before?
>> Maybe radeon is mostly used on X86 and swiotlb.h is included
>> indirectly on X86 platform. This patch is split from my MIPS patchset,
>> on MIPS machines compilation always failed.
>
> Ah, I thought your patches had already been submitted.
My MIPS patchset is under review (not accepted now), I think this drm
patch is important and should be accept first, so sent it
independently.

>
>> >> Signed-off-by: Huacai Chen <chenhc@lemote.com>
>> >
>> > Lastly, the addresses in your From line and Signed-off-by line disagree.
>> > You can easily fix that, by adding
>> My patch is generated by git format-patch and there is surely a From
>> line in the beginning (from chenhc@lemote.com),
>
> It should be `From: Huacai Chen <chenhc@lemote.com>`.
Yes, git format-patch generate `From: Huacai Chen <chenhc@lemote.com>`

>
>> but the mail is sent out by gmail, so I don't know how to make From
>> line and Signed-off-by agree.
>
> Do you copy the content of the file created by `git format-patch` into
> the Gmail Web compositor?
>
> If yes, just do not delete the `From` *and* `Date` lines from the
> beginning as for example Alex Deucher is doing [1].
No, I use git send-email to send the patch but use gmail's server
(mail server of lemote.com is too weak). The original patch is begin
with:
-----
>From 70e1e058da3d39c52b7dba3e8fa754e7ed41828c Mon Sep 17 00:00:00 2001
From: Huacai Chen <chenhc@lemote.com>
Date: Thu, 2 Aug 2012 17:02:59 +0800
Subject: [PATCH] drm/radeon: Include swiotlb.h if SWIOTLB configured.

When SWIOTLB is configured, if without this patch kernel compilation
fails with error messages:
----
Do you means I need to copy the From line and paste it after the Subject line?

>
> […]
>
>
> Thanks,
>
> Paul
>
>
> [1] http://lists.freedesktop.org/archives/dri-devel/2012-July/025200.html

Re: [PATCH] drm/radeon: Include swiotlb.h if SWIOTLB configured.

[Paul Menzel]

[-- Attachment #1: Type: text/plain, Size: 1977 bytes --]

Am Montag, den 13.08.2012, 16:04 +0800 schrieb Huacai Chen:
> On Mon, Aug 13, 2012 at 3:50 PM, Paul Menzel wrote:

> > Am Montag, den 13.08.2012, 15:16 +0800 schrieb Huacai Chen:
> >> On Mon, Aug 13, 2012 at 3:00 PM, Paul Menzel wrote:

[…]

> >> > Am Montag, den 13.08.2012, 10:09 +0800 schrieb Huacai Chen:

[…]

> >> >> Signed-off-by: Huacai Chen <chenhc@lemote.com>
> >> >
> >> > Lastly, the addresses in your From line and Signed-off-by line disagree.
> >> > You can easily fix that, by adding
> >> My patch is generated by git format-patch and there is surely a From
> >> line in the beginning (from chenhc@lemote.com),
> >
> > It should be `From: Huacai Chen <chenhc@lemote.com>`.
> Yes, git format-patch generate `From: Huacai Chen <chenhc@lemote.com>`
> 
> >
> >> but the mail is sent out by gmail, so I don't know how to make From
> >> line and Signed-off-by agree.
> >
> > Do you copy the content of the file created by `git format-patch` into
> > the Gmail Web compositor?
> >
> > If yes, just do not delete the `From` *and* `Date` lines from the
> > beginning as for example Alex Deucher is doing [1].
> No, I use git send-email to send the patch but use gmail's server
> (mail server of lemote.com is too weak). The original patch is begin
> with:
> -----
> From 70e1e058da3d39c52b7dba3e8fa754e7ed41828c Mon Sep 17 00:00:00 2001
> From: Huacai Chen <chenhc@lemote.com>
> Date: Thu, 2 Aug 2012 17:02:59 +0800
> Subject: [PATCH] drm/radeon: Include swiotlb.h if SWIOTLB configured.
> 
> When SWIOTLB is configured, if without this patch kernel compilation
> fails with error messages:
> ----
> Do you means I need to copy the From line and paste it after the Subject line?

wereHamster on #git suggested to use

    git send-email --from 'Huacai Chen <chenhc@lemote.com>'

and it should do the right thing.


Thanks,

Paul


> > [1] http://lists.freedesktop.org/archives/dri-devel/2012-July/025200.html

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 198 bytes --]