| commit | dcc32b838b449aef8533f130cfad41b912bfb228 | [log] [tgz] |
|---|---|---|
| author | Dave Airlie <airlied@redhat.com> | Tue Jun 07 10:07:09 2011 +1000 |
| committer | Dave Airlie <airlied@redhat.com> | Tue Jun 07 10:07:09 2011 +1000 |
| tree | 33650f34c9da9c508fdf091f750894ee67c614ba | |
| parent | de52bcab836e6ad21bb0c03c6030725044b2819e [diff] | |
| parent | 4cff3ce5fe5c3c88f103d58c5e7855f9519960e4 [diff] |
Merge remote branch 'nouveau/drm-nouveau-fixes' of /ssd/git/drm-nouveau-next into drm-fixes * 'nouveau/drm-nouveau-fixes' of /ssd/git/drm-nouveau-next: drm/nv40: fall back to paged dma object for the moment drm/nouveau: fix leak of gart mm node drm/nouveau: fix vram page mapping when crossing page table boundaries drm/nv17-nv40: Fix modesetting failure when pitch == 4096px (fdo bug 35901). drm/nouveau: don't create accel engine objects when noaccel=1 drm/nvc0: recognise 0xdX chipsets as NV_C0