diff options
| author | Dave Airlie <airlied@redhat.com> | 2014-02-18 16:22:40 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-02-18 16:22:40 +1000 |
| commit | c2288d4d3830946d91ae7aba599d34828d07f103 (patch) | |
| tree | 37f83a255d811fa04ecde5b711dfaa001fe280b0 /drivers/gpu/drm/nouveau/nouveau_bo.c | |
| parent | 42738c2b39fef8cae3e7138948d9e0979b703894 (diff) | |
| parent | 34d595081812da62b5357579267c4ab5eae64ac1 (diff) | |
| download | blackbird-op-linux-c2288d4d3830946d91ae7aba599d34828d07f103.tar.gz blackbird-op-linux-c2288d4d3830946d91ae7aba599d34828d07f103.zip | |
Merge branch 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes
Nothing too exciting, mostly fixes for ancient boards, but a pretty important fix for DP on some systems.
Thanks,
* 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6:
drm/nouveau: fix TTM_PL_TT memtype on pre-nv50
drm/nv50/disp: use correct register to determine DP display bpp
drm/nouveau/fb: use correct ram oclass for nv1a hardware
drm/nv50/gr: add missing nv_error parameter priv
drm/nouveau: fix ENG_RUNLIST register address
drm/nv4c/bios: disallow retrieving from prom on nv4x igp's
drm/nv4c/vga: decode register is in a different place on nv4x igp's
drm/nv4c/mc: nv4x igp's have a different msi rearm register
drm/nouveau: set irq_enabled manually
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_bo.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_bo.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c index 488686d490c0..4aed1714b9ab 100644 --- a/drivers/gpu/drm/nouveau/nouveau_bo.c +++ b/drivers/gpu/drm/nouveau/nouveau_bo.c @@ -1249,7 +1249,7 @@ nouveau_ttm_io_mem_reserve(struct ttm_bo_device *bdev, struct ttm_mem_reg *mem) mem->bus.is_iomem = !dev->agp->cant_use_aperture; } #endif - if (!node->memtype) + if (nv_device(drm->device)->card_type < NV_50 || !node->memtype) /* untiled */ break; /* fallthrough, tiled memory */ |
