NV50: i misunderstood NOUVEAU_MEM_INTERNAL, so remove it
authorMaarten Maathuis <madman2003@gmail.com>
Wed, 25 Jun 2008 13:27:07 +0000 (15:27 +0200)
committerMaarten Maathuis <madman2003@gmail.com>
Wed, 25 Jun 2008 13:27:07 +0000 (15:27 +0200)
linux-core/nv50_lut.c
shared-core/nouveau_mem.c

index 5cdf6b5..7982a92 100644 (file)
@@ -33,7 +33,7 @@ static int nv50_lut_alloc(struct nv50_crtc *crtc)
 {
        struct mem_block *block;
        struct drm_file *file_priv = kzalloc(sizeof(struct drm_file), GFP_KERNEL);
-       uint32_t flags = NOUVEAU_MEM_INTERNAL | NOUVEAU_MEM_FB | NOUVEAU_MEM_MAPPED;
+       uint32_t flags = NOUVEAU_MEM_FB | NOUVEAU_MEM_MAPPED;
        int rval = 0;
 
        NV50_DEBUG("\n");
index 4acd6bd..46b6e4d 100644 (file)
@@ -742,9 +742,6 @@ void nouveau_mem_free(struct drm_device* dev, struct mem_block* block)
                                if (crtc->fb->block == block) {
                                        crtc->fb->block = NULL;
 
-                                       /* this will force a lut change next time a fb is loaded */
-                                       crtc->lut->depth = 0;
-
                                        if (!crtc->blanked)
                                                crtc->blank(crtc, TRUE);
                                }