diff options
| author | Daniel Vetter | 2016-10-28 09:14:08 +0200 |
|---|---|---|
| committer | Daniel Vetter | 2016-10-28 09:14:08 +0200 |
| commit | 96583ddbec291929880edefa2141c06c63e16aa5 (patch) | |
| tree | 6ae6bd3aec381d7461a687e3314bdf949798c554 /drivers/gpu/drm/nouveau/nvkm/subdev/fb/ram.h | |
| parent | drm/i915: Correct pipe fault reporting string (diff) | |
| parent | Merge branch 'linux-4.9' of git://github.com/skeggsb/linux into drm-next (diff) | |
| download | kernel-qcow2-linux-96583ddbec291929880edefa2141c06c63e16aa5.tar.gz kernel-qcow2-linux-96583ddbec291929880edefa2141c06c63e16aa5.tar.xz kernel-qcow2-linux-96583ddbec291929880edefa2141c06c63e16aa5.zip | |
Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next-queued
Backmerge latest drm-next to pull in the s/fence/dma_fence/ rework,
needed before we merge more i915 fencing patches.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/subdev/fb/ram.h')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/subdev/fb/ram.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ram.h b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ram.h index b9ec0ae6723a..b60068b7d8f9 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ram.h +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ram.h @@ -24,6 +24,7 @@ int gf100_ram_ctor(const struct nvkm_ram_func *, struct nvkm_fb *, int gf100_ram_get(struct nvkm_ram *, u64, u32, u32, u32, struct nvkm_mem **); void gf100_ram_put(struct nvkm_ram *, struct nvkm_mem **); +int gk104_ram_ctor(struct nvkm_fb *, struct nvkm_ram **, u32); int gk104_ram_init(struct nvkm_ram *ram); /* RAM type-specific MR calculation routines */ |