Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5be73b69 authored by Jérôme Glisse's avatar Jérôme Glisse Committed by Ben Skeggs
Browse files

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: default avatarJérôme Glisse <jglisse@redhat.com>
parent eeaf06ac

drivers/gpu/drm/nouveau/Kbuild

+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ nouveau-y += nouveau_vga.o 
nouveau-y += nouveau_bo.o

nouveau-y += nouveau_gem.o

nouveau-$(CONFIG_DRM_NOUVEAU_SVM) += nouveau_svm.o

nouveau-$(CONFIG_DRM_NOUVEAU_SVM) += nouveau_dmem.o

nouveau-y += nouveau_mem.o

nouveau-y += nouveau_prime.o

nouveau-y += nouveau_sgdma.o

drivers/gpu/drm/nouveau/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ config DRM_NOUVEAU_SVM 
	depends on DRM_NOUVEAU

	depends on STAGING

	select HMM_MIRROR

	select DEVICE_PRIVATE

	default n

	help

	  Say Y here if you want to enable experimental support for

drivers/gpu/drm/nouveau/nouveau_dmem.c

0 → 100644
+912 −0

File added.

Preview size limit exceeded, changes collapsed.

drivers/gpu/drm/nouveau/nouveau_dmem.h

0 → 100644
+60 −0

File added.

Preview size limit exceeded, changes collapsed.

drivers/gpu/drm/nouveau/nouveau_drm.c

+5 −0
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ 
#include "nouveau_connector.h"

#include "nouveau_platform.h"

#include "nouveau_svm.h"

#include "nouveau_dmem.h"



MODULE_PARM_DESC(config, "option string to pass to driver core");

static char *nouveau_config;
@@ -551,6 +552,7 @@ nouveau_drm_device_init(struct drm_device *dev) 
	nouveau_debugfs_init(drm);

	nouveau_hwmon_init(dev);

	nouveau_svm_init(drm);

	nouveau_dmem_init(drm);

	nouveau_fbcon_init(dev);

	nouveau_led_init(dev);
@@ -594,6 +596,7 @@ nouveau_drm_device_fini(struct drm_device *dev) 


	nouveau_led_fini(dev);

	nouveau_fbcon_fini(dev);

	nouveau_dmem_fini(drm);

	nouveau_svm_fini(drm);

	nouveau_hwmon_fini(dev);

	nouveau_debugfs_fini(drm);
@@ -741,6 +744,7 @@ nouveau_do_suspend(struct drm_device *dev, bool runtime) 
	int ret;



	nouveau_svm_suspend(drm);

	nouveau_dmem_suspend(drm);

	nouveau_led_suspend(dev);



	if (dev->mode_config.num_crtc) {
@@ -817,6 +821,7 @@ nouveau_do_resume(struct drm_device *dev, bool runtime) 
	}



	nouveau_led_resume(dev);

	nouveau_dmem_resume(drm);

	nouveau_svm_resume(drm);

	return 0;

}