diff options
| author | Dave Airlie <airlied@redhat.com> | 2011-02-23 12:06:39 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2011-02-23 12:06:39 +1000 |
| commit | de1e7cd63a8ec26a3bd3740708cfd72dd76509e2 (patch) | |
| tree | 52bc82a71f34e92895d22821543a2be011834505 /drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | |
| parent | 7811bddb6654337fd85837ef14c1a96a0c264745 (diff) | |
| parent | 5a893fc28f0393adb7c885a871b8c59e623fd528 (diff) | |
| download | linux-rt-de1e7cd63a8ec26a3bd3740708cfd72dd76509e2.tar.gz | |
Merge branch 'stable/ttm.pci-api.v5' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen into drm-next
* 'stable/ttm.pci-api.v5' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
ttm: Include the 'struct dev' when using the DMA API.
nouveau/ttm/PCIe: Use dma_addr if TTM has set it.
radeon/ttm/PCIe: Use dma_addr if TTM has set it.
ttm: Expand (*populate) to support an array of DMA addresses.
ttm: Utilize the DMA API for pages that have TTM_PAGE_FLAG_DMA32 set.
ttm: Introduce a placeholder for DMA (bus) addresses.
Diffstat (limited to 'drivers/gpu/drm/vmwgfx/vmwgfx_drv.c')
| -rw-r--r-- | drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c index 96949b93d920..df04661e2b93 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c @@ -322,7 +322,7 @@ static int vmw_driver_load(struct drm_device *dev, unsigned long chipset) ttm_lock_set_kill(&dev_priv->fbdev_master.lock, false, SIGTERM); dev_priv->active_master = &dev_priv->fbdev_master; - + dev_priv->bdev.dev = dev->dev; ret = ttm_bo_device_init(&dev_priv->bdev, dev_priv->bo_global_ref.ref.object, &vmw_bo_driver, VMWGFX_FILE_PAGE_OFFSET, |