All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Christian König" <ckoenig.leichtzumerken@gmail.com>
To: dri-devel@lists.freedesktop.org, daniel.vetter@ffwll.ch,
	nouveau@lists.freedesktop.org, amd-gfx@lists.freedesktop.org
Subject: [Nouveau] [PATCH 1/3] drm/nouveau: wait for moving fence after pinning
Date: Mon, 21 Jun 2021 15:03:26 +0200	[thread overview]
Message-ID: <20210621130328.11070-1-christian.koenig@amd.com> (raw)

We actually need to wait for the moving fence after pinning
the BO to make sure that the pin is completed.

Signed-off-by: Christian König <christian.koenig@amd.com>
CC: stable@kernel.org
---
 drivers/gpu/drm/nouveau/nouveau_prime.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/nouveau/nouveau_prime.c b/drivers/gpu/drm/nouveau/nouveau_prime.c
index 347488685f74..591738545eba 100644
--- a/drivers/gpu/drm/nouveau/nouveau_prime.c
+++ b/drivers/gpu/drm/nouveau/nouveau_prime.c
@@ -93,7 +93,13 @@ int nouveau_gem_prime_pin(struct drm_gem_object *obj)
 	if (ret)
 		return -EINVAL;
 
-	return 0;
+	if (nvbo->bo.moving) {
+		ret = dma_fence_wait(nvbo->bo.moving, true);
+		if (ret)
+			nouveau_bo_unpin(nvbo);
+	}
+
+	return ret;
 }
 
 void nouveau_gem_prime_unpin(struct drm_gem_object *obj)
-- 
2.25.1

_______________________________________________
Nouveau mailing list
Nouveau@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/nouveau

WARNING: multiple messages have this Message-ID (diff)
From: "Christian König" <ckoenig.leichtzumerken@gmail.com>
To: dri-devel@lists.freedesktop.org, daniel.vetter@ffwll.ch,
	nouveau@lists.freedesktop.org, amd-gfx@lists.freedesktop.org
Subject: [PATCH 1/3] drm/nouveau: wait for moving fence after pinning
Date: Mon, 21 Jun 2021 15:03:26 +0200	[thread overview]
Message-ID: <20210621130328.11070-1-christian.koenig@amd.com> (raw)

We actually need to wait for the moving fence after pinning
the BO to make sure that the pin is completed.

Signed-off-by: Christian König <christian.koenig@amd.com>
CC: stable@kernel.org
---
 drivers/gpu/drm/nouveau/nouveau_prime.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/nouveau/nouveau_prime.c b/drivers/gpu/drm/nouveau/nouveau_prime.c
index 347488685f74..591738545eba 100644
--- a/drivers/gpu/drm/nouveau/nouveau_prime.c
+++ b/drivers/gpu/drm/nouveau/nouveau_prime.c
@@ -93,7 +93,13 @@ int nouveau_gem_prime_pin(struct drm_gem_object *obj)
 	if (ret)
 		return -EINVAL;
 
-	return 0;
+	if (nvbo->bo.moving) {
+		ret = dma_fence_wait(nvbo->bo.moving, true);
+		if (ret)
+			nouveau_bo_unpin(nvbo);
+	}
+
+	return ret;
 }
 
 void nouveau_gem_prime_unpin(struct drm_gem_object *obj)
-- 
2.25.1


WARNING: multiple messages have this Message-ID (diff)
From: "Christian König" <ckoenig.leichtzumerken@gmail.com>
To: dri-devel@lists.freedesktop.org, daniel.vetter@ffwll.ch,
	nouveau@lists.freedesktop.org, amd-gfx@lists.freedesktop.org
Subject: [PATCH 1/3] drm/nouveau: wait for moving fence after pinning
Date: Mon, 21 Jun 2021 15:03:26 +0200	[thread overview]
Message-ID: <20210621130328.11070-1-christian.koenig@amd.com> (raw)

We actually need to wait for the moving fence after pinning
the BO to make sure that the pin is completed.

Signed-off-by: Christian König <christian.koenig@amd.com>
CC: stable@kernel.org
---
 drivers/gpu/drm/nouveau/nouveau_prime.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/nouveau/nouveau_prime.c b/drivers/gpu/drm/nouveau/nouveau_prime.c
index 347488685f74..591738545eba 100644
--- a/drivers/gpu/drm/nouveau/nouveau_prime.c
+++ b/drivers/gpu/drm/nouveau/nouveau_prime.c
@@ -93,7 +93,13 @@ int nouveau_gem_prime_pin(struct drm_gem_object *obj)
 	if (ret)
 		return -EINVAL;
 
-	return 0;
+	if (nvbo->bo.moving) {
+		ret = dma_fence_wait(nvbo->bo.moving, true);
+		if (ret)
+			nouveau_bo_unpin(nvbo);
+	}
+
+	return ret;
 }
 
 void nouveau_gem_prime_unpin(struct drm_gem_object *obj)
-- 
2.25.1

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

             reply	other threads:[~2021-06-21 13:03 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-06-21 13:03 Christian König [this message]
2021-06-21 13:03 ` [PATCH 1/3] drm/nouveau: wait for moving fence after pinning Christian König
2021-06-21 13:03 ` Christian König
2021-06-21 13:03 ` [Nouveau] [PATCH 2/3] drm/radeon: " Christian König
2021-06-21 13:03   ` Christian König
2021-06-21 13:03   ` Christian König
2021-06-21 14:55   ` [Nouveau] " Daniel Vetter
2021-06-21 14:55     ` Daniel Vetter
2021-06-21 14:55     ` Daniel Vetter
2021-06-21 13:03 ` [Nouveau] [PATCH 3/3] drm/amdgpu: " Christian König
2021-06-21 13:03   ` Christian König
2021-06-21 13:03   ` Christian König
2021-06-21 14:56   ` [Nouveau] " Daniel Vetter
2021-06-21 14:56     ` Daniel Vetter
2021-06-21 14:56     ` Daniel Vetter
2021-06-21 14:54 ` [Nouveau] [PATCH 1/3] drm/nouveau: " Daniel Vetter
2021-06-21 14:54   ` Daniel Vetter
2021-06-21 14:54   ` Daniel Vetter
2021-06-21 15:49   ` [Nouveau] " Christian König
2021-06-21 15:49     ` Christian König
2021-06-21 15:49     ` Christian König
2021-06-21 15:53     ` [Nouveau] " Daniel Vetter
2021-06-21 15:53       ` Daniel Vetter
2021-06-21 15:53       ` Daniel Vetter
2021-06-22  9:20       ` [Nouveau] " Daniel Vetter
2021-06-22  9:20         ` Daniel Vetter
2021-06-22  9:20         ` Daniel Vetter
2021-06-22  9:29         ` [Nouveau] " Christian König
2021-06-22  9:29           ` Christian König
2021-06-22  9:29           ` Christian König

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210621130328.11070-1-christian.koenig@amd.com \
    --to=ckoenig.leichtzumerken@gmail.com \
    --cc=amd-gfx@lists.freedesktop.org \
    --cc=daniel.vetter@ffwll.ch \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=nouveau@lists.freedesktop.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.