From: Stephen Rothwell <sfr@canb.auug.org.au> To: Alex Deucher <alexdeucher@gmail.com> Cc: "Alex Deucher" <alexander.deucher@amd.com>, "Christian König" <christian.koenig@amd.com>, "Linux Kernel Mailing List" <linux-kernel@vger.kernel.org>, "Linux Next Mailing List" <linux-next@vger.kernel.org>, "xinhui pan" <xinhui.pan@amd.com>, "Dave Airlie" <airlied@linux.ie>, DRI <dri-devel@lists.freedesktop.org> Subject: linux-next: manual merge of the amdgpu tree with Linus' tree Date: Tue, 27 Oct 2020 11:48:23 +1100 [thread overview] Message-ID: <20201027114823.09453419@canb.auug.org.au> (raw) [-- Attachment #1: Type: text/plain, Size: 1570 bytes --] Hi all, Today's linux-next merge of the amdgpu tree got a conflict in: drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c between commits: 0fe438cec9e1 ("drm/ttm: remove default caching") 9c3006a4cc1b ("drm/ttm: remove available_caching") from Linus' tree and commit: d836917da7e5 ("drm/amdgpu: Fix size calculation when init onchip memory") from the amdgpu 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_ttm.c index 8039d2399584,11dd3d9eac15..000000000000 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c @@@ -63,16 -63,13 +63,16 @@@ #define AMDGPU_TTM_VRAM_MAX_DW_READ (size_t)128 +static int amdgpu_ttm_backend_bind(struct ttm_bo_device *bdev, + struct ttm_tt *ttm, + struct ttm_resource *bo_mem); + static int amdgpu_ttm_init_on_chip(struct amdgpu_device *adev, unsigned int type, - uint64_t size) + uint64_t size_in_page) { return ttm_range_man_init(&adev->mman.bdev, type, - false, size >> PAGE_SHIFT); - TTM_PL_FLAG_UNCACHED, TTM_PL_FLAG_UNCACHED, + false, size_in_page); } /** [-- Attachment #2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 488 bytes --]
WARNING: multiple messages have this Message-ID (diff)
From: Stephen Rothwell <sfr@canb.auug.org.au> To: Alex Deucher <alexdeucher@gmail.com> Cc: "Dave Airlie" <airlied@linux.ie>, "xinhui pan" <xinhui.pan@amd.com>, "Linux Kernel Mailing List" <linux-kernel@vger.kernel.org>, DRI <dri-devel@lists.freedesktop.org>, "Linux Next Mailing List" <linux-next@vger.kernel.org>, "Alex Deucher" <alexander.deucher@amd.com>, "Christian König" <christian.koenig@amd.com> Subject: linux-next: manual merge of the amdgpu tree with Linus' tree Date: Tue, 27 Oct 2020 11:48:23 +1100 [thread overview] Message-ID: <20201027114823.09453419@canb.auug.org.au> (raw) [-- Attachment #1.1: Type: text/plain, Size: 1570 bytes --] Hi all, Today's linux-next merge of the amdgpu tree got a conflict in: drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c between commits: 0fe438cec9e1 ("drm/ttm: remove default caching") 9c3006a4cc1b ("drm/ttm: remove available_caching") from Linus' tree and commit: d836917da7e5 ("drm/amdgpu: Fix size calculation when init onchip memory") from the amdgpu 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_ttm.c index 8039d2399584,11dd3d9eac15..000000000000 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c @@@ -63,16 -63,13 +63,16 @@@ #define AMDGPU_TTM_VRAM_MAX_DW_READ (size_t)128 +static int amdgpu_ttm_backend_bind(struct ttm_bo_device *bdev, + struct ttm_tt *ttm, + struct ttm_resource *bo_mem); + static int amdgpu_ttm_init_on_chip(struct amdgpu_device *adev, unsigned int type, - uint64_t size) + uint64_t size_in_page) { return ttm_range_man_init(&adev->mman.bdev, type, - false, size >> PAGE_SHIFT); - TTM_PL_FLAG_UNCACHED, TTM_PL_FLAG_UNCACHED, + false, size_in_page); } /** [-- Attachment #1.2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 488 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
next reply other threads:[~2020-10-27 0:48 UTC|newest] Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-10-27 0:48 Stephen Rothwell [this message] 2020-10-27 0:48 ` linux-next: manual merge of the amdgpu tree with Linus' tree Stephen Rothwell -- strict thread matches above, loose matches on Subject: below -- 2023-11-05 22:48 Stephen Rothwell 2023-11-06 23:49 ` Stephen Rothwell 2023-11-06 23:49 ` Stephen Rothwell 2023-07-24 1:14 Stephen Rothwell 2023-05-12 0:38 Stephen Rothwell 2023-05-12 0:38 ` Stephen Rothwell 2022-07-19 2:00 Stephen Rothwell 2022-01-26 23:32 Stephen Rothwell 2022-01-26 23:29 Stephen Rothwell 2022-01-11 23:09 Stephen Rothwell 2021-09-02 1:22 Stephen Rothwell 2021-09-10 1:16 ` Stephen Rothwell 2021-08-02 15:10 Mark Brown 2021-08-02 15:48 ` Mark Brown 2021-07-06 0:52 Stephen Rothwell 2021-01-15 0:53 Stephen Rothwell 2021-01-08 1:04 Stephen Rothwell 2020-11-03 3:10 Stephen Rothwell 2020-10-16 1:48 Stephen Rothwell 2020-08-25 1:35 Stephen Rothwell 2020-07-22 4:34 Stephen Rothwell 2020-07-22 4:34 ` Stephen Rothwell 2020-07-23 8:01 ` Daniel Vetter 2020-07-23 8:01 ` Daniel Vetter 2020-07-23 13:34 ` Alex Deucher 2020-07-23 13:34 ` Alex Deucher 2019-12-12 0:03 Stephen Rothwell 2019-12-12 0:11 ` Stephen Rothwell 2019-12-12 0:16 ` Timothy Pearson 2019-12-11 23:37 Stephen Rothwell 2019-12-12 0:10 ` Stephen Rothwell 2019-10-28 1:11 Stephen Rothwell 2019-10-28 1:03 Stephen Rothwell 2019-10-28 0:57 Stephen Rothwell 2019-10-28 1:13 ` Masahiro Yamada 2019-10-03 0:19 Stephen Rothwell 2019-06-17 3:12 Stephen Rothwell 2019-03-18 23:55 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=20201027114823.09453419@canb.auug.org.au \ --to=sfr@canb.auug.org.au \ --cc=airlied@linux.ie \ --cc=alexander.deucher@amd.com \ --cc=alexdeucher@gmail.com \ --cc=christian.koenig@amd.com \ --cc=dri-devel@lists.freedesktop.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-next@vger.kernel.org \ --cc=xinhui.pan@amd.com \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
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.