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

Commit d2a7c5cf authored by Alexandre Roux's avatar Alexandre Roux
Browse files

Merge branch '4310-q-import_nov' into 'v1-q' 

FP3: Import 8901.3.A.0132

See merge request !7
parents 722600b7 c4d414dc

arch/arm64/configs/msm8953-perf_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -702,4 +702,3 @@ CONFIG_TAS2557_REGMAP=y 
CONFIG_TAS2557_CODEC=y

CONFIG_TAS2557_MISC=y

#[FairPhone][Audio][jinjia]=2020.05.19=2nd smart amp porting. -e

arch/arm64/configs/msm8953_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -766,4 +766,3 @@ CONFIG_TAS2557_REGMAP=y 
CONFIG_TAS2557_CODEC=y

CONFIG_TAS2557_MISC=y

#[FairPhone][Audio][jinjia]=2020.05.19=2nd smart amp porting. -e

drivers/char/adsprpc.c

+1 −1
Original line number Diff line number Diff line
@@ -2283,7 +2283,7 @@ static int fastrpc_init_process(struct fastrpc_file *fl, 
		if (!init->filelen)

			goto bail;



		proc_name = kzalloc(init->filelen, GFP_KERNEL);

		proc_name = kzalloc(init->filelen + 1, GFP_KERNEL);

		VERIFY(err, !IS_ERR_OR_NULL(proc_name));

		if (err)

			goto bail;

drivers/gpu/msm/adreno_a6xx_preempt.c

+2 −2
Original line number Diff line number Diff line
@@ -782,7 +782,7 @@ void a6xx_preemption_context_destroy(struct kgsl_context *context) 
	struct kgsl_device *device = context->device;

	struct adreno_device *adreno_dev = ADRENO_DEVICE(device);



	if (!adreno_is_preemption_enabled(adreno_dev))

	if (!ADRENO_FEATURE(adreno_dev, ADRENO_PREEMPTION))

		return;



	gpumem_free_entry(context->user_ctxt_record);
@@ -797,7 +797,7 @@ int a6xx_preemption_context_init(struct kgsl_context *context) 
	struct adreno_device *adreno_dev = ADRENO_DEVICE(device);

	uint64_t flags = 0;



	if (!adreno_is_preemption_enabled(adreno_dev))

	if (!ADRENO_FEATURE(adreno_dev, ADRENO_PREEMPTION))

		return 0;



	if (context->flags & KGSL_CONTEXT_SECURE)

drivers/gpu/msm/adreno_debugfs.c

+2 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2002,2008-2018, The Linux Foundation. All rights reserved.

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

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -281,7 +281,7 @@ static int ctx_print(struct seq_file *s, void *unused) 
		   ctx_type_str(drawctxt->type),

		   drawctxt->base.priority,

		   drawctxt->base.proc_priv->comm,

		   drawctxt->base.proc_priv->pid,

		   pid_nr(drawctxt->base.proc_priv->pid),

		   drawctxt->base.tid);



	seq_puts(s, "flags: ");