From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Andrew Morton <akpm@linux-foundation•org>,
Dave Airlie <airlied@linux•ie>,
DRI <dri-devel@lists•freedesktop.org>
Cc: "Linux-Next Mailing List" <linux-next@vger•kernel.org>,
"Linux Kernel Mailing List" <linux-kernel@vger•kernel.org>,
"Mel Gorman" <mgorman@techsingularity•net>,
"Christian König" <christian.koenig@amd•com>,
"Alex Deucher" <alexander.deucher@amd•com>
Subject: linux-next: manual merge of the akpm-current tree with the drm tree
Date: Thu, 2 Nov 2017 18:32:20 +1100 [thread overview]
Message-ID: <20171102183220.3c0e852c@canb.auug.org.au> (raw)
Hi Andrew,
Today's linux-next merge of the akpm-current tree got conflicts in:
drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
between commits:
b72cf4fca2bb ("drm/amdgpu: move taking mmap_sem into get_user_pages v2")
ca666a3c298f ("drm/amdgpu: stop using BO status for user pages")
from the drm tree and commit:
b7e8af45222b ("mm: remove cold parameter for release_pages")
from the akpm-current tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
index f7fceb63413c,cd664832f9e8..000000000000
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
@@@ -562,8 -553,7 +562,7 @@@ static int amdgpu_cs_parser_bos(struct
* invalidated it. Free it and try again
*/
release_pages(e->user_pages,
- bo->tbo.ttm->num_pages,
- false);
- e->robj->tbo.ttm->num_pages);
++ bo->tbo.ttm->num_pages);
kvfree(e->user_pages);
e->user_pages = NULL;
}
diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
index 51eacefadea1,d792959fac43..000000000000
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
@@@ -746,8 -659,7 +746,8 @@@ int amdgpu_ttm_tt_get_user_pages(struc
return 0;
release_pages:
- release_pages(pages, pinned, 0);
+ release_pages(pages, pinned);
+ up_read(¤t->mm->mmap_sem);
return r;
}
next reply other threads:[~2017-11-02 7:32 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-02 7:32 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-04-03 3:58 linux-next: manual merge of the akpm-current tree with the drm tree Stephen Rothwell
2019-06-24 10:49 Stephen Rothwell
2019-06-24 11:06 ` Stephen Rothwell
2019-07-09 0:06 ` Stephen Rothwell
2019-07-15 1:11 ` Stephen Rothwell
2016-03-07 8:14 Stephen Rothwell
2016-01-04 7:45 Stephen Rothwell
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=20171102183220.3c0e852c@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=airlied@linux$(echo .)ie \
--cc=akpm@linux-foundation$(echo .)org \
--cc=alexander.deucher@amd$(echo .)com \
--cc=christian.koenig@amd$(echo .)com \
--cc=dri-devel@lists$(echo .)freedesktop.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mgorman@techsingularity$(echo .)net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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