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

Browse source

Pull drm fixes from Dave Airlie:
 "Back from holidays, found these in the cracks: one nouveau revert, one
  vmwgfx locking fix and a bunch of exynos fixes"

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  Revert "drm/nouveau/fifo/gk104: kick channels when deactivating them"
  drm/vmwgfx: Fix execbuf locking issues
  drm/exynos/fimc: fix runtime pm support
  drm/exynos/mixer: always update INT_EN cache
  drm/exynos/mixer: correct vsync configuration sequence
  drm/exynos/mixer: fix interrupt clearing
  drm/exynos/hdmi: fix edid memory leak
  drm/exynos: gsc: fix wrong bitwise operation for swap detection

...

This commit is contained in:

Linus Torvalds 2015-08-14 10:39:32 -07:00

parent 7ddab73346 d211d87e14

commit c679765416

6 changed files with 32 additions and 36 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

1

drivers/gpu/drm/exynos/exynos_drm_fimc.c

View file

6

drivers/gpu/drm/exynos/exynos_drm_gsc.c

View file

7

drivers/gpu/drm/exynos/exynos_hdmi.c

View file

21

drivers/gpu/drm/exynos/exynos_mixer.c

View file

29

drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.c

View file

4

drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c

View file