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

Browse source

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

...

This commit is contained in:

Dave Airlie 2017-12-19 13:21:11 +10:00

parent 38f73db768 74a39954a4

commit 51b83e1428

9 changed files with 62 additions and 21 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

5

drivers/gpu/drm/nouveau/nouveau_bo.c

View file

11

drivers/gpu/drm/nouveau/nouveau_drv.h

View file

2

drivers/gpu/drm/nouveau/nouveau_fbcon.c

View file

6

drivers/gpu/drm/nouveau/nouveau_mem.c

View file

41

drivers/gpu/drm/nouveau/nouveau_ttm.c

View file

2

drivers/gpu/drm/nouveau/nvkm/engine/device/base.c

View file

9

drivers/gpu/drm/nouveau/nvkm/subdev/bios/dp.c

View file

2

drivers/gpu/drm/nouveau/nvkm/subdev/instmem/nv50.c

View file

7

drivers/gpu/drm/nouveau/nvkm/subdev/pci/base.c

View file