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

Commit 6682ead5 authored by Carter Cooper's avatar Carter Cooper
Browse files

msm: kgsl: Set secure regions once 



Only set the secure region registers once. Set them before
trustzone loads the zap shader since that will change them
to readonly.

Change-Id: I56229a374d6faf2c1422dbdb5ad5475a63ed6ed4
Signed-off-by: default avatarCarter Cooper <ccooper@codeaurora.org>
parent e13b7564

drivers/gpu/msm/adreno.c

+5 −1
Original line number Diff line number Diff line
@@ -898,6 +898,7 @@ static struct { 
	 { ADRENO_QUIRK_DISABLE_LMLOADKILL,

			"qcom,gpu-quirk-lmloadkill-disable" },

	{ ADRENO_QUIRK_HFI_USE_REG, "qcom,gpu-quirk-hfi-use-reg" },

	{ ADRENO_QUIRK_SECVID_SET_ONCE, "qcom,gpu-quirk-secvid-set-once" },

};



static int adreno_of_get_power(struct adreno_device *adreno_dev,
@@ -1389,9 +1390,10 @@ static bool regulators_left_on(struct kgsl_device *device) 
static void _set_secvid(struct kgsl_device *device)

{

	struct adreno_device *adreno_dev = ADRENO_DEVICE(device);

	static bool set;



	/* Program GPU contect protection init values */

	if (device->mmu.secured) {

	if (device->mmu.secured && !set) {

		if (adreno_is_a4xx(adreno_dev))

			adreno_writereg(adreno_dev,

				ADRENO_REG_RBBM_SECVID_TRUST_CONFIG, 0x2);
@@ -1405,6 +1407,8 @@ static void _set_secvid(struct kgsl_device *device) 
		adreno_writereg(adreno_dev,

			ADRENO_REG_RBBM_SECVID_TSB_TRUSTED_SIZE,

			KGSL_IOMMU_SECURE_SIZE);

		if (ADRENO_QUIRK(adreno_dev, ADRENO_QUIRK_SECVID_SET_ONCE))

			set = true;

	}

}

drivers/gpu/msm/adreno.h

+2 −0
Original line number Diff line number Diff line
@@ -140,6 +140,8 @@ 
#define ADRENO_QUIRK_DISABLE_LMLOADKILL BIT(5)

/* Allow HFI to use registers to send message to GMU */

#define ADRENO_QUIRK_HFI_USE_REG BIT(6)

/* Only set protected SECVID registers once */

#define ADRENO_QUIRK_SECVID_SET_ONCE BIT(7)



/* Flags to control command packet settings */

#define KGSL_CMD_FLAGS_NONE             0