Dave Airlie
cd84579112
Merge branch 'linux-5.1' of git://github.com/skeggsb/linux into drm-fixes
...
Some minor nouveau dmem and other fixes.
Signed-off-by: Dave Airlie <airlied@redhat.com >
From: Ben Skeggs <bskeggs@redhat.com >
Link: https://patchwork.freedesktop.org/patch/msgid/CABDvA==kMkD6n-cS9KpQBcTU1E8p7Wc+H1ZuOhSfD7yTFJVvkw@mail.gmail.com
2019-03-22 10:39:35 +10:00
Jérôme Glisse
8385741807
drm/nouveau/dmem: empty chunk do not have a buffer object associated with them.
...
Empty chunk do not have a bo associated with them so no need to pin/unpin
on suspend/resume.
This fix suspend/resume on 5.1rc1 when NOUVEAU_SVM is enabled.
Signed-off-by: Jérôme Glisse <jglisse@redhat.com >
Reviewed-by: Tobias Klausmann <tobias.johannes.klausmann@mni.thm.de >
Tested-by: Tobias Klausmann <tobias.johannes.klausmann@mni.thm.de >
Cc: Ben Skeggs <bskeggs@redhat.com >
Cc: dri-devel@lists.freedesktop.org
Cc: nouveau@lists.freedesktop.org
Cc: David Airlie <airlied@linux.ie >
Cc: Daniel Vetter <daniel@ffwll.ch >
Signed-off-by: Ben Skeggs <bskeggs@redhat.com >
2019-03-22 09:58:38 +10:00
Dan Carpenter
18ec3c129b
drm/nouveau/dmem: Fix a NULL vs IS_ERR() check
...
The hmm_devmem_add() function doesn't return NULL, it returns error
pointers.
Fixes: 5be73b6908
("drm/nouveau/dmem: device memory helpers for SVM")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com >
Signed-off-by: Ben Skeggs <bskeggs@redhat.com >
2019-03-22 09:57:58 +10:00
YueHaibing
2219c9ee92
drm/nouveau/dmem: remove set but not used variable 'drm'
...
Fixes gcc '-Wunused-but-set-variable' warning:
drivers/gpu/drm/nouveau/nouveau_dmem.c: In function 'nouveau_dmem_free':
drivers/gpu/drm/nouveau/nouveau_dmem.c:103:22: warning:
variable 'drm' set but not used [-Wunused-but-set-variable]
struct nouveau_drm *drm;
^
Signed-off-by: YueHaibing <yuehaibing@huawei.com >
Signed-off-by: Ben Skeggs <bskeggs@redhat.com >
2019-03-22 09:57:58 +10:00
Souptick Joarder
b57e622e6d
mm/hmm: convert to use vm_fault_t
...
Convert to use vm_fault_t type as return type for fault handler.
kbuild reported warning during testing of
*mm-create-the-new-vm_fault_t-type.patch* available in below link -
https://patchwork.kernel.org/patch/10752741/
kernel/memremap.c:46:34: warning: incorrect type in return expression
(different base types)
kernel/memremap.c:46:34: expected restricted vm_fault_t
kernel/memremap.c:46:34: got int
This patch has fixed the warnings and also hmm_devmem_fault() is
converted to return vm_fault_t to avoid further warnings.
[sfr@canb.auug.org.au: drm/nouveau/dmem: update for struct hmm_devmem_ops member change]
Link: http://lkml.kernel.org/r/20190220174407.753d94e5@canb.auug.org.au
Link: http://lkml.kernel.org/r/20190110145900.GA1317@jordon-HP-15-Notebook-PC
Signed-off-by: Souptick Joarder <jrdr.linux@gmail.com >
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au >
Reviewed-by: Jérôme Glisse <jglisse@redhat.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2019-03-12 10:04:00 -07:00
Ben Skeggs
a788ade4f6
drm/nouveau/dmem: use dma addresses during migration copies
...
Removes the need for temporary VMM mappings.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com >
2019-02-20 09:00:03 +10:00
Ben Skeggs
fd5e985643
drm/nouveau/dmem: use physical vram addresses during migration copies
...
Removes the need for temporary VMM mappings.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com >
2019-02-20 09:00:03 +10:00
Ben Skeggs
6c762d1b18
drm/nouveau/dmem: extend copy function to allow direct use of physical addresses
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com >
2019-02-20 09:00:03 +10:00
Jérôme Glisse
5be73b6908
drm/nouveau/dmem: device memory helpers for SVM
...
Device memory can be use in SVM, in which case we do not have any of
the existing buffer object. This commit add infrastructure to allow
use of device memory without nouveau_bo. Again this is a temporary
solution until a rework of GPU memory management.
Signed-off-by: Jérôme Glisse <jglisse@redhat.com >
2019-02-20 09:00:02 +10:00