* [PATCH] drm/nouveu: fix swiotlb include
@ 2020-10-30 11:13 Christian König
2020-10-30 12:08 ` Daniel Vetter
` (2 more replies)
0 siblings, 3 replies; 7+ messages in thread
From: Christian König @ 2020-10-30 11:13 UTC (permalink / raw)
To: dri-devel; +Cc: sfr
The check for swiotlb has moved to nouveu_ttm.c, but we forgot to move
the include as well.
Signed-off-by: Christian König <christian.koenig@amd.com>
---
drivers/gpu/drm/nouveau/nouveau_bo.c | 1 -
drivers/gpu/drm/nouveau/nouveau_ttm.c | 3 +++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c
index 746c06ed195b..8133377d865d 100644
--- a/drivers/gpu/drm/nouveau/nouveau_bo.c
+++ b/drivers/gpu/drm/nouveau/nouveau_bo.c
@@ -28,7 +28,6 @@
*/
#include <linux/dma-mapping.h>
-#include <linux/swiotlb.h>
#include "nouveau_drv.h"
#include "nouveau_chan.h"
diff --git a/drivers/gpu/drm/nouveau/nouveau_ttm.c b/drivers/gpu/drm/nouveau/nouveau_ttm.c
index d696d882c9eb..2bf36229dd57 100644
--- a/drivers/gpu/drm/nouveau/nouveau_ttm.c
+++ b/drivers/gpu/drm/nouveau/nouveau_ttm.c
@@ -22,6 +22,9 @@
* OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
* USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
+
+#include <linux/swiotlb.h>
+
#include "nouveau_drv.h"
#include "nouveau_gem.h"
#include "nouveau_mem.h"
--
2.17.1
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH] drm/nouveu: fix swiotlb include
2020-10-30 11:13 [PATCH] drm/nouveu: fix swiotlb include Christian König
@ 2020-10-30 12:08 ` Daniel Vetter
2020-11-02 10:27 ` Christian König
2020-11-02 7:49 ` Thomas Zimmermann
2020-11-02 10:32 ` Daniel Vetter
2 siblings, 1 reply; 7+ messages in thread
From: Daniel Vetter @ 2020-10-30 12:08 UTC (permalink / raw)
To: Christian König, Thomas Zimmermann; +Cc: Stephen Rothwell, dri-devel
On Fri, Oct 30, 2020 at 12:13 PM Christian König
<ckoenig.leichtzumerken@gmail.com> wrote:
>
> The check for swiotlb has moved to nouveu_ttm.c, but we forgot to move
> the include as well.
>
> Signed-off-by: Christian König <christian.koenig@amd.com>
Hm drm-misc-next compiles fine with swiotlb enabled in config. Am I
blind or is this a merge problem with -rc1? If the latter need to give
Thomas a heads-up about that for the backmerge of -rc2.
-Daniel
> ---
> drivers/gpu/drm/nouveau/nouveau_bo.c | 1 -
> drivers/gpu/drm/nouveau/nouveau_ttm.c | 3 +++
> 2 files changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c
> index 746c06ed195b..8133377d865d 100644
> --- a/drivers/gpu/drm/nouveau/nouveau_bo.c
> +++ b/drivers/gpu/drm/nouveau/nouveau_bo.c
> @@ -28,7 +28,6 @@
> */
>
> #include <linux/dma-mapping.h>
> -#include <linux/swiotlb.h>
>
> #include "nouveau_drv.h"
> #include "nouveau_chan.h"
> diff --git a/drivers/gpu/drm/nouveau/nouveau_ttm.c b/drivers/gpu/drm/nouveau/nouveau_ttm.c
> index d696d882c9eb..2bf36229dd57 100644
> --- a/drivers/gpu/drm/nouveau/nouveau_ttm.c
> +++ b/drivers/gpu/drm/nouveau/nouveau_ttm.c
> @@ -22,6 +22,9 @@
> * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
> * USE OR OTHER DEALINGS IN THE SOFTWARE.
> */
> +
> +#include <linux/swiotlb.h>
> +
> #include "nouveau_drv.h"
> #include "nouveau_gem.h"
> #include "nouveau_mem.h"
> --
> 2.17.1
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] drm/nouveu: fix swiotlb include
2020-11-02 10:27 ` Christian König
@ 2020-10-30 14:36 ` Daniel Vetter
0 siblings, 0 replies; 7+ messages in thread
From: Daniel Vetter @ 2020-10-30 14:36 UTC (permalink / raw)
To: Christian König; +Cc: Stephen Rothwell, dri-devel, Thomas Zimmermann
On Fri, Oct 30, 2020 at 3:27 PM Christian König
<ckoenig.leichtzumerken@gmail.com> wrote:
>
> Am 30.10.20 um 13:08 schrieb Daniel Vetter:
> > On Fri, Oct 30, 2020 at 12:13 PM Christian König
> > <ckoenig.leichtzumerken@gmail.com> wrote:
> >> The check for swiotlb has moved to nouveu_ttm.c, but we forgot to move
> >> the include as well.
> >>
> >> Signed-off-by: Christian König <christian.koenig@amd.com>
> > Hm drm-misc-next compiles fine with swiotlb enabled in config. Am I
> > blind or is this a merge problem with -rc1? If the latter need to give
> > Thomas a heads-up about that for the backmerge of -rc2.
>
> It's a merge problem with linux-next Stephen pointed out.
>
> And before you ask: Nope, I have no idea why drm-misc-next alone
> compiles fine either.
>
> Anyway taking over the include is the right thing to-do. Can I please
> get an rb?
Ah if we can apply this already to make sure the merge doesn't go
boom, then should be good to apply already :-)
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Maybe smash your above explanation into the commit message too, for the record.
-Daniel
>
> Thanks,
> Christian.
>
> > -Daniel
> >
> >
> >> ---
> >> drivers/gpu/drm/nouveau/nouveau_bo.c | 1 -
> >> drivers/gpu/drm/nouveau/nouveau_ttm.c | 3 +++
> >> 2 files changed, 3 insertions(+), 1 deletion(-)
> >>
> >> diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c
> >> index 746c06ed195b..8133377d865d 100644
> >> --- a/drivers/gpu/drm/nouveau/nouveau_bo.c
> >> +++ b/drivers/gpu/drm/nouveau/nouveau_bo.c
> >> @@ -28,7 +28,6 @@
> >> */
> >>
> >> #include <linux/dma-mapping.h>
> >> -#include <linux/swiotlb.h>
> >>
> >> #include "nouveau_drv.h"
> >> #include "nouveau_chan.h"
> >> diff --git a/drivers/gpu/drm/nouveau/nouveau_ttm.c b/drivers/gpu/drm/nouveau/nouveau_ttm.c
> >> index d696d882c9eb..2bf36229dd57 100644
> >> --- a/drivers/gpu/drm/nouveau/nouveau_ttm.c
> >> +++ b/drivers/gpu/drm/nouveau/nouveau_ttm.c
> >> @@ -22,6 +22,9 @@
> >> * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
> >> * USE OR OTHER DEALINGS IN THE SOFTWARE.
> >> */
> >> +
> >> +#include <linux/swiotlb.h>
> >> +
> >> #include "nouveau_drv.h"
> >> #include "nouveau_gem.h"
> >> #include "nouveau_mem.h"
> >> --
> >> 2.17.1
> >>
> >> _______________________________________________
> >> dri-devel mailing list
> >> dri-devel@lists.freedesktop.org
> >> https://lists.freedesktop.org/mailman/listinfo/dri-devel
> >
> >
> > --
> > Daniel Vetter
> > Software Engineer, Intel Corporation
> > http://blog.ffwll.ch
>
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] drm/nouveu: fix swiotlb include
2020-10-30 11:13 [PATCH] drm/nouveu: fix swiotlb include Christian König
2020-10-30 12:08 ` Daniel Vetter
@ 2020-11-02 7:49 ` Thomas Zimmermann
2020-11-02 10:32 ` Daniel Vetter
2 siblings, 0 replies; 7+ messages in thread
From: Thomas Zimmermann @ 2020-11-02 7:49 UTC (permalink / raw)
To: Christian König, dri-devel; +Cc: sfr
[-- Attachment #1.1.1.1: Type: text/plain, Size: 1566 bytes --]
Hi
Am 30.10.20 um 12:13 schrieb Christian König:
> The check for swiotlb has moved to nouveu_ttm.c, but we forgot to move
s/nouveu/nouveau
here and in the subject line.
Best regards
Thomas
> the include as well.
>
> Signed-off-by: Christian König <christian.koenig@amd.com>
> ---
> drivers/gpu/drm/nouveau/nouveau_bo.c | 1 -
> drivers/gpu/drm/nouveau/nouveau_ttm.c | 3 +++
> 2 files changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c
> index 746c06ed195b..8133377d865d 100644
> --- a/drivers/gpu/drm/nouveau/nouveau_bo.c
> +++ b/drivers/gpu/drm/nouveau/nouveau_bo.c
> @@ -28,7 +28,6 @@
> */
>
> #include <linux/dma-mapping.h>
> -#include <linux/swiotlb.h>
>
> #include "nouveau_drv.h"
> #include "nouveau_chan.h"
> diff --git a/drivers/gpu/drm/nouveau/nouveau_ttm.c b/drivers/gpu/drm/nouveau/nouveau_ttm.c
> index d696d882c9eb..2bf36229dd57 100644
> --- a/drivers/gpu/drm/nouveau/nouveau_ttm.c
> +++ b/drivers/gpu/drm/nouveau/nouveau_ttm.c
> @@ -22,6 +22,9 @@
> * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
> * USE OR OTHER DEALINGS IN THE SOFTWARE.
> */
> +
> +#include <linux/swiotlb.h>
> +
> #include "nouveau_drv.h"
> #include "nouveau_gem.h"
> #include "nouveau_mem.h"
>
--
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5, 90409 Nürnberg, Germany
(HRB 36809, AG Nürnberg)
Geschäftsführer: Felix Imendörffer
[-- Attachment #1.1.1.2: OpenPGP_0x680DC11D530B7A23.asc --]
[-- Type: application/pgp-keys, Size: 4259 bytes --]
[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 495 bytes --]
[-- Attachment #2: Type: text/plain, Size: 160 bytes --]
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] drm/nouveu: fix swiotlb include
2020-10-30 12:08 ` Daniel Vetter
@ 2020-11-02 10:27 ` Christian König
2020-10-30 14:36 ` Daniel Vetter
0 siblings, 1 reply; 7+ messages in thread
From: Christian König @ 2020-11-02 10:27 UTC (permalink / raw)
To: Daniel Vetter, Thomas Zimmermann; +Cc: Stephen Rothwell, dri-devel
Am 30.10.20 um 13:08 schrieb Daniel Vetter:
> On Fri, Oct 30, 2020 at 12:13 PM Christian König
> <ckoenig.leichtzumerken@gmail.com> wrote:
>> The check for swiotlb has moved to nouveu_ttm.c, but we forgot to move
>> the include as well.
>>
>> Signed-off-by: Christian König <christian.koenig@amd.com>
> Hm drm-misc-next compiles fine with swiotlb enabled in config. Am I
> blind or is this a merge problem with -rc1? If the latter need to give
> Thomas a heads-up about that for the backmerge of -rc2.
It's a merge problem with linux-next Stephen pointed out.
And before you ask: Nope, I have no idea why drm-misc-next alone
compiles fine either.
Anyway taking over the include is the right thing to-do. Can I please
get an rb?
Thanks,
Christian.
> -Daniel
>
>
>> ---
>> drivers/gpu/drm/nouveau/nouveau_bo.c | 1 -
>> drivers/gpu/drm/nouveau/nouveau_ttm.c | 3 +++
>> 2 files changed, 3 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c
>> index 746c06ed195b..8133377d865d 100644
>> --- a/drivers/gpu/drm/nouveau/nouveau_bo.c
>> +++ b/drivers/gpu/drm/nouveau/nouveau_bo.c
>> @@ -28,7 +28,6 @@
>> */
>>
>> #include <linux/dma-mapping.h>
>> -#include <linux/swiotlb.h>
>>
>> #include "nouveau_drv.h"
>> #include "nouveau_chan.h"
>> diff --git a/drivers/gpu/drm/nouveau/nouveau_ttm.c b/drivers/gpu/drm/nouveau/nouveau_ttm.c
>> index d696d882c9eb..2bf36229dd57 100644
>> --- a/drivers/gpu/drm/nouveau/nouveau_ttm.c
>> +++ b/drivers/gpu/drm/nouveau/nouveau_ttm.c
>> @@ -22,6 +22,9 @@
>> * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
>> * USE OR OTHER DEALINGS IN THE SOFTWARE.
>> */
>> +
>> +#include <linux/swiotlb.h>
>> +
>> #include "nouveau_drv.h"
>> #include "nouveau_gem.h"
>> #include "nouveau_mem.h"
>> --
>> 2.17.1
>>
>> _______________________________________________
>> dri-devel mailing list
>> dri-devel@lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/dri-devel
>
>
> --
> Daniel Vetter
> Software Engineer, Intel Corporation
> http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] drm/nouveu: fix swiotlb include
2020-10-30 11:13 [PATCH] drm/nouveu: fix swiotlb include Christian König
2020-10-30 12:08 ` Daniel Vetter
2020-11-02 7:49 ` Thomas Zimmermann
@ 2020-11-02 10:32 ` Daniel Vetter
2020-11-02 20:01 ` Christian König
2 siblings, 1 reply; 7+ messages in thread
From: Daniel Vetter @ 2020-11-02 10:32 UTC (permalink / raw)
To: Christian König, Maxime Ripard; +Cc: Stephen Rothwell, dri-devel
On Fri, Oct 30, 2020 at 12:13 PM Christian König
<ckoenig.leichtzumerken@gmail.com> wrote:
>
> The check for swiotlb has moved to nouveu_ttm.c, but we forgot to move
> the include as well.
>
> Signed-off-by: Christian König <christian.koenig@amd.com>
So this now broke drm-misc-next compilation on arm, which isn't great.
Please make sure you compile test stuff before pushing.
Since the proper fix is maybe stuck in the usual "drm abuses swiotlb
internals" bikeshed, maybe best if we push a fix to including limits.h
in nouveau and call it done? Also adding Maxime, who's trying to get
the backmerge through right now.
-Daniel
> ---
> drivers/gpu/drm/nouveau/nouveau_bo.c | 1 -
> drivers/gpu/drm/nouveau/nouveau_ttm.c | 3 +++
> 2 files changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c
> index 746c06ed195b..8133377d865d 100644
> --- a/drivers/gpu/drm/nouveau/nouveau_bo.c
> +++ b/drivers/gpu/drm/nouveau/nouveau_bo.c
> @@ -28,7 +28,6 @@
> */
>
> #include <linux/dma-mapping.h>
> -#include <linux/swiotlb.h>
>
> #include "nouveau_drv.h"
> #include "nouveau_chan.h"
> diff --git a/drivers/gpu/drm/nouveau/nouveau_ttm.c b/drivers/gpu/drm/nouveau/nouveau_ttm.c
> index d696d882c9eb..2bf36229dd57 100644
> --- a/drivers/gpu/drm/nouveau/nouveau_ttm.c
> +++ b/drivers/gpu/drm/nouveau/nouveau_ttm.c
> @@ -22,6 +22,9 @@
> * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
> * USE OR OTHER DEALINGS IN THE SOFTWARE.
> */
> +
> +#include <linux/swiotlb.h>
> +
> #include "nouveau_drv.h"
> #include "nouveau_gem.h"
> #include "nouveau_mem.h"
> --
> 2.17.1
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] drm/nouveu: fix swiotlb include
2020-11-02 10:32 ` Daniel Vetter
@ 2020-11-02 20:01 ` Christian König
0 siblings, 0 replies; 7+ messages in thread
From: Christian König @ 2020-11-02 20:01 UTC (permalink / raw)
To: Daniel Vetter, Maxime Ripard; +Cc: Stephen Rothwell, dri-devel
Am 02.11.20 um 11:32 schrieb Daniel Vetter:
> On Fri, Oct 30, 2020 at 12:13 PM Christian König
> <ckoenig.leichtzumerken@gmail.com> wrote:
>> The check for swiotlb has moved to nouveu_ttm.c, but we forgot to move
>> the include as well.
>>
>> Signed-off-by: Christian König <christian.koenig@amd.com>
> So this now broke drm-misc-next compilation on arm, which isn't great.
> Please make sure you compile test stuff before pushing.
Well, I did compile tested it on x86_64 before pushing and all looked well.
> Since the proper fix is maybe stuck in the usual "drm abuses swiotlb
> internals" bikeshed, maybe best if we push a fix to including limits.h
> in nouveau and call it done? Also adding Maxime, who's trying to get
> the backmerge through right now.
Yeah, that is probably the best approach. I didn't realized that the
include of limit.h needs to move as well.
Regards,
Christian.
> -Daniel
>
>> ---
>> drivers/gpu/drm/nouveau/nouveau_bo.c | 1 -
>> drivers/gpu/drm/nouveau/nouveau_ttm.c | 3 +++
>> 2 files changed, 3 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c
>> index 746c06ed195b..8133377d865d 100644
>> --- a/drivers/gpu/drm/nouveau/nouveau_bo.c
>> +++ b/drivers/gpu/drm/nouveau/nouveau_bo.c
>> @@ -28,7 +28,6 @@
>> */
>>
>> #include <linux/dma-mapping.h>
>> -#include <linux/swiotlb.h>
>>
>> #include "nouveau_drv.h"
>> #include "nouveau_chan.h"
>> diff --git a/drivers/gpu/drm/nouveau/nouveau_ttm.c b/drivers/gpu/drm/nouveau/nouveau_ttm.c
>> index d696d882c9eb..2bf36229dd57 100644
>> --- a/drivers/gpu/drm/nouveau/nouveau_ttm.c
>> +++ b/drivers/gpu/drm/nouveau/nouveau_ttm.c
>> @@ -22,6 +22,9 @@
>> * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
>> * USE OR OTHER DEALINGS IN THE SOFTWARE.
>> */
>> +
>> +#include <linux/swiotlb.h>
>> +
>> #include "nouveau_drv.h"
>> #include "nouveau_gem.h"
>> #include "nouveau_mem.h"
>> --
>> 2.17.1
>>
>> _______________________________________________
>> dri-devel mailing list
>> dri-devel@lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/dri-devel
>
>
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2020-11-02 20:01 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-10-30 11:13 [PATCH] drm/nouveu: fix swiotlb include Christian König
2020-10-30 12:08 ` Daniel Vetter
2020-11-02 10:27 ` Christian König
2020-10-30 14:36 ` Daniel Vetter
2020-11-02 7:49 ` Thomas Zimmermann
2020-11-02 10:32 ` Daniel Vetter
2020-11-02 20:01 ` Christian König
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).