summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/nouveau/nouveau_mem.c
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2011-02-23 07:24:01 +0300
committerDave Airlie <airlied@redhat.com>2011-02-23 07:24:01 +0300
commita2c06ee2fe5b48a71e697bae00c6e7195fc016b6 (patch)
treeff1761280d173d8adc0a7e0339dc68fd44146c08 /drivers/gpu/drm/nouveau/nouveau_mem.c
parent63871f89d158e3f3e469dde00dd15763d474cb3c (diff)
downloadlinux-a2c06ee2fe5b48a71e697bae00c6e7195fc016b6.tar.xz
Revert "ttm: Include the 'struct dev' when using the DMA API."
This reverts commit 5a893fc28f0393adb7c885a871b8c59e623fd528. This causes a use after free in the ttm free alloc pages path, when it tries to get the be after the be has been destroyed. Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_mem.c')
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_mem.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_mem.c b/drivers/gpu/drm/nouveau/nouveau_mem.c
index 2b4e5e912110..123969dd4f56 100644
--- a/drivers/gpu/drm/nouveau/nouveau_mem.c
+++ b/drivers/gpu/drm/nouveau/nouveau_mem.c
@@ -409,7 +409,6 @@ nouveau_mem_vram_init(struct drm_device *dev)
if (ret)
return ret;
- dev_priv->ttm.bdev.dev = dev->dev;
ret = ttm_bo_device_init(&dev_priv->ttm.bdev,
dev_priv->ttm.bo_global_ref.ref.object,
&nouveau_bo_driver, DRM_FILE_PAGE_OFFSET,