diff options
| author | Dave Airlie <airlied@redhat.com> | 2021-08-04 22:37:32 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2021-08-04 22:37:44 +0200 |
| commit | e8a1ca91c83c415977850eb7b1d20b3407bf4717 (patch) | |
| tree | 0aea921b2a1e84f2a53e127babd0769f06192992 /drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | |
| parent | Linux 5.14-rc4 (diff) | |
| parent | drm/vmwgfx: Fix a 64bit regression on svga3 (diff) | |
| download | linux-e8a1ca91c83c415977850eb7b1d20b3407bf4717.tar.xz linux-e8a1ca91c83c415977850eb7b1d20b3407bf4717.zip | |
Merge tag 'drm-misc-fixes-2021-08-04' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes
Short summary of fixes pull:
* kmb: DMA fix; Add macros for driver date/version
* vmwgfx: Fix I/O memory access on 64-bit systems
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/YQrXzTmPpiuWsqSA@linux-uq9g.fritz.box
Diffstat (limited to 'drivers/gpu/drm/vmwgfx/vmwgfx_drv.h')
| -rw-r--r-- | drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h index d1cef3b69e9d..5652d982b1ce 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h @@ -492,7 +492,7 @@ struct vmw_private { resource_size_t vram_start; resource_size_t vram_size; resource_size_t prim_bb_mem; - void __iomem *rmmio; + u32 __iomem *rmmio; u32 *fifo_mem; resource_size_t fifo_mem_size; uint32_t fb_max_width; |