From: <ma...@ke...> - 2007-01-08 02:48:47
|
shared-core/nouveau_state.c | 3 +++ 1 files changed, 3 insertions(+) New commits: diff-tree 6eaa1272b4159a547d6da21f14cbcc5b5d0f600c (from parents) Merge: 1f0f7d7a180af088d6c79d55da04402f0eff0416 5bf60c9d6c2e04a65085a0a332de24b06043fcb8 Author: Stephane Marchesin <mar...@ic...> Date: Mon Jan 8 03:50:34 2007 +0100 Merge branch 'master' of git+ssh://ma...@gi.../git/mesa/drm diff-tree 1f0f7d7a180af088d6c79d55da04402f0eff0416 (from faa46122993bc5970b3d67933bd81d863a3c4762) Author: Stephane Marchesin <mar...@ic...> Date: Mon Jan 8 00:11:39 2007 +0100 nouveau: fix a stupid bug from me. diff --git a/shared-core/nouveau_state.c b/shared-core/nouveau_state.c index 951e21f..44f8c1a 100644 --- a/shared-core/nouveau_state.c +++ b/shared-core/nouveau_state.c @@ -120,7 +120,10 @@ void nouveau_lastclose(struct drm_device { 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); + dev_priv->fb_mtrr=0; + } } int nouveau_unload(struct drm_device *dev) |