diff options
| author | Dave Airlie <airlied@redhat.com> | 2013-09-19 11:47:23 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2013-09-19 11:47:23 +1000 |
| commit | 4f7d1bc973ec71dfeeb951765cafe1ff3a63243e (patch) | |
| tree | dee5b7f345180311597ee065a897cf7900b1de4c /drivers/gpu/drm/ttm | |
| parent | d52271290a2674c873332a8b2300ab1544864881 (diff) | |
| parent | 7a59cc34a3d7b97a00829613bb1a630f5004643b (diff) | |
| download | blackbird-op-linux-4f7d1bc973ec71dfeeb951765cafe1ff3a63243e.tar.gz blackbird-op-linux-4f7d1bc973ec71dfeeb951765cafe1ff3a63243e.zip | |
Merge branch 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes
A couple of bios parser fixes (one for ancient chips, another for new ones - important in Optimus configs). Another to make sure KMS is enabled on certain Optimus configs, and a TTM failure path fix.
* 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6:
drm/nouveau/ttm: prevent double-free in nouveau_sgdma_create_ttm() failure path
drm/nouveau/bios/init: fix thinko in INIT_CONFIGURE_MEM
drm/nouveau/kms: enable for non-vga pci classes
drm/nouveau/bios/init: stub opcode 0xaa
Diffstat (limited to 'drivers/gpu/drm/ttm')
0 files changed, 0 insertions, 0 deletions
