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

Commit cc9bae59 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: kgsl: Correct gfp mask passed to kvcalloc"

parents c70bd553 fde3eab7

drivers/gpu/msm/kgsl.c

+2 −4
Original line number Diff line number Diff line
@@ -1950,8 +1950,7 @@ long kgsl_ioctl_gpu_aux_command(struct kgsl_device_private *dev_priv, 
	if (param->flags & KGSL_GPU_AUX_COMMAND_SYNC)

		count++;



	drawobjs = kvcalloc(count, sizeof(*drawobjs),

		GFP_KERNEL | __GFP_NORETRY | __GFP_NOWARN);

	drawobjs = kvcalloc(count, sizeof(*drawobjs), GFP_KERNEL);



	if (!drawobjs) {

		kgsl_context_put(context);
@@ -2396,8 +2395,7 @@ static int memdesc_sg_virt(struct kgsl_memdesc *memdesc, unsigned long useraddr) 
	if (sglen == 0 || sglen >= LONG_MAX)

		return -EINVAL;



	pages = kvcalloc(sglen, sizeof(*pages),

		GFP_KERNEL | __GFP_NORETRY | __GFP_NOWARN);

	pages = kvcalloc(sglen, sizeof(*pages), GFP_KERNEL);

	if (pages == NULL)

		return -ENOMEM;

drivers/gpu/msm/kgsl_drawobj.c

+1 −2
Original line number Diff line number Diff line
@@ -881,8 +881,7 @@ int kgsl_drawobj_add_timeline(struct kgsl_device_private *dev_priv, 
		return -EINVAL;



	timelineobj->timelines = kvcalloc(cmd.count,

		sizeof(*timelineobj->timelines),

		GFP_KERNEL | __GFP_NORETRY | __GFP_NOWARN);

		sizeof(*timelineobj->timelines), GFP_KERNEL);

	if (!timelineobj->timelines)

		return -ENOMEM;

drivers/gpu/msm/kgsl_pool.c

+1 −2
Original line number Diff line number Diff line
@@ -443,8 +443,7 @@ int kgsl_pool_alloc_pages(u64 size, struct page ***pages, struct device *dev) 
{

	int count = 0;

	int npages = size >> PAGE_SHIFT;

	struct page **local = kvcalloc(npages, sizeof(*local),

		GFP_KERNEL | __GFP_NORETRY | __GFP_NOWARN);

	struct page **local = kvcalloc(npages, sizeof(*local), GFP_KERNEL);

	u32 page_size, align;

	u64 len = size;

drivers/gpu/msm/kgsl_sharedmem.c

+2 −2
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * Copyright (c) 2002,2007-2020, The Linux Foundation. All rights reserved.

 * Copyright (c) 2002,2007-2021, The Linux Foundation. All rights reserved.

 */



#include <asm/cacheflush.h>
@@ -1000,7 +1000,7 @@ static int kgsl_system_alloc_pages(u64 size, struct page ***pages, 
	struct page **local;

	int i, npages = size >> PAGE_SHIFT;



	local = kvcalloc(npages, sizeof(*pages), GFP_KERNEL | __GFP_NORETRY);

	local = kvcalloc(npages, sizeof(*pages), GFP_KERNEL);

	if (!local)

		return -ENOMEM;