Attachment 138243 Details for Bug 105633 – Possible fix

[patch] Possible fix

0001-drm-amdgpu-fix-mitigate-workaround-for-i915.patch (text/plain), 2.30 KB, created by Christian König on 2018-03-21 13:00:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Christian König

Created: 2018-03-21 13:00:30 UTC

Size: 2.30 KB

patch

obsolete

>From 8b56d3d8f87edb05be6ad93d2081a6147eef46f4 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com>
>Date: Wed, 21 Mar 2018 13:58:05 +0100
>Subject: [PATCH] drm/amdgpu: fix "mitigate workaround for i915"
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>Mixed up exporter and importer here. E.g. while mapping the BO we need
>to check the importer not the exporter.
>
>Signed-off-by: Christian KÃ¶nig <christian.koenig@amd.com>
>---
> drivers/gpu/drm/amd/amdgpu/amdgpu_prime.c | 8 +++++---
> 1 file changed, 5 insertions(+), 3 deletions(-)
>
>diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_prime.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_prime.c
>index 1c9991738477..4b584cb75bf4 100644
>--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_prime.c
>+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_prime.c
>@@ -132,6 +132,7 @@ static int amdgpu_gem_map_attach(struct dma_buf *dma_buf,
> {
> 	struct drm_gem_object *obj = dma_buf->priv;
> 	struct amdgpu_bo *bo = gem_to_amdgpu_bo(obj);
>+	struct amdgpu_device *adev = amdgpu_ttm_adev(bo->tbo.bdev);
> 	long r;
> 
> 	r = drm_gem_map_attach(dma_buf, target_dev, attach);
>@@ -143,7 +144,7 @@ static int amdgpu_gem_map_attach(struct dma_buf *dma_buf,
> 		goto error_detach;
> 
> 
>-	if (dma_buf->ops != &amdgpu_dmabuf_ops) {
>+	if (attach->dev->driver != adev->dev->driver) {
> 		/*
> 		 * Wait for all shared fences to complete before we switch to future
> 		 * use of exclusive fence on this prime shared bo.
>@@ -162,7 +163,7 @@ static int amdgpu_gem_map_attach(struct dma_buf *dma_buf,
> 	if (r)
> 		goto error_unreserve;
> 
>-	if (dma_buf->ops != &amdgpu_dmabuf_ops)
>+	if (attach->dev->driver != adev->dev->driver)
> 		bo->prime_shared_count++;
> 
> error_unreserve:
>@@ -179,6 +180,7 @@ static void amdgpu_gem_map_detach(struct dma_buf *dma_buf,
> {
> 	struct drm_gem_object *obj = dma_buf->priv;
> 	struct amdgpu_bo *bo = gem_to_amdgpu_bo(obj);
>+	struct amdgpu_device *adev = amdgpu_ttm_adev(bo->tbo.bdev);
> 	int ret = 0;
> 
> 	ret = amdgpu_bo_reserve(bo, true);
>@@ -186,7 +188,7 @@ static void amdgpu_gem_map_detach(struct dma_buf *dma_buf,
> 		goto error;
> 
> 	amdgpu_bo_unpin(bo);
>-	if (dma_buf->ops != &amdgpu_dmabuf_ops && bo->prime_shared_count)
>+	if (attach->dev->driver != adev->dev->driver && bo->prime_shared_count)
> 		bo->prime_shared_count--;
> 	amdgpu_bo_unreserve(bo);
> 
>-- 
>2.14.1
>

Actions: View | Splinter Review

Attachments on bug 105633: 138243

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.