diff options
| author | Thomas Hellstrom <thellstrom@vmware.com> | 2014-01-15 20:19:53 +0100 |
|---|---|---|
| committer | Thomas Hellstrom <thellstrom@vmware.com> | 2014-01-17 07:44:15 +0100 |
| commit | 0d00c488f3de59d19784d5ce774528acaa194525 (patch) | |
| tree | 409c7f6324db1d11ce4583588689f33b5524b168 /drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | |
| parent | c5416d661daa9ccef4f42259ad0d48e28b5f950f (diff) | |
| download | talos-op-linux-0d00c488f3de59d19784d5ce774528acaa194525.tar.gz talos-op-linux-0d00c488f3de59d19784d5ce774528acaa194525.zip | |
drm/vmwgfx: Fix the driver for large dma addresses
With dma compliance / IOMMU support added to the driver in kernel 3.13,
the dma addresses can exceed 44 bits, which is what we support in
32-bit mode and with GMR1.
So in 32-bit mode and optionally in 64-bit mode, restrict the dma
addresses to 44 bits, and strip the old GMR1 code.
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
Cc: stable@vger.kernel.org
Diffstat (limited to 'drivers/gpu/drm/vmwgfx/vmwgfx_drv.h')
| -rw-r--r-- | drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h index 036629dd992a..ba49c1d69607 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h @@ -290,7 +290,6 @@ struct vmw_private { __le32 __iomem *mmio_virt; int mmio_mtrr; uint32_t capabilities; - uint32_t max_gmr_descriptors; uint32_t max_gmr_ids; uint32_t max_gmr_pages; uint32_t memory_size; |
