All of lore.kernel.org
 help / color / mirror / Atom feed
From: Karol Herbst <kherbst@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: Ben Skeggs <bskeggs@redhat.com>, Lyude Paul <lyude@redhat.com>,
	dri-devel@lists.freedesktop.org, nouveau@lists.freedesktop.org,
	Karol Herbst <kherbst@redhat.com>,
	stable@vger.kernel.org
Subject: [PATCH] nouveau: explicitly wait on the fence in nouveau_bo_move_m2mf
Date: Fri, 19 Aug 2022 22:09:28 +0200	[thread overview]
Message-ID: <20220819200928.401416-1-kherbst@redhat.com> (raw)

It is a bit unlcear to us why that's helping, but it does and unbreaks
suspend/resume on a lot of GPUs without any known drawbacks.

Cc: stable@vger.kernel.org # v5.15+
Closes: https://gitlab.freedesktop.org/drm/nouveau/-/issues/156
Signed-off-by: Karol Herbst <kherbst@redhat.com>
---
 drivers/gpu/drm/nouveau/nouveau_bo.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c
index 35bb0bb3fe61..126b3c6e12f9 100644
--- a/drivers/gpu/drm/nouveau/nouveau_bo.c
+++ b/drivers/gpu/drm/nouveau/nouveau_bo.c
@@ -822,6 +822,15 @@ nouveau_bo_move_m2mf(struct ttm_buffer_object *bo, int evict,
 		if (ret == 0) {
 			ret = nouveau_fence_new(chan, false, &fence);
 			if (ret == 0) {
+				/* TODO: figure out a better solution here
+				 *
+				 * wait on the fence here explicitly as going through
+				 * ttm_bo_move_accel_cleanup somehow doesn't seem to do it.
+				 *
+				 * Without this the operation can timeout and we'll fallback to a
+				 * software copy, which might take several minutes to finish.
+				 */
+				nouveau_fence_wait(fence, false, false);
 				ret = ttm_bo_move_accel_cleanup(bo,
 								&fence->base,
 								evict, false,
-- 
2.37.1


WARNING: multiple messages have this Message-ID (diff)
From: Karol Herbst <kherbst@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: nouveau@lists.freedesktop.org, dri-devel@lists.freedesktop.org,
	stable@vger.kernel.org, Ben Skeggs <bskeggs@redhat.com>
Subject: [Nouveau] [PATCH] nouveau: explicitly wait on the fence in nouveau_bo_move_m2mf
Date: Fri, 19 Aug 2022 22:09:28 +0200	[thread overview]
Message-ID: <20220819200928.401416-1-kherbst@redhat.com> (raw)

It is a bit unlcear to us why that's helping, but it does and unbreaks
suspend/resume on a lot of GPUs without any known drawbacks.

Cc: stable@vger.kernel.org # v5.15+
Closes: https://gitlab.freedesktop.org/drm/nouveau/-/issues/156
Signed-off-by: Karol Herbst <kherbst@redhat.com>
---
 drivers/gpu/drm/nouveau/nouveau_bo.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c
index 35bb0bb3fe61..126b3c6e12f9 100644
--- a/drivers/gpu/drm/nouveau/nouveau_bo.c
+++ b/drivers/gpu/drm/nouveau/nouveau_bo.c
@@ -822,6 +822,15 @@ nouveau_bo_move_m2mf(struct ttm_buffer_object *bo, int evict,
 		if (ret == 0) {
 			ret = nouveau_fence_new(chan, false, &fence);
 			if (ret == 0) {
+				/* TODO: figure out a better solution here
+				 *
+				 * wait on the fence here explicitly as going through
+				 * ttm_bo_move_accel_cleanup somehow doesn't seem to do it.
+				 *
+				 * Without this the operation can timeout and we'll fallback to a
+				 * software copy, which might take several minutes to finish.
+				 */
+				nouveau_fence_wait(fence, false, false);
 				ret = ttm_bo_move_accel_cleanup(bo,
 								&fence->base,
 								evict, false,
-- 
2.37.1


WARNING: multiple messages have this Message-ID (diff)
From: Karol Herbst <kherbst@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: Karol Herbst <kherbst@redhat.com>,
	nouveau@lists.freedesktop.org, dri-devel@lists.freedesktop.org,
	stable@vger.kernel.org, Ben Skeggs <bskeggs@redhat.com>
Subject: [PATCH] nouveau: explicitly wait on the fence in nouveau_bo_move_m2mf
Date: Fri, 19 Aug 2022 22:09:28 +0200	[thread overview]
Message-ID: <20220819200928.401416-1-kherbst@redhat.com> (raw)

It is a bit unlcear to us why that's helping, but it does and unbreaks
suspend/resume on a lot of GPUs without any known drawbacks.

Cc: stable@vger.kernel.org # v5.15+
Closes: https://gitlab.freedesktop.org/drm/nouveau/-/issues/156
Signed-off-by: Karol Herbst <kherbst@redhat.com>
---
 drivers/gpu/drm/nouveau/nouveau_bo.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c
index 35bb0bb3fe61..126b3c6e12f9 100644
--- a/drivers/gpu/drm/nouveau/nouveau_bo.c
+++ b/drivers/gpu/drm/nouveau/nouveau_bo.c
@@ -822,6 +822,15 @@ nouveau_bo_move_m2mf(struct ttm_buffer_object *bo, int evict,
 		if (ret == 0) {
 			ret = nouveau_fence_new(chan, false, &fence);
 			if (ret == 0) {
+				/* TODO: figure out a better solution here
+				 *
+				 * wait on the fence here explicitly as going through
+				 * ttm_bo_move_accel_cleanup somehow doesn't seem to do it.
+				 *
+				 * Without this the operation can timeout and we'll fallback to a
+				 * software copy, which might take several minutes to finish.
+				 */
+				nouveau_fence_wait(fence, false, false);
 				ret = ttm_bo_move_accel_cleanup(bo,
 								&fence->base,
 								evict, false,
-- 
2.37.1


             reply	other threads:[~2022-08-19 20:09 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-08-19 20:09 Karol Herbst [this message]
2022-08-19 20:09 ` [PATCH] nouveau: explicitly wait on the fence in nouveau_bo_move_m2mf Karol Herbst
2022-08-19 20:09 ` [Nouveau] " Karol Herbst
2022-08-22 21:15 ` Lyude Paul
2022-08-22 21:15   ` Lyude Paul
2022-08-22 21:15   ` [Nouveau] " Lyude Paul
2022-09-20 10:42 ` Salvatore Bonaccorso
2022-09-20 10:42   ` Salvatore Bonaccorso
2022-09-20 10:42   ` [Nouveau] " Salvatore Bonaccorso
2022-09-20 11:36   ` Karol Herbst
2022-09-20 11:36     ` Karol Herbst
2022-09-20 11:36     ` [Nouveau] " Karol Herbst
2022-09-20 11:59     ` Salvatore Bonaccorso
2022-09-20 11:59       ` Salvatore Bonaccorso
2022-09-20 11:59       ` [Nouveau] " Salvatore Bonaccorso
2022-09-30 21:09       ` Computer Enthusiastic
2022-09-30 21:09         ` Computer Enthusiastic
2022-09-30 21:09         ` Computer Enthusiastic
2022-11-01  6:44 ` [Nouveau] " Computer Enthusiastic
2022-11-01 10:46   ` Karol Herbst
2022-12-23  9:43     ` Computer Enthusiastic
2023-01-28 14:49       ` Computer Enthusiastic
2023-01-28 14:49         ` Computer Enthusiastic
2023-01-28 17:51         ` Greg KH
2023-01-28 17:51           ` Greg KH
2023-01-28 19:49           ` Salvatore Bonaccorso
2023-01-28 19:49             ` Salvatore Bonaccorso
2023-01-29 21:36             ` Computer Enthusiastic
2023-01-29 21:36               ` Computer Enthusiastic
2023-01-30 10:05               ` Greg KH
2023-01-30 10:05                 ` Greg KH
2023-01-30 22:27                 ` Lyude Paul
2023-01-30 22:27                   ` Lyude Paul
2023-02-01 19:24                   ` Computer Enthusiastic
2023-02-01 19:24                     ` Computer Enthusiastic
2022-11-19  5:20 ` Computer Enthusiastic
2022-11-19  5:20   ` Computer Enthusiastic

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=20220819200928.401416-1-kherbst@redhat.com \
    --to=kherbst@redhat.com \
    --cc=bskeggs@redhat.com \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=lyude@redhat.com \
    --cc=nouveau@lists.freedesktop.org \
    --cc=stable@vger.kernel.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.