summaryrefslogtreecommitdiff
path: root/vmwgfx_drv.h
diff options
context:
space:
mode:
authorThomas Hellstrom <thellstrom@vmware.com>2015-09-09 22:42:34 -0700
committerThomas Hellstrom <thellstrom@vmware.com>2015-09-11 03:03:42 -0700
commit83d58de815f339f64d979f4398c0bac879eee46c (patch)
tree07b87eb9dea43d6798feb9d72206d8344bd2a155 /vmwgfx_drv.h
parent0b83512a5025f8ed8f5507b097f49790c1172627 (diff)
vmwgfx: Map the fifo as cached
On the guest kernel side, previously the FIFO has been mapped write- combined. This has worked since VMs up to now has not honored the mapping type and mapped the FIFO cached anyway. Since the FIFO is accessed cached by the CPU on the virtual device side, this might lead to inconsistent mappings once the guest starts to honor the mapping types. So start asking for cached mappings when we map the FIFO. We do this by using ioremap_cache() instead of ioremap_wc(), and remove the MTRR setup. On the TTM side, MOBs, GMRs and VRAM buffers are already requesting cached mappings for kernel- and user-space. Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com> Reviewed-by: Sinclair Yeh <syeh@vmware.com>
Diffstat (limited to 'vmwgfx_drv.h')
-rw-r--r--vmwgfx_drv.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/vmwgfx_drv.h b/vmwgfx_drv.h
index 836fa3d..0b7c36b 100644
--- a/vmwgfx_drv.h
+++ b/vmwgfx_drv.h
@@ -377,7 +377,6 @@ struct vmw_private {
uint32_t initial_width;
uint32_t initial_height;
__le32 __iomem *mmio_virt;
- int mmio_mtrr;
uint32_t capabilities;
uint32_t max_gmr_descriptors;
uint32_t max_gmr_ids;