[PATCH] drm/amdgpu: fix the lost duplicates checking

[PATCH] drm/amdgpu: fix the lost duplicates checking

[Chunming Zhou]

Change-Id: I657039670b2c022ac461f14094cd909b10c1a2a8
Signed-off-by: Chunming Zhou <David1.Zhou@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Jammy Zhou <Jammy.Zhou@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
index e461357..07b1ddf 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
@@ -535,6 +535,14 @@ static void amdgpu_gem_va_update_vm(struct amdgpu_device *adev,
 		if (domain == AMDGPU_GEM_DOMAIN_CPU)
 			goto error_unreserve;
 	}
+	list_for_each_entry(entry, &duplicates, head) {
+		domain = amdgpu_mem_type_to_domain(entry->bo->mem.mem_type);
+		/* if anything is swapped out don't swap it in here,
+		   just abort and wait for the next CS */
+		if (domain == AMDGPU_GEM_DOMAIN_CPU)
+			goto error_unreserve;
+	}
+
 	r = amdgpu_vm_update_page_directory(adev, bo_va->vm);
 	if (r)
 		goto error_unreserve;
-- 
1.9.1

Re: [PATCH] drm/amdgpu: fix the lost duplicates checking

[Greg KH]

On Mon, Dec 07, 2015 at 05:08:13PM +0800, Chunming Zhou wrote:
> Change-Id: I657039670b2c022ac461f14094cd909b10c1a2a8

Why is this here?

> Signed-off-by: Chunming Zhou <David1.Zhou@amd.com>
> Reviewed-by: Christian K�nig <christian.koenig@amd.com>
> Reviewed-by: Jammy Zhou <Jammy.Zhou@amd.com>
> ---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 8 ++++++++
>  1 file changed, 8 insertions(+)

<formletter>

This is not the correct way to submit patches for inclusion in the
stable kernel tree.  Please read Documentation/stable_kernel_rules.txt
for how to do this properly.

</formletter>

Re: [PATCH] drm/amdgpu: fix the lost duplicates checking

[Christian König]

On 07.12.2015 13:15, Greg KH wrote:
> <formletter>
>
> This is not the correct way to submit patches for inclusion in the
> stable kernel tree.  Please read Documentation/stable_kernel_rules.txt
> for how to do this properly.
>
> </formletter>

Sorry that's my fault. I noted that we need to add a Cc: 
stable@vger.kernel.org tag to the patch before pushing it upstream and 
the David obviously misunderstood that he should send it as a mail to 
stable@vger.kernel.org.

Please ignore this mail and *DON'T* add it to the stable tree. This 
patch should make it's normal way though into the kernel through the 
subsystem maintainer.

Best regards,
Christian.