Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux

Browse source

Pull drm fixes from Dave Airlie:
 "Not much happening, should have dequeued this lot earlier.

  One amdgpu, one nouveau and one exynos fix"

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  drm/exynos: atomic check only enabled crtc states
  drm/nouveau/bios/fan: hardcode the fan mode to linear
  drm/amdgpu: fix user fence handling

...

This commit is contained in:

Linus Torvalds 2015-12-23 10:11:12 -08:00

parent 24bc3ea5df 1957d62c29

commit 2bfd43d806

4 changed files with 48 additions and 22 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

3

drivers/gpu/drm/amd/amdgpu/amdgpu.h

View file

63

drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c

View file

3

drivers/gpu/drm/exynos/exynos_drm_crtc.c

View file

1

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

View file