diff options
author | Dave Airlie <airlied@redhat.com> | 2014-07-25 09:16:28 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2014-07-25 09:16:28 +1000 |
commit | 9d6ed3c695ddf66f7ff89565d843d95c420046d0 (patch) | |
tree | dba6c06e2966e28c948e22d6882babb365bd389e /drivers/gpu/drm/radeon/cik.c | |
parent | ec8a362f2e6e380e7a1f66a6c9a7f6c237ab3520 (diff) | |
parent | eedd10f45bdcb2a5b2afa35f845e080c3bc984f2 (diff) | |
download | blackbird-op-linux-9d6ed3c695ddf66f7ff89565d843d95c420046d0.tar.gz blackbird-op-linux-9d6ed3c695ddf66f7ff89565d843d95c420046d0.zip |
Merge tag 'drm-intel-fixes-2014-07-24' of git://anongit.freedesktop.org/drm-intel into drm-fixes
This time in time! Just 32bit-pae fix from Hugh, semaphores fun from Chris
and a fix for runtime pm cherry-picked from next.
Paulo is still working on a fix for runtime pm when X does cursor fun when
the display is off, but that one isn't ready yet.
* tag 'drm-intel-fixes-2014-07-24' of git://anongit.freedesktop.org/drm-intel:
drm/i915: Simplify i915_gem_release_all_mmaps()
drm/i915: fix freeze with blank screen booting highmem
drm/i915: Reorder the semaphore deadlock check, again
Diffstat (limited to 'drivers/gpu/drm/radeon/cik.c')
0 files changed, 0 insertions, 0 deletions