Commit 5ad9dcee authored by Dan Williams's avatar Dan Williams Committed by Thomas Hellstrom

drm/vmwgfx: switch from ioremap_cache to memremap

Per commit 2e586a7e "drm/vmwgfx: Map the fifo as cached" the driver
expects the fifo registers to be cacheable.  In preparation for
deprecating ioremap_cache() convert its usage in vmwgfx to memremap().

Cc: David Airlie <airlied@linux.ie>
Cc: Thomas Hellstrom <thellstrom@vmware.com>
Cc: Sinclair Yeh <syeh@vmware.com>
Cc: dri-devel@lists.freedesktop.org
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
Reviewed-by: default avatarThomas Hellstrom <thellstrom@vmware.com>
parent a76edb8c
...@@ -752,8 +752,14 @@ static int vmw_driver_load(struct drm_device *dev, unsigned long chipset) ...@@ -752,8 +752,14 @@ static int vmw_driver_load(struct drm_device *dev, unsigned long chipset)
ttm_lock_set_kill(&dev_priv->fbdev_master.lock, false, SIGTERM); ttm_lock_set_kill(&dev_priv->fbdev_master.lock, false, SIGTERM);
dev_priv->active_master = &dev_priv->fbdev_master; dev_priv->active_master = &dev_priv->fbdev_master;
dev_priv->mmio_virt = ioremap_cache(dev_priv->mmio_start, /*
dev_priv->mmio_size); * Force __iomem for this mapping until the implied compiler
* barriers and {READ|WRITE}_ONCE semantics from the
* io{read|write}32() accessors can be replaced with explicit
* barriers.
*/
dev_priv->mmio_virt = (void __iomem *) memremap(dev_priv->mmio_start,
dev_priv->mmio_size, MEMREMAP_WB);
if (unlikely(dev_priv->mmio_virt == NULL)) { if (unlikely(dev_priv->mmio_virt == NULL)) {
ret = -ENOMEM; ret = -ENOMEM;
...@@ -907,7 +913,7 @@ static int vmw_driver_load(struct drm_device *dev, unsigned long chipset) ...@@ -907,7 +913,7 @@ static int vmw_driver_load(struct drm_device *dev, unsigned long chipset)
out_no_device: out_no_device:
ttm_object_device_release(&dev_priv->tdev); ttm_object_device_release(&dev_priv->tdev);
out_err4: out_err4:
iounmap(dev_priv->mmio_virt); memunmap((void __force *) dev_priv->mmio_virt);
out_err3: out_err3:
vmw_ttm_global_release(dev_priv); vmw_ttm_global_release(dev_priv);
out_err0: out_err0:
...@@ -958,7 +964,7 @@ static int vmw_driver_unload(struct drm_device *dev) ...@@ -958,7 +964,7 @@ static int vmw_driver_unload(struct drm_device *dev)
pci_release_regions(dev->pdev); pci_release_regions(dev->pdev);
ttm_object_device_release(&dev_priv->tdev); ttm_object_device_release(&dev_priv->tdev);
iounmap(dev_priv->mmio_virt); memunmap((void __force *) dev_priv->mmio_virt);
if (dev_priv->ctx.staged_bindings) if (dev_priv->ctx.staged_bindings)
vmw_binding_state_free(dev_priv->ctx.staged_bindings); vmw_binding_state_free(dev_priv->ctx.staged_bindings);
vmw_ttm_global_release(dev_priv); vmw_ttm_global_release(dev_priv);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment