drm/vmwgfx: Replace iowrite/ioread with volatile memory accesses
Now that we use memremap instead of ioremap, Use WRITE_ONCE / READ_ONCE instead of iowrite / ioread. Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com> Reviewed-by: Sinclair Yeh <syeh@vmware.com>
This commit is contained in:
@@ -375,7 +375,7 @@ struct vmw_private {
|
||||
uint32_t stdu_max_height;
|
||||
uint32_t initial_width;
|
||||
uint32_t initial_height;
|
||||
u32 __iomem *mmio_virt;
|
||||
u32 *mmio_virt;
|
||||
uint32_t capabilities;
|
||||
uint32_t max_gmr_ids;
|
||||
uint32_t max_gmr_pages;
|
||||
@@ -1206,4 +1206,30 @@ static inline void vmw_fifo_resource_dec(struct vmw_private *dev_priv)
|
||||
{
|
||||
atomic_dec(&dev_priv->num_fifo_resources);
|
||||
}
|
||||
|
||||
/**
|
||||
* vmw_mmio_read - Perform a MMIO read from volatile memory
|
||||
*
|
||||
* @addr: The address to read from
|
||||
*
|
||||
* This function is intended to be equivalent to ioread32() on
|
||||
* memremap'd memory, but without byteswapping.
|
||||
*/
|
||||
static inline u32 vmw_mmio_read(u32 *addr)
|
||||
{
|
||||
return READ_ONCE(*addr);
|
||||
}
|
||||
|
||||
/**
|
||||
* vmw_mmio_write - Perform a MMIO write to volatile memory
|
||||
*
|
||||
* @addr: The address to write to
|
||||
*
|
||||
* This function is intended to be equivalent to iowrite32 on
|
||||
* memremap'd memory, but without byteswapping.
|
||||
*/
|
||||
static inline void vmw_mmio_write(u32 value, u32 *addr)
|
||||
{
|
||||
WRITE_ONCE(*addr, value);
|
||||
}
|
||||
#endif
|
||||
|
Reference in New Issue
Block a user