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

Commit bc87c9ff authored by Akhil P Oommen's avatar Akhil P Oommen
Browse files

msm: kgsl: Fix skipping aperture programming 



During the first adreno_start(), we initialize the global PT and
make an scm call to program the aperture related registers. This
programing is skipped when scm_is_call_available() call fails.
Skipping aperture programing can make CP get stuck during a
context switch. To fix this, avoid scm_is_call_available() call
and force aperture programing from secure world for all a6xx GPUs.

Change-Id: I13923afbece0be12b1a9336b7d20c3039164a6b6
Signed-off-by: default avatarAkhil P Oommen <akhilpo@codeaurora.org>
parent f6a4f1b0

drivers/gpu/msm/adreno.c

+3 −0
Original line number Diff line number Diff line
@@ -1440,6 +1440,9 @@ static int adreno_probe(struct platform_device *pdev) 
	if (adreno_support_64bit(adreno_dev))

		device->mmu.features |= KGSL_MMU_64BIT;



	if (adreno_is_a6xx(adreno_dev))

		device->mmu.features |= KGSL_MMU_SMMU_APERTURE;



	device->pwrctrl.bus_width = adreno_dev->gpucore->bus_width;



	status = kgsl_device_platform_probe(device);

drivers/gpu/msm/kgsl_iommu.c

+2 −2
Original line number Diff line number Diff line
@@ -1203,8 +1203,8 @@ static int _init_global_pt(struct kgsl_mmu *mmu, struct kgsl_pagetable *pt) 
		goto done;

	}



	if (!MMU_FEATURE(mmu, KGSL_MMU_GLOBAL_PAGETABLE) &&

		scm_is_call_available(SCM_SVC_MP, CP_SMMU_APERTURE_ID)) {

	if (kgsl_mmu_is_perprocess(mmu) && MMU_FEATURE(mmu,

				KGSL_MMU_SMMU_APERTURE)) {

		struct scm_desc desc = {0};



		desc.args[0] = 0xFFFF0000 | ((CP_APERTURE_REG & 0xff) << 8) |

drivers/gpu/msm/kgsl_mmu.h

+3 −1
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

/*

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

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

 */

#ifndef __KGSL_MMU_H

#define __KGSL_MMU_H
@@ -135,6 +135,8 @@ struct kgsl_mmu_pt_ops { 
#define KGSL_MMU_NEED_GUARD_PAGE BIT(9)

/* The device supports IO coherency */

#define KGSL_MMU_IO_COHERENT BIT(10)

/* The device supports aperture programming from secure world */

#define KGSL_MMU_SMMU_APERTURE BIT(11)



/**

 * struct kgsl_mmu - Master definition for KGSL MMU devices