diff options
| author | Dave Airlie <airlied@redhat.com> | 2015-03-20 17:32:21 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-03-20 17:32:21 +1000 |
| commit | 8265d4486d5c2448a1c645fdc20d4e62873d9c3d (patch) | |
| tree | 1e2fb500924320cd1cd5c39ce914be70d2b3e8ca /mm/memcontrol.c | |
| parent | f42e2c2429c0a76d99565e20d70d4fbf21c97498 (diff) | |
| parent | 7f0801e566cc78315e5dc383bf3c3b5b5b436048 (diff) | |
Merge tag 'drm-intel-fixes-2015-03-19' of git://anongit.freedesktop.org/drm-intel into drm-fixesHEADmaster
Backporting a couple of plane related fixes from drm-next to v4.0.
* tag 'drm-intel-fixes-2015-03-19' of git://anongit.freedesktop.org/drm-intel:
drm/i915: Make sure the primary plane is enabled before reading out the fb state
drm/i915: Ensure plane->state->fb stays in sync with plane->fb
Diffstat (limited to 'mm/memcontrol.c')
0 files changed, 0 insertions, 0 deletions