Merge branch 'linux-4.10' of git://github.com/skeggsb/linux into drm-fixes
authorDave Airlie <airlied@redhat.com>
Tue, 31 Jan 2017 19:28:14 +0000 (05:28 +1000)
committerDave Airlie <airlied@redhat.com>
Tue, 31 Jan 2017 19:28:14 +0000 (05:28 +1000)
commitedc67410449c668434b183bb0f770b7bf456c750
tree9e75490ab352bf7d2e4a689ee761656d3dafc7d1
parent566cf877a1fcb6d6dc0126b076aad062054c2637
parent2b5078937355c0d662ecef54b7d4d04f48da4fa9
Merge branch 'linux-4.10' of git://github.com/skeggsb/linux into drm-fixes

Just a couple of minor race/regression fixes, nothing exciting, but
somewhat important

* 'linux-4.10' of git://github.com/skeggsb/linux:
  drm/nouveau/kms/nv50: request vblank events for commits that send completion events
  drm/nouveau/nv1a,nv1f/disp: fix memory clock rate retrieval
  drm/nouveau/disp/gt215: Fix HDA ELD handling (thus, HDMI audio) on gt215
  drm/nouveau/nouveau/led: prevent compiling the led-code if nouveau=y and leds=m
  drm/nouveau/disp/mcp7x: disable dptmds workaround
  drm/nouveau: prevent userspace from deleting client object
  drm/nouveau/fence/g84-: protect against concurrent access to semaphore buffers