| author | Dave Airlie <airlied@redhat.com> | |
| Sun, 13 Jan 2013 22:15:36 +0000 (08:15 +1000) | ||
| committer | Dave Airlie <airlied@redhat.com> | |
| Sun, 13 Jan 2013 22:15:36 +0000 (08:15 +1000) | ||
| commit | 94bc70a8e7ed734c201a4d7b0607619372f4b724 | |
| tree | f8c0b8ca95364492efc826281bc8fa0846d1fa50 | tree | snapshot (tar.xz tar.gz zip) |
| parent | 82ba789f48de669fd0bbc84c326f07571d078572 | commit | diff |
| parent | 43f789792e2c7ea2bff37195e4c4b4239e9e02b7 | commit | diff |
Merge branch 'drm-nouveau-fixes' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-next
Regression fixes since rework mostly.
* 'drm-nouveau-fixes' of git://anongit.freedesktop.org/git/nouveau/linux-2.6:
drm/nvc0/fb: fix crash when different mutex is used to protect same list
drm/nouveau/clock: fix support for more than 2 monitors on nve0
drm/nv50/disp: fix selection of bios script for analog outputs
drm/nv17-50: restore fence buffer on resume
drm/nouveau: fix blank LVDS screen regression on pre-nv50 cards
drm/nouveau: fix nouveau_client allocation failure path
drm/nouveau: don't return freed object from nouveau_handle_create
drm/nouveau/vm: fix memory corruption when pgt allocation fails
drm/nouveau: add locking around instobj list operations
drm/nouveau: do not forcibly power on lvds panels
drm/nouveau/devinit: ensure legacy vga control is enabled during post
Regression fixes since rework mostly.
* 'drm-nouveau-fixes' of git://anongit.freedesktop.org/git/nouveau/linux-2.6:
drm/nvc0/fb: fix crash when different mutex is used to protect same list
drm/nouveau/clock: fix support for more than 2 monitors on nve0
drm/nv50/disp: fix selection of bios script for analog outputs
drm/nv17-50: restore fence buffer on resume
drm/nouveau: fix blank LVDS screen regression on pre-nv50 cards
drm/nouveau: fix nouveau_client allocation failure path
drm/nouveau: don't return freed object from nouveau_handle_create
drm/nouveau/vm: fix memory corruption when pgt allocation fails
drm/nouveau: add locking around instobj list operations
drm/nouveau: do not forcibly power on lvds panels
drm/nouveau/devinit: ensure legacy vga control is enabled during post
| drivers/gpu/drm/nouveau/nouveau_drm.c | diff1 | | diff2 | | blob | history |