OSDN Git Service

drm/shmem: drop pgprot_decrypted()
authorGerd Hoffmann <kraxel@redhat.com>
Fri, 28 Feb 2020 10:47:23 +0000 (11:47 +0100)
committerGerd Hoffmann <kraxel@redhat.com>
Mon, 2 Mar 2020 06:13:19 +0000 (07:13 +0100)
Was added by commit 95cf9264d5f3 ("x86, drm, fbdev: Do not specify
encrypted memory for video mappings"), then it was kept through various
changes.

While vram actually needs decrypted mappings this is not correct for
shmem gem objects which live in main memory not io memory, so remove the
call.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Thomas Hellstrom <thellstrom@vmware.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20200228104723.18757-1-kraxel@redhat.com
drivers/gpu/drm/drm_gem_shmem_helper.c

index aad9324..df31e57 100644 (file)
@@ -548,7 +548,6 @@ int drm_gem_shmem_mmap(struct drm_gem_object *obj, struct vm_area_struct *vma)
        vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
        if (!shmem->map_cached)
                vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot);
-       vma->vm_page_prot = pgprot_decrypted(vma->vm_page_prot);
        vma->vm_ops = &drm_gem_shmem_vm_ops;
 
        return 0;