Merge branch 'etnaviv/next' of https://git.pengutronix.de/git/lst/linux into drm...
authorDave Airlie <airlied@redhat.com>
Thu, 6 Apr 2017 19:38:27 +0000 (05:38 +1000)
committerDave Airlie <airlied@redhat.com>
Thu, 6 Apr 2017 19:38:27 +0000 (05:38 +1000)
commitaed93ee7d03eac9b7d21f08aebe8a7d9ea069e20
tree4d9ac85cf65b42a2896920b62d4d92f720ac5584
parent0e961332147851d16038d52323fc50e23dcbdfa3
parent78ec187f64fa5d8f837b8fc5bbbad88a89b63ab4
Merge branch 'etnaviv/next' of https://git.pengutronix.de/git/lst/linux into drm-next

Highlights:
- Cooling device support from Russell, to allow GPU throttling on system
thermal overload.
- Explicit fencing support from Philipp, implemented in a similar way to
drm/msm.

* 'etnaviv/next' of https://git.pengutronix.de/git/lst/linux:
  drm/etnaviv: submit support for out-fences
  drm/etnaviv: return GPU fence through the submit structure
  drm/etnaviv: submit support for in-fences
  drm/etnaviv: add etnaviv cooling device
  drm/etnaviv: switch to postclose
  drm/etnaviv: add lockdep assert to fence allocation