Re: linux-next: manual merge of the amdgpu tree with the drm-misc tree

[Stephen Rothwell]

Hi all,

On Thu, 3 Jun 2021 12:48:47 +1000 Stephen Rothwell <s...@canb.auug.org.au> 
wrote:
>
> diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
> index bcfd4a8d0288,1923f035713a..000000000000
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
> @@@ -657,11 -657,10 +658,11 @@@ void amdgpu_vm_move_to_lru_tail(struct 
>               if (!bo->parent)
>                       continue;
>   
>  -            ttm_bo_move_to_lru_tail(&bo->tbo, &bo->tbo.mem,
>  +            ttm_bo_move_to_lru_tail(&bo->tbo, bo->tbo.resource,
>                                       &vm->lru_bulk_move);
> -             if (bo->shadow)
> -                     ttm_bo_move_to_lru_tail(&bo->shadow->tbo,
> +             if (shadow)
>  -                    ttm_bo_move_to_lru_tail(&shadow->tbo, &shadow->tbo.mem,
> ++                    ttm_bo_move_to_lru_tail(&shadow->tbo,
>  +                                            bo->shadow->tbo.resource,

that line should have been
                                                shadow->tbo.resource,

I have fixed it up in my resolution.

-- 
Cheers,
Stephen Rothwell

pgpcoJQrBq0Z0.pgp
Description: OpenPGP digital signature