Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fa9e8550 authored by Konstantin Khlebnikov's avatar Konstantin Khlebnikov Committed by Dave Airlie
Browse files

mm, drm/udl: fixup vma flags on mmap 



There should be VM_MIXEDMAP, not VM_PFNMAP, because udl_gem_fault() inserts
pages via vm_insert_page(). Other drm/gem drivers already do this.

Signed-off-by: default avatarKonstantin Khlebnikov <khlebnikov@openvz.org>
Cc: Dave Airlie <airlied@redhat.com>
Cc: dri-devel@lists.freedesktop.org
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 402976fe

drivers/gpu/drm/udl/udl_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ static struct vm_operations_struct udl_gem_vm_ops = { 
static const struct file_operations udl_driver_fops = {

	.owner = THIS_MODULE,

	.open = drm_open,

	.mmap = drm_gem_mmap,

	.mmap = udl_drm_gem_mmap,

	.poll = drm_poll,

	.read = drm_read,

	.unlocked_ioctl	= drm_ioctl,

drivers/gpu/drm/udl/udl_drv.h

+1 −0
Original line number Diff line number Diff line
@@ -121,6 +121,7 @@ struct udl_gem_object *udl_gem_alloc_object(struct drm_device *dev, 


int udl_gem_vmap(struct udl_gem_object *obj);

void udl_gem_vunmap(struct udl_gem_object *obj);

int udl_drm_gem_mmap(struct file *filp, struct vm_area_struct *vma);

int udl_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf);



int udl_handle_damage(struct udl_framebuffer *fb, int x, int y,

drivers/gpu/drm/udl/udl_gem.c

+14 −0
Original line number Diff line number Diff line
@@ -71,6 +71,20 @@ int udl_dumb_destroy(struct drm_file *file, struct drm_device *dev, 
	return drm_gem_handle_delete(file, handle);

}



int udl_drm_gem_mmap(struct file *filp, struct vm_area_struct *vma)

{

	int ret;



	ret = drm_gem_mmap(filp, vma);

	if (ret)

		return ret;



	vma->vm_flags &= ~VM_PFNMAP;

	vma->vm_flags |= VM_MIXEDMAP;



	return ret;

}



int udl_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf)

{

	struct udl_gem_object *obj = to_udl_bo(vma->vm_private_data);