From: "Christian König" <ckoenig.leichtzumerken@gmail.com>
To: Daniel Vetter <daniel@ffwll.ch>, Thomas Zimmermann <tzimmermann@suse.de>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
dri-devel <dri-devel@lists.freedesktop.org>
Subject: Re: [PATCH] drm/nouveu: fix swiotlb include
Date: Mon, 2 Nov 2020 11:27:02 +0100 [thread overview]
Message-ID: <5fe038e5-fe6c-fb67-8668-8cde0ccf52d0@gmail.com> (raw)
In-Reply-To: <CAKMK7uFXKksw1F4cKRgKFfsNbVWo4VNt0-+-nu7+cv9OPD14Yg@mail.gmail.com>
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
next prev parent reply other threads:[~2020-10-30 14:27 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
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 [this message]
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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5fe038e5-fe6c-fb67-8668-8cde0ccf52d0@gmail.com \
--to=ckoenig.leichtzumerken@gmail.com \
--cc=christian.koenig@amd.com \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=sfr@canb.auug.org.au \
--cc=tzimmermann@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).