diff options
| author |   Jason Gunthorpe <jgg@nvidia.com> | 2020-11-05 13:00:19 -0400 |
|---|---|---|
| committer |   Daniel Vetter <daniel.vetter@ffwll.ch> | 2020-11-10 17:19:14 +0100 |
| commit | 23d6ab1d4c503660632e7b18cbb571d62d9bf792 (patch) | |
| tree | 0666c379b91409e04d6576a72537462913e433f1 /drivers/gpu/drm/drm_vm.c | |
| parent | drm: DRM_KMB_DISPLAY should depend on ARCH_KEEMBAY (diff) | |
| download | linux-dev-23d6ab1d4c503660632e7b18cbb571d62d9bf792.tar.xz linux-dev-23d6ab1d4c503660632e7b18cbb571d62d9bf792.zip | |
drm: remove pgprot_decrypted() before calls to io_remap_pfn_range()
commit f8f6ae5d077a ("mm: always have io_remap_pfn_range() set
pgprot_decrypted()") moves the pgprot_decrypted() into
io_remap_pfn_range(). Delete any, now confusing, open coded calls that
directly precede io_remap_pfn_range():
- drm_io_prot() is only in drm_mmap_locked() to call io_remap_pfn_range()
- fb_mmap() immediately calls vm_iomap_memory() which is a convenience
wrapper for io_remap_pfn_range()
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/0-v1-2e6a0db57868+166-drm_sme_clean_jgg@nvidia.com
Diffstat (limited to 'drivers/gpu/drm/drm_vm.c')
| -rw-r--r-- | drivers/gpu/drm/drm_vm.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/gpu/drm/drm_vm.c b/drivers/gpu/drm/drm_vm.c index 1a6369633789..6d5a03b32238 100644 --- a/drivers/gpu/drm/drm_vm.c +++ b/drivers/gpu/drm/drm_vm.c @@ -70,9 +70,6 @@ static pgprot_t drm_io_prot(struct drm_local_map *map, { pgprot_t tmp = vm_get_page_prot(vma->vm_flags); - /* We don't want graphics memory to be mapped encrypted */ - tmp = pgprot_decrypted(tmp); - #if defined(__i386__) || defined(__x86_64__) || defined(__powerpc__) || \ defined(__mips__) if (map->type == _DRM_REGISTERS && !(map->flags & _DRM_WRITE_COMBINING)) |