summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephane Marchesin <marchesin@icps.u-strasbg.fr>2007-01-05 20:59:45 +0100
committerStephane Marchesin <marchesin@icps.u-strasbg.fr>2007-01-05 20:59:45 +0100
commit528ab8ce4038397c043b05a46f95c666a985f7a3 (patch)
tree46442f18875dec16c742b21efb39c19ee76ae8e1
parentd99c7c27e2df1a7093f3d2f5c7d196f58bfe1647 (diff)
nouveau: oops, we don't need OS_HAS_MTRR actually.
-rw-r--r--shared-core/nouveau_state.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/shared-core/nouveau_state.c b/shared-core/nouveau_state.c
index 2d0f7985..43f9c2a9 100644
--- a/shared-core/nouveau_state.c
+++ b/shared-core/nouveau_state.c
@@ -71,10 +71,8 @@ int nouveau_firstopen(struct drm_device *dev)
ret = nouveau_fifo_init(dev);
if (ret) return ret;
-#if __OS_HAS_MTRR
/* setup a mtrr over the FB */
dev_priv->fb_mtrr=drm_mtrr_add(drm_get_resource_start(dev, 1),nouveau_mem_fb_amount(dev), DRM_MTRR_WC);
-#endif
/* FIXME: doesn't belong here, and have no idea what it's for.. */
if (dev_priv->card_type >= NV_40)
@@ -105,11 +103,9 @@ int nouveau_load(struct drm_device *dev, unsigned long flags)
void nouveau_lastclose(struct drm_device *dev)
{
-#if __OS_HAS_MTRR
drm_nouveau_private_t *dev_priv = dev->dev_private;
if(dev_priv->fb_mtrr>0)
drm_mtrr_del(dev_priv->fb_mtrr, drm_get_resource_start(dev, 1),nouveau_mem_fb_amount(dev), DRM_MTRR_WC);
-#endif
}
int nouveau_unload(struct drm_device *dev)