diff options
| author | Dave Airlie <airlied@redhat.com> | 2017-12-19 13:21:11 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2017-12-19 13:21:11 +1000 |
| commit | 51b83e142834638d4fdb4d628ec8602b1107d91b (patch) | |
| tree | 8e4290262cfc2f439817e179fb5dd0f03baf8093 /drivers/gpu/drm/nouveau/nvkm/subdev/instmem | |
| parent | 38f73db7683db1ef0b16cb1fedf6e8e309cf08b8 (diff) | |
| parent | 74a39954a4900a7dea7010e3063e2bf16b23934b (diff) | |
| download | linux-51b83e142834638d4fdb4d628ec8602b1107d91b.tar.bz2 | |
Merge branch 'linux-4.15' of git://github.com/skeggsb/linux into drm-fixes
nouveau regression fixes, and some minor fixes.
* 'linux-4.15' of git://github.com/skeggsb/linux:
drm/nouveau: use alternate memory type for system-memory buffers with kind != 0
drm/nouveau: avoid GPU page sizes > PAGE_SIZE for buffer objects in host memory
drm/nouveau/mmu/gp10b: use correct implementation
drm/nouveau/pci: do a msi rearm on init
drm/nouveau/imem/nv50: fix refcount_t warning
drm/nouveau/bios/dp: support DP Info Table 2.0
drm/nouveau/fbcon: fix NULL pointer access in nouveau_fbcon_destroy
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/subdev/instmem')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/subdev/instmem/nv50.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/instmem/nv50.c b/drivers/gpu/drm/nouveau/nvkm/subdev/instmem/nv50.c index 1ba7289684aa..db48a1daca0c 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/instmem/nv50.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/instmem/nv50.c @@ -249,7 +249,7 @@ nv50_instobj_acquire(struct nvkm_memory *memory) iobj->base.memory.ptrs = &nv50_instobj_fast; else iobj->base.memory.ptrs = &nv50_instobj_slow; - refcount_inc(&iobj->maps); + refcount_set(&iobj->maps, 1); } mutex_unlock(&imem->subdev.mutex); |