diff options
| author | Dave Airlie <airlied@redhat.com> | 2013-12-05 09:18:25 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2013-12-05 09:18:25 +1000 |
| commit | 10c028e94e6e47dca88b33dcc7f9f16651e2cc90 (patch) | |
| tree | 40cb756cd7d486a626aa35444a784ce2039b78cb /drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | |
| parent | 8ecffd7914484b728799dd31968f1339fae91593 (diff) | |
| parent | 6a0a7a9ead2aa18c13dd8f76c5849daf7be1f45a (diff) | |
Merge branch 'vmwgfx-fixes-3.13' of git://people.freedesktop.org/~thomash/linux into drm-fixes
A couple of fixes. The biggest thing is the DMA buffer accounting that was
incorrect.
* 'vmwgfx-fixes-3.13' of git://people.freedesktop.org/~thomash/linux:
drm/vmwgfx: Add our connectors to sysfs
drm/vmwgfx: Fix dma buffer memory size accounting
drm/vmwgfx: Fix up and comment the dumb buffer implementation
drm/vmwgfx: Correctly set the enabled state on crtcs
Diffstat (limited to 'drivers/gpu/drm/vmwgfx/vmwgfx_drv.h')
| -rw-r--r-- | drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h index db85985c708..20890ad8408 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h @@ -615,6 +615,7 @@ extern int vmw_mmap(struct file *filp, struct vm_area_struct *vma); * TTM buffer object driver - vmwgfx_buffer.c */ +extern const size_t vmw_tt_size; extern struct ttm_placement vmw_vram_placement; extern struct ttm_placement vmw_vram_ne_placement; extern struct ttm_placement vmw_vram_sys_placement; |