| commit | 1caa590075ddef41950c46123e80cd6a64505218 | [log] [tgz] |
|---|---|---|
| author | Dave Airlie <airlied@redhat.com> | Wed Apr 03 06:41:15 2013 +1000 |
| committer | Dave Airlie <airlied@redhat.com> | Wed Apr 03 06:41:15 2013 +1000 |
| tree | 4aebdcfe594e90ee2eaddac1d9eac2067c21445b | |
| parent | 2dc958fa2fe6987e7ab106bd97029a09a82fcd8d [diff] | |
| parent | 8abbbaf6adb46157b6bd416f7616b555cc6a332f [diff] |
Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel into drm-next One locking regression fix, and a couple of other i915 ones. * 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel: drm: don't unlock in the addfb error paths drm/i915: Fix build failure drm/i915: Be sure to turn hsync/vsync back on at crt enable (v2) drm/i915: duct-tape locking when eDP init fails