diff options
| author | Dave Airlie <airlied@redhat.com> | 2017-08-22 16:53:32 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2017-08-22 16:53:32 +1000 |
| commit | b313f780ded9ead1f72df9c8b45f7ea00585a2e5 (patch) | |
| tree | ef0bc15eea3d7bc8221af22a32abc9a30cf98f8f /tools/perf/scripts/python/intel-pt-events.py | |
| parent | 4a9f153dbdd50ee58955bd876ba0b50de7c5b6c0 (diff) | |
| parent | a0ffc51e20e90e0c1c2491de2b4b03f48b6caaba (diff) | |
Merge tag 'drm-misc-fixes-2017-08-18' of git://anongit.freedesktop.org/git/drm-misc into drm-fixes
Core Changes:
- Fix framebuffer leak in setplane error condition (Nikil)
- Prevent BUG in atomic_ioctl by properly resetting state on EDEADLK (Maarten)
- Add missing return in atomic_check_only if atomic_check fails (Maarten)
Driver Changes:
- rockchip: Don't try to suspend if device not initialized (Jeffy)
Cc: Jeffy Chen <jeffy.chen@rock-chips.com>
Cc: Nikhil Mahale <nmahale@nvidia.com>
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
* tag 'drm-misc-fixes-2017-08-18' of git://anongit.freedesktop.org/git/drm-misc:
drm/atomic: If the atomic check fails, return its value first
drm/atomic: Handle -EDEADLK with out-fences correctly
drm: Fix framebuffer leak
drm/rockchip: Fix suspend crash when drm is not bound
Diffstat (limited to 'tools/perf/scripts/python/intel-pt-events.py')
0 files changed, 0 insertions, 0 deletions