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

Commit bf132b4f authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: kgsl: Use a constant mask for the memops vmflags"

parents c2c91c7f 6113c9c4

drivers/gpu/msm/kgsl.c

+1 −1
Original line number Diff line number Diff line
@@ -3971,7 +3971,7 @@ static int kgsl_mmap(struct file *file, struct vm_area_struct *vma) 
	if (ret)

		return ret;



	vma->vm_flags |= entry->memdesc.ops->vmflags(&entry->memdesc);

	vma->vm_flags |= entry->memdesc.ops->vmflags;



	vma->vm_private_data = entry;

drivers/gpu/msm/kgsl.h

+1 −1
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ struct kgsl_memdesc; 
struct kgsl_cmdbatch;



struct kgsl_memdesc_ops {

	int (*vmflags)(struct kgsl_memdesc *);

	unsigned int vmflags;

	int (*vmfault)(struct kgsl_memdesc *, struct vm_area_struct *,

		       struct vm_fault *);

	void (*free)(struct kgsl_memdesc *memdesc);

drivers/gpu/msm/kgsl_sharedmem.c

+2 −12
Original line number Diff line number Diff line
@@ -339,16 +339,6 @@ static int kgsl_page_alloc_vmfault(struct kgsl_memdesc *memdesc, 
	return VM_FAULT_SIGBUS;

}



static int kgsl_page_alloc_vmflags(struct kgsl_memdesc *memdesc)

{

	return VM_IO | VM_DONTEXPAND;

}



static int kgsl_contiguous_vmflags(struct kgsl_memdesc *memdesc)

{

	return VM_IO | VM_PFNMAP | VM_DONTEXPAND;

}



/*

 * kgsl_page_alloc_unmap_kernel() - Unmap the memory in memdesc

 *
@@ -484,7 +474,7 @@ static void kgsl_cma_coherent_free(struct kgsl_memdesc *memdesc) 
/* Global - also used by kgsl_drm.c */

static struct kgsl_memdesc_ops kgsl_page_alloc_ops = {

	.free = kgsl_page_alloc_free,

	.vmflags = kgsl_page_alloc_vmflags,

	.vmflags = VM_IO | VM_DONTEXPAND,

	.vmfault = kgsl_page_alloc_vmfault,

	.map_kernel = kgsl_page_alloc_map_kernel,

	.unmap_kernel = kgsl_page_alloc_unmap_kernel,
@@ -493,7 +483,7 @@ static struct kgsl_memdesc_ops kgsl_page_alloc_ops = { 
/* CMA ops - used during NOMMU mode */

static struct kgsl_memdesc_ops kgsl_cma_ops = {

	.free = kgsl_cma_coherent_free,

	.vmflags = kgsl_contiguous_vmflags,

	.vmflags = VM_IO | VM_PFNMAP | VM_DONTEXPAND,

	.vmfault = kgsl_contiguous_vmfault,

};