drivers/gpu/drm/via/via_drv.c |   12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

New commits:
commit d0504ee4de7a8c189a568bb16c7b43a5ee280135
Author: James Simmons <jsimm...@infradead.org>
Date:   Sat Jun 8 07:58:16 2013 -0400

    Patch from Thomas Schlichter that noticed that I used the wrong fuction to 
release the mtrr region. His patch also enabled more code cleanup as well

diff --git a/drivers/gpu/drm/via/via_drv.c b/drivers/gpu/drm/via/via_drv.c
index 6476afd..2a8592b 100644
--- a/drivers/gpu/drm/via/via_drv.c
+++ b/drivers/gpu/drm/via/via_drv.c
@@ -296,16 +296,8 @@ static int via_driver_unload(struct drm_device *dev)
        }
 
        /* mtrr delete the vram */
-       if (drm_core_has_MTRR(dev) && (dev_priv->vram_mtrr >= 0)) {
-               int size = dev_priv->bdev.man[TTM_PL_VRAM].size;
-               unsigned long long vram_start;
-
-               if (dev->pci_device == PCI_DEVICE_ID_VIA_VX900)
-                       vram_start = pci_resource_start(dev->pdev, 2);
-               else
-                       vram_start = pci_resource_start(dev->pdev, 0);
-               dev_priv->vram_mtrr = arch_phys_wc_add(vram_start, size);
-       }
+       if (drm_core_has_MTRR(dev) && (dev_priv->vram_mtrr >= 0))
+        arch_phys_wc_del(dev_priv->vram_mtrr);
 
        ttm_global_fini(&dev_priv->mem_global_ref,
                        &dev_priv->bo_global_ref,
_______________________________________________
Openchrome-devel mailing list
Openchrome-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/openchrome-devel

Reply via email to