diff options
author | Dave Airlie <airlied@redhat.com> | 2014-12-05 11:11:57 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2014-12-05 11:11:57 +1000 |
commit | 7608867d0c4d9da30e9efe6a53ff4ee1e6c4990b (patch) | |
tree | 9b33bf7fa0539a883fca14d5105ef6407646c382 /mm/memcontrol.c | |
parent | 047b35f27bcbca485f06a60340de8d552be2b4e5 (diff) | |
parent | 00f0b3781028605910cb4662a0f8a4849b445fc2 (diff) | |
download | talos-obmc-linux-7608867d0c4d9da30e9efe6a53ff4ee1e6c4990b.tar.gz talos-obmc-linux-7608867d0c4d9da30e9efe6a53ff4ee1e6c4990b.zip |
Merge tag 'drm-intel-next-fixes-2014-12-04' of git://anongit.freedesktop.org/drm-intel into drm-next
Fixes for 3.20. I did stick the gen3/4 reset work from Ville in because we
have an awful lot of gen4 mesa hangs, and with this reset should also work
on vintage i965g/gm (we already have reset for g4x/gen4.5). So should help
to appease users suffering from these hangs. Otherwise all over.
This is the last 3.20 pull from me, from here on Jani will take over. By Ville Syrjälä (8) and others
* tag 'drm-intel-next-fixes-2014-12-04' of git://anongit.freedesktop.org/drm-intel:
drm/i915: Reject modeset when the same digital port is used more than once
drm/i915: mask RPS IRQs properly when disabling RPS
drm/i915: Tune down spurious CRC interrupt warning
drm/i915: Fix context object leak for legacy contexts
drm/i915/skl: Update in Gen9 multi-engine forcewake range
drm/i915/eDP: When enabling panel VDD cancel pending disable worker
drm/i915: Handle runtime pm in the CRC setup code
drm/i915: Disable crtcs gracefully before GPU reset on gen3/4
drm/i915: Grab modeset locks for GPU rest on pre-ctg
drm/i915: Implement GPU reset for g33
drm/i915: Implement GPU reset for 915/945
drm/i915: Restore the display config after a GPU reset on gen4
drm/i915: Fix gen4 GPU reset
drm/i915: Stop gathering error states for CS error interrupts
drm/i915: Disallow pin ioctl completely for kms drivers
drm/i915: Only warn the first time we attempt to mmio whilst suspended
drm/i915/chv: Enable AVI, SPD and HDMI infoframes for CHV.
drm/i915: Don't clobber crtc->new_config when nothing changes
Diffstat (limited to 'mm/memcontrol.c')
0 files changed, 0 insertions, 0 deletions