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

Commit 2ef7a95f authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'linux-4.15' of git://github.com/skeggsb/linux into drm-next 

- Pascal temperature sensor support
- Improved BAR2 handling, greatly reduces time required to suspend
- Rework of the MMU code
  - Allows us to properly support Pascal's new MMU layout (implemented)
  - Lays the groundwork for improved userspace APIs later
- Misc other fixes

* 'linux-4.15' of git://github.com/skeggsb/linux: (151 commits)
  drm/nouveau/gr/gf100-: don't prevent module load if firmware missing
  drm/nouveau/mmu: remove old vmm frontend
  drm/nouveau: improve selection of GPU page size
  drm/nouveau: switch over to new memory and vmm interfaces
  drm/nouveau: remove unused nouveau_fence_work()
  drm/nouveau: queue delayed unmapping of VMAs on client workqueue
  drm/nouveau: implement per-client delayed workqueue with fence support
  drm/nouveau: determine memory class for each client
  drm/nouveau: pass handle of vmm object to channel allocation ioctls
  drm/nouveau: switch to vmm limit
  drm/nouveau: allocate vmm object for every client
  drm/nouveau: replace use of cpu_coherent with memory types
  drm/nouveau: use nvif_mmu_type to determine BAR1 caching
  drm/nouveau: fetch memory type indices that we care about for ttm
  drm/nouveau: consolidate handling of dma mask
  drm/nouveau: check kind validity against mmu object
  drm/nouveau: allocate mmu object for every client
  drm/nouveau: remove trivial cases of nvxx_device() usage
  drm/nouveau/mmu: define user interfaces to mmu vmm opertaions
  drm/nouveau/mmu: define user interfaces to mmu memory allocation
  ...
parents 7a88cbd8 46bda4f4

drivers/gpu/drm/nouveau/Kbuild

+2 −0
Original line number Diff line number Diff line
@@ -30,9 +30,11 @@ nouveau-y += nouveau_vga.o 
# DRM - memory management

nouveau-y += nouveau_bo.o

nouveau-y += nouveau_gem.o

nouveau-y += nouveau_mem.o

nouveau-y += nouveau_prime.o

nouveau-y += nouveau_sgdma.o

nouveau-y += nouveau_ttm.o

nouveau-y += nouveau_vmm.o



# DRM - modesetting

nouveau-$(CONFIG_DRM_NOUVEAU_BACKLIGHT) += nouveau_backlight.o

drivers/gpu/drm/nouveau/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -56,6 +56,13 @@ config NOUVEAU_DEBUG_DEFAULT 
	help

	  Selects the default debug level



config NOUVEAU_DEBUG_MMU

	bool "Enable additional MMU debugging"

	depends on DRM_NOUVEAU

	default n

	help

	  Say Y here if you want to enable verbose MMU debug output.



config DRM_NOUVEAU_BACKLIGHT

	bool "Support for backlight control"

	depends on DRM_NOUVEAU

drivers/gpu/drm/nouveau/dispnv04/disp.c

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ nv04_display_create(struct drm_device *dev) 
	if (!disp)

		return -ENOMEM;



	nvif_object_map(&drm->client.device.object);

	nvif_object_map(&drm->client.device.object, NULL, 0);



	nouveau_display(dev)->priv = disp;

	nouveau_display(dev)->dtor = nv04_display_destroy;

drivers/gpu/drm/nouveau/include/nvif/cl506e.h

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ struct nv50_channel_dma_v0 { 
	__u8  version;

	__u8  chid;

	__u8  pad02[6];

	__u64 vm;

	__u64 vmm;

	__u64 pushbuf;

	__u64 offset;

};

drivers/gpu/drm/nouveau/include/nvif/cl506f.h

+1 −1
Original line number Diff line number Diff line
@@ -8,6 +8,6 @@ struct nv50_channel_gpfifo_v0 { 
	__u32 ilength;

	__u64 ioffset;

	__u64 pushbuf;

	__u64 vm;

	__u64 vmm;

};

#endif