]> Pileus Git - ~andy/linux/commitdiff
drm/i810: don't acces hw regs in lastclose
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Sun, 30 Oct 2011 11:44:56 +0000 (12:44 +0100)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Thu, 22 Dec 2011 18:54:58 +0000 (19:54 +0100)
i810 uses a userspace provided mmio map using the drm core map
infrastructure. By the time we reach lastclose, this is all gone
and our mmio_map pointer points at freed memory. Depending upon
luck that still works, most often it just oopses.

Aside: drm maps aren't refcounted, so userspace can essentially oops
the kernel any time it wants to. Who cares.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i810/i810_dma.c

index 6b73c3e57d6303badfb3143a65279240d82dbdb6..f7c17b23983389ae7b978224180dadcd4b6616c3 100644 (file)
@@ -222,8 +222,6 @@ static int i810_dma_cleanup(struct drm_device *dev)
                        pci_free_consistent(dev->pdev, PAGE_SIZE,
                                            dev_priv->hw_status_page,
                                            dev_priv->dma_status_page);
-                       /* Need to rewrite hardware status page */
-                       I810_WRITE(0x02080, 0x1ffff000);
                }
                kfree(dev->dev_private);
                dev->dev_private = NULL;