diff options
| author | Dave Airlie <airlied@redhat.com> | 2017-11-02 07:00:35 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2017-11-02 07:00:53 +0300 |
| commit | 2ef7a95fe537c0e2ee039179ecab27e6d63fa1e1 (patch) | |
| tree | 9ef67d24ff8e9b5242eb545237e9dddcd3463a7c /drivers/gpu/drm/nouveau/nvkm/subdev/fb/g84.c | |
| parent | 7a88cbd8d65d622c00bd76ba4ae1d893b292c91c (diff) | |
| parent | 46bda4f4af5d061ce07148e833ff4deb50737536 (diff) | |
| download | linux-2ef7a95fe537c0e2ee039179ecab27e6d63fa1e1.tar.xz | |
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
...
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/subdev/fb/g84.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/subdev/fb/g84.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/g84.c b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/g84.c index 9c28392d07e4..06bf95c0c549 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/g84.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/g84.c @@ -27,6 +27,7 @@ static const struct nv50_fb_func g84_fb = { .ram_new = nv50_ram_new, + .tags = nv20_fb_tags, .trap = 0x001d07ff, }; |