From: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>,
Jason Gunthorpe <jgg@nvidia.com>, Jason Gunthorpe <jgg@ziepe.ca>,
Matthew Auld <matthew.auld@intel.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
thomas.hellstrom@linux.intel.com,
intel-gfx@lists.freedesktop.org
Subject: Re: linux-next: build failure after merge of the drm-intel-gt tree
Date: Wed, 17 Nov 2021 12:35:50 +0200 [thread overview]
Message-ID: <163714535048.4529.4694769143307309201@jlahtine-mobl.ger.corp.intel.com> (raw)
In-Reply-To: <20211117100223.52c7460a@canb.auug.org.au>
+ intel-gfx mailing list (Stephen, can you include this going forward?)
Adding Thomas for this specific patch.
Regards, Joonas
Quoting Stephen Rothwell (2021-11-17 01:02:23)
> Hi all,
>
> After merging the etnaviv tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/gpu/drm/i915/gem/i915_gem_ttm.c: In function 'vm_fault_ttm':
> drivers/gpu/drm/i915/gem/i915_gem_ttm.c:862:9: error: too many arguments to function 'ttm_bo_vm_fault_reserved'
> 862 | ret = ttm_bo_vm_fault_reserved(vmf, vmf->vma->vm_page_prot,
> | ^~~~~~~~~~~~~~~~~~~~~~~~
> In file included from include/drm/ttm/ttm_bo_driver.h:42,
> from drivers/gpu/drm/i915/gem/i915_gem_ttm.c:6:
> include/drm/ttm/ttm_bo_api.h:585:12: note: declared here
> 585 | vm_fault_t ttm_bo_vm_fault_reserved(struct vm_fault *vmf,
> | ^~~~~~~~~~~~~~~~~~~~~~~~
>
> Caused by commit
>
> ebd4a8ec7799 ("drm/i915/ttm: move shrinker management into adjust_lru")
>
> interacting with commit
>
> 0d979509539e ("drm/ttm: remove ttm_bo_vm_insert_huge()")
>
> from Linus' tree.
>
> I applied the following merge fix patch.
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Wed, 17 Nov 2021 09:57:09 +1100
> Subject: [PATCH] fix up for "drm/ttm: remove ttm_bo_vm_insert_huge()"
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
> index d08a270b0921..68cfe6e9ceab 100644
> --- a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
> +++ b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
> @@ -860,7 +860,7 @@ static vm_fault_t vm_fault_ttm(struct vm_fault *vmf)
>
> if (drm_dev_enter(dev, &idx)) {
> ret = ttm_bo_vm_fault_reserved(vmf, vmf->vma->vm_page_prot,
> - TTM_BO_VM_NUM_PREFAULT, 1);
> + TTM_BO_VM_NUM_PREFAULT);
> drm_dev_exit(idx);
> } else {
> ret = ttm_bo_vm_dummy_page(vmf, vmf->vma->vm_page_prot);
> --
> 2.33.0
>
> --
> Cheers,
> Stephen Rothwell
next prev parent reply other threads:[~2021-11-17 10:35 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-16 23:02 linux-next: build failure after merge of the drm-intel-gt tree Stephen Rothwell
2021-11-17 10:35 ` Joonas Lahtinen [this message]
2021-11-17 11:00 ` 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=163714535048.4529.4694769143307309201@jlahtine-mobl.ger.corp.intel.com \
--to=joonas.lahtinen@linux.intel.com \
--cc=daniel.vetter@ffwll.ch \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jgg@nvidia.com \
--cc=jgg@ziepe.ca \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=matthew.auld@intel.com \
--cc=sfr@canb.auug.org.au \
--cc=thomas.hellstrom@linux.intel.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: 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).