diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2024-01-08 09:42:05 +0100 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2024-01-08 09:42:05 +0100 |
| commit | 90373f685811b00eb0be7b8e9520959defe82462 (patch) | |
| tree | e1c34020714fadec4847943299be5ff5f98505c3 /drivers/video/fbdev/vermilion/vermilion.c | |
| parent | eb284f4b37817d2038fdfe1a9d51769730ab7b5f (diff) | |
| parent | 3c064aea46d071ccf95a142be5532768a7fa6f02 (diff) | |
Merge remote-tracking branch 'drm/drm-next' into drm-tip
# Conflicts:
# drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
# drivers/gpu/drm/i915/display/intel_dmc.c
Diffstat (limited to 'drivers/video/fbdev/vermilion/vermilion.c')
| -rw-r--r-- | drivers/video/fbdev/vermilion/vermilion.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/video/fbdev/vermilion/vermilion.c b/drivers/video/fbdev/vermilion/vermilion.c index 840ead69654b..a087b42ca652 100644 --- a/drivers/video/fbdev/vermilion/vermilion.c +++ b/drivers/video/fbdev/vermilion/vermilion.c @@ -998,6 +998,8 @@ static int vmlfb_mmap(struct fb_info *info, struct vm_area_struct *vma) int ret; unsigned long prot; + vma->vm_page_prot = pgprot_decrypted(vma->vm_page_prot); + ret = vmlfb_vram_offset(vinfo, offset); if (ret) return -EINVAL; |