diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2013-01-10 20:09:21 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2013-01-10 20:09:21 +1000 |
| commit | f8b1adb08ba55a8a712c6662d4d261d5cab42c98 (patch) | |
| tree | 5918cf8be73a5ec145e22f4bb18e779b1ae6ae93 /drm | |
| parent | 827ac5471ac6b03d7a74e8fe0805787b0b3c8364 (diff) | |
| download | nouveau-f8b1adb08ba55a8a712c6662d4d261d5cab42c98.tar.gz | |
v3.8-rc3
Diffstat (limited to 'drm')
| -rw-r--r-- | drm/nouveau_bo.c | 2 | ||||
| -rw-r--r-- | drm/nouveau_drm.c | 4 | ||||
| -rw-r--r-- | drm/nouveau_pm.c | 4 | ||||
| -rw-r--r-- | drm/nouveau_prime.c | 1 |
4 files changed, 6 insertions, 5 deletions
diff --git a/drm/nouveau_bo.c b/drm/nouveau_bo.c index 5614c8914..69d7b1d0b 100644 --- a/drm/nouveau_bo.c +++ b/drm/nouveau_bo.c @@ -1276,7 +1276,7 @@ nouveau_ttm_io_mem_reserve(struct ttm_bo_device *bdev, struct ttm_mem_reg *mem) if (drm->agp.stat == ENABLED) { mem->bus.offset = mem->start << PAGE_SHIFT; mem->bus.base = drm->agp.base; - mem->bus.is_iomem = true; + mem->bus.is_iomem = !dev->agp->cant_use_aperture; } #endif break; diff --git a/drm/nouveau_drm.c b/drm/nouveau_drm.c index 01c403ddb..180a45e3b 100644 --- a/drm/nouveau_drm.c +++ b/drm/nouveau_drm.c @@ -189,8 +189,8 @@ nouveau_accel_init(struct nouveau_drm *drm) nouveau_bo_move_init(drm); } -static int __devinit -nouveau_drm_probe(struct pci_dev *pdev, const struct pci_device_id *pent) +static int nouveau_drm_probe(struct pci_dev *pdev, + const struct pci_device_id *pent) { struct nouveau_device *device; struct apertures_struct *aper; diff --git a/drm/nouveau_pm.c b/drm/nouveau_pm.c index 556617277..a701ff5ff 100644 --- a/drm/nouveau_pm.c +++ b/drm/nouveau_pm.c @@ -698,10 +698,10 @@ static int nouveau_hwmon_init(struct drm_device *dev) { struct nouveau_pm *pm = nouveau_pm(dev); - struct nouveau_drm *drm = nouveau_drm(dev); - struct nouveau_therm *therm = nouveau_therm(drm->device); #if defined(CONFIG_HWMON) || (defined(MODULE) && defined(CONFIG_HWMON_MODULE)) + struct nouveau_drm *drm = nouveau_drm(dev); + struct nouveau_therm *therm = nouveau_therm(drm->device); struct device *hwmon_dev; int ret = 0; diff --git a/drm/nouveau_prime.c b/drm/nouveau_prime.c index 3543fec23..b8e05ae38 100644 --- a/drm/nouveau_prime.c +++ b/drm/nouveau_prime.c @@ -193,6 +193,7 @@ struct drm_gem_object *nouveau_gem_prime_import(struct drm_device *dev, if (nvbo->gem) { if (nvbo->gem->dev == dev) { drm_gem_object_reference(nvbo->gem); + dma_buf_put(dma_buf); return nvbo->gem; } } |