OSDN Git Service
(root)
/
tomoyo
/
tomoyo-test1.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
12b6847
)
drm/nouveau/ttm: memcpy waits for bo already
author
Dave Airlie
<airlied@redhat.com>
Thu, 24 Sep 2020 05:18:28 +0000
(15:18 +1000)
committer
Dave Airlie
<airlied@redhat.com>
Tue, 6 Oct 2020 00:23:24 +0000
(10:23 +1000)
no need for driver to wait here.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Ben Skeggs <bskeggs@redhat.com>
Link:
https://patchwork.freedesktop.org/patch/msgid/20200924051845.397177-29-airlied@gmail.com
drivers/gpu/drm/nouveau/nouveau_bo.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/nouveau/nouveau_bo.c
b/drivers/gpu/drm/nouveau/nouveau_bo.c
index
c7f42c4
..
0c0ca44
100644
(file)
--- a/
drivers/gpu/drm/nouveau/nouveau_bo.c
+++ b/
drivers/gpu/drm/nouveau/nouveau_bo.c
@@
-1085,9
+1085,7
@@
nouveau_bo_move(struct ttm_buffer_object *bo, bool evict,
}
/* Fallback to software copy. */
- ret = ttm_bo_wait_ctx(bo, ctx);
- if (ret == 0)
- ret = ttm_bo_move_memcpy(bo, ctx, new_reg);
+ ret = ttm_bo_move_memcpy(bo, ctx, new_reg);
out:
if (drm->client.device.info.family < NV_DEVICE_INFO_V0_TESLA) {