Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

authored by

Jason Gunthorpe and committed by
Daniel Vetter
23d6ab1d ade89646

-8
-3
drivers/gpu/drm/drm_vm.c
··· 70 70 { 71 71 pgprot_t tmp = vm_get_page_prot(vma->vm_flags); 72 72 73 - /* We don't want graphics memory to be mapped encrypted */ 74 - tmp = pgprot_decrypted(tmp); 75 - 76 73 #if defined(__i386__) || defined(__x86_64__) || defined(__powerpc__) || \ 77 74 defined(__mips__) 78 75 if (map->type == _DRM_REGISTERS && !(map->flags & _DRM_WRITE_COMBINING))
-5
drivers/video/fbdev/core/fbmem.c
··· 1380 1380 mutex_unlock(&info->mm_lock); 1381 1381 1382 1382 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags); 1383 - /* 1384 - * The framebuffer needs to be accessed decrypted, be sure 1385 - * SME protection is removed 1386 - */ 1387 - vma->vm_page_prot = pgprot_decrypted(vma->vm_page_prot); 1388 1383 fb_pgprotect(file, vma, start); 1389 1384 1390 1385 return vm_iomap_memory(vma, start, len);