diff options
| author | Sinclair Yeh <syeh@vmware.com> | 2017-05-19 22:57:06 -0700 |
|---|---|---|
| committer | Sinclair Yeh <syeh@vmware.com> | 2017-06-14 19:39:41 +0200 |
| commit | 3c5a89bce93a6b19eb4580411196c04abff094bf (patch) | |
| tree | 2b671166ad6ee92d523809b33211313b802c3eb4 /drm_memory.c | |
| parent | 90732761ce998497c52a0997721e244a942b88ec (diff) | |
vmwgfx: Update stand alone to v4.11
* Skipped update to drm_mm and drm_vma_manager because the switch to
using interval tree makes porting difficult.
* Added memdup_user_nul(), but replaced kmalloc_track_caller() with
kmalloc() due to a compilation error.
* Removed building and usage of debugfs_crc
* VMWGFX_COMPAT_NO_VAF no longer seems to be required
* Tested on
CentOS 6.5, RHEL 6.8: 2.6.32-696
RHEL 7.3: 3.10.0-514
Ubuntu 14.04: 4.2.0-35
Ubuntu 16.04: 4.4.0-78
Ubuntu 16.04: 4.12-rc1
Signed-off-by: Sinclair Yeh <syeh@vmware.com>
Reviewed-by: Thomas Hellstrom <thellstrom@vmware.com>
Diffstat (limited to 'drm_memory.c')
| -rw-r--r-- | drm_memory.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drm_memory.c b/drm_memory.c index f0e7fdd..25cde57 100644 --- a/drm_memory.c +++ b/drm_memory.c @@ -45,7 +45,7 @@ # include <asm/agp.h> #else # ifdef __powerpc__ -# define PAGE_AGP __pgprot(_PAGE_KERNEL | _PAGE_NO_CACHE) +# define PAGE_AGP pgprot_noncached_wc(PAGE_KERNEL) # else # define PAGE_AGP PAGE_KERNEL # endif @@ -126,7 +126,7 @@ void drm_legacy_ioremap(struct drm_local_map *map, struct drm_device *dev) if (dev->agp && dev->agp->cant_use_aperture && map->type == _DRM_AGP) map->handle = agp_remap(map->offset, map->size, dev); else - map->handle = (void __force *)ioremap(map->offset, map->size); + map->handle = ioremap(map->offset, map->size); } EXPORT_SYMBOL(drm_legacy_ioremap); @@ -135,7 +135,7 @@ void drm_legacy_ioremap_wc(struct drm_local_map *map, struct drm_device *dev) if (dev->agp && dev->agp->cant_use_aperture && map->type == _DRM_AGP) map->handle = agp_remap(map->offset, map->size, dev); else - map->handle = (void __force *)ioremap_wc(map->offset, map->size); + map->handle = ioremap_wc(map->offset, map->size); } EXPORT_SYMBOL(drm_legacy_ioremap_wc); @@ -147,7 +147,7 @@ void drm_legacy_ioremapfree(struct drm_local_map *map, struct drm_device *dev) if (dev->agp && dev->agp->cant_use_aperture && map->type == _DRM_AGP) vunmap(map->handle); else - iounmap((void __iomem *)map->handle); + iounmap(map->handle); } EXPORT_SYMBOL(drm_legacy_ioremapfree); #endif |