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 <[email protected]>
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 <[email protected]>
---
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
+ 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 <[email protected]>
> 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 <[email protected]>
> ---
> 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
Hi Joonas,
On Wed, 17 Nov 2021 12:35:50 +0200 Joonas Lahtinen <[email protected]> wrote:
>
> + intel-gfx mailing list (Stephen, can you include this going forward?)
I have added that to my contacts for this tree (so, yes :-)).
--
Cheers,
Stephen Rothwell