[PATCH] drm/amdgpu: fix clear_all and replace handling in the VM

[PATCH] drm/amdgpu: fix clear_all and replace handling in the VM

[Christian König]

We need to put the lose ends on the invalid list because it is possible
that we need to split up huge pages for them.

Signed-off-by: Christian König <christian.koenig@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
index ccba88cc8c54..dec8a793d38d 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
@@ -2123,7 +2123,7 @@ int amdgpu_vm_bo_clear_mappings(struct amdgpu_device *adev,
 			before->last = saddr - 1;
 			before->offset = tmp->offset;
 			before->flags = tmp->flags;
-			list_add(&before->list, &tmp->list);
+			list_add(&before->list, &tmp->bo_va->invalids);
 		}
 
 		/* Remember mapping split at the end */
@@ -2133,7 +2133,7 @@ int amdgpu_vm_bo_clear_mappings(struct amdgpu_device *adev,
 			after->offset = tmp->offset;
 			after->offset += after->start - tmp->start;
 			after->flags = tmp->flags;
-			list_add(&after->list, &tmp->list);
+			list_add(&after->list, &tmp->bo_va->invalids);
 		}
 
 		list_del(&tmp->list);
-- 
2.14.1

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

Re: [PATCH] drm/amdgpu: fix clear_all and replace handling in the VM

[Michel Dänzer]

On 2018-06-04 12:59 PM, Christian König wrote:
> We need to put the lose ends on the invalid list because it is possible
> that we need to split up huge pages for them.
> 
> Signed-off-by: Christian König <christian.koenig@amd.com>

Does this need to go to stable?


-- 
Earthling Michel Dänzer               |               http://www.amd.com
Libre software enthusiast             |             Mesa and X developer
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

Re: [PATCH] drm/amdgpu: fix clear_all and replace handling in the VM

[Christian König]

Am 04.06.2018 um 13:02 schrieb Michel Dänzer:
> On 2018-06-04 12:59 PM, Christian König wrote:
>> We need to put the lose ends on the invalid list because it is possible
>> that we need to split up huge pages for them.
>>
>> Signed-off-by: Christian König <christian.koenig@amd.com>
> Does this need to go to stable?

Yes, good point. Jerry if you haven't already committed your follow up 
patch then please add a "CC: stable@vger.kernel.org" tag to it.

Thanks,
Christian.
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

Re: [PATCH] drm/amdgpu: fix clear_all and replace handling in the VM

[Zhang, Jerry (Junwei)]

On 06/05/2018 04:45 PM, Christian König wrote:
> Am 04.06.2018 um 13:02 schrieb Michel Dänzer:
>> On 2018-06-04 12:59 PM, Christian König wrote:
>>> We need to put the lose ends on the invalid list because it is possible
>>> that we need to split up huge pages for them.
>>>
>>> Signed-off-by: Christian König <christian.koenig@amd.com>
>> Does this need to go to stable?
>
> Yes, good point. Jerry if you haven't already committed your follow up patch
> then please add a "CC: stable@vger.kernel.org" tag to it.

Sorry, it was landed in drm-next.
How can I save that?

Jerry

>
> Thanks,
> Christian.
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

Re: [PATCH] drm/amdgpu: fix clear_all and replace handling in the VM

[Christian König]

Am 05.06.2018 um 10:47 schrieb Zhang, Jerry (Junwei):
> On 06/05/2018 04:45 PM, Christian König wrote:
>> Am 04.06.2018 um 13:02 schrieb Michel Dänzer:
>>> On 2018-06-04 12:59 PM, Christian König wrote:
>>>> We need to put the lose ends on the invalid list because it is 
>>>> possible
>>>> that we need to split up huge pages for them.
>>>>
>>>> Signed-off-by: Christian König <christian.koenig@amd.com>
>>> Does this need to go to stable?
>>
>> Yes, good point. Jerry if you haven't already committed your follow 
>> up patch
>> then please add a "CC: stable@vger.kernel.org" tag to it.
>
> Sorry, it was landed in drm-next.
> How can I save that?

In this case Alex needs to add it when he prepares the patch for pushing 
it out as fix.

Only alternative is that you revert an repush the patch.

Christian.

>
> Jerry
>
>>
>> Thanks,
>> Christian.

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

Re: [PATCH] drm/amdgpu: fix clear_all and replace handling in the VM

[Zhang, Jerry (Junwei)]

On 06/05/2018 04:54 PM, Christian König wrote:
> Am 05.06.2018 um 10:47 schrieb Zhang, Jerry (Junwei):
>> On 06/05/2018 04:45 PM, Christian König wrote:
>>> Am 04.06.2018 um 13:02 schrieb Michel Dänzer:
>>>> On 2018-06-04 12:59 PM, Christian König wrote:
>>>>> We need to put the lose ends on the invalid list because it is possible
>>>>> that we need to split up huge pages for them.
>>>>>
>>>>> Signed-off-by: Christian König <christian.koenig@amd.com>
>>>> Does this need to go to stable?
>>>
>>> Yes, good point. Jerry if you haven't already committed your follow up patch
>>> then please add a "CC: stable@vger.kernel.org" tag to it.
>>
>> Sorry, it was landed in drm-next.
>> How can I save that?
>
> In this case Alex needs to add it when he prepares the patch for pushing it out
> as fix.
>
> Only alternative is that you revert an repush the patch.

OK, I prefer to revert and repush, avoiding to increase more todo items for Alex 
going upstream.

Jerry

>
> Christian.
>
>>
>> Jerry
>>
>>>
>>> Thanks,
>>> Christian.
>
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx