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

Commit 1d8f5477 authored by Carter Cooper's avatar Carter Cooper
Browse files

msm: kgsl: Move set_secured_mode into adreno 



This is some common code, so move it to the base and make sure
all common registers are set/initialized properly.

Change-Id: Iedc83611d7c6801ff3906a44fc6cf6b1b216d440
Signed-off-by: default avatarCarter Cooper <ccooper@codeaurora.org>
parent 8567af02

drivers/gpu/msm/adreno.c

+47 −0
Original line number Diff line number Diff line
@@ -1365,6 +1365,53 @@ static void _set_secvid(struct kgsl_device *device) 
	}

}



static int adreno_switch_to_unsecure_mode(struct adreno_device *adreno_dev,

				struct adreno_ringbuffer *rb)

{

	unsigned int *cmds;

	int ret;



	cmds = adreno_ringbuffer_allocspace(rb, 2);

	if (IS_ERR(cmds))

		return PTR_ERR(cmds);

	if (cmds == NULL)

		return -ENOSPC;



	cmds += cp_secure_mode(adreno_dev, cmds, 0);



	ret = adreno_ringbuffer_submit_spin(rb, NULL, 2000);

	if (ret)

		adreno_spin_idle_debug(adreno_dev,

				"Switch to unsecure failed to idle\n");



	return ret;

}



int adreno_set_unsecured_mode(struct adreno_device *adreno_dev,

		struct adreno_ringbuffer *rb)

{

	int ret = 0;



	if (!adreno_is_a5xx(adreno_dev))

		return -EINVAL;



	if (ADRENO_QUIRK(adreno_dev, ADRENO_QUIRK_CRITICAL_PACKETS) &&

			adreno_is_a5xx(adreno_dev)) {

		ret = a5xx_critical_packet_submit(adreno_dev, rb);

		if (ret)

			return ret;

	}



	/* GPU comes up in secured mode, make it unsecured by default */

	if (ADRENO_FEATURE(adreno_dev, ADRENO_CONTENT_PROTECTION))

		ret = adreno_switch_to_unsecure_mode(adreno_dev, rb);

	else

		adreno_writereg(adreno_dev,

				ADRENO_REG_RBBM_SECVID_TRUST_CONTROL, 0x0);



	return ret;

}



/**

 * _adreno_start - Power up the GPU and prepare to accept commands

 * @adreno_dev: Pointer to an adreno_device structure

drivers/gpu/msm/adreno.h

+4 −0
Original line number Diff line number Diff line
@@ -951,6 +951,10 @@ long adreno_ioctl_helper(struct kgsl_device_private *dev_priv, 
		unsigned int cmd, unsigned long arg,

		const struct kgsl_ioctl *cmds, int len);



int a5xx_critical_packet_submit(struct adreno_device *adreno_dev,

		struct adreno_ringbuffer *rb);

int adreno_set_unsecured_mode(struct adreno_device *adreno_dev,

		struct adreno_ringbuffer *rb);

void adreno_spin_idle_debug(struct adreno_device *adreno_dev, const char *str);

int adreno_spin_idle(struct adreno_device *device, unsigned int timeout);

int adreno_idle(struct kgsl_device *device);

drivers/gpu/msm/adreno_a5xx.c

+2 −45
Original line number Diff line number Diff line
@@ -2150,28 +2150,6 @@ static int a5xx_gpmu_init(struct adreno_device *adreno_dev) 
	return 0;

}



static int a5xx_switch_to_unsecure_mode(struct adreno_device *adreno_dev,

				struct adreno_ringbuffer *rb)

{

	unsigned int *cmds;

	int ret;



	cmds = adreno_ringbuffer_allocspace(rb, 2);

	if (IS_ERR(cmds))

		return PTR_ERR(cmds);

	if (cmds == NULL)

		return -ENOSPC;



	cmds += cp_secure_mode(adreno_dev, cmds, 0);



	ret = adreno_ringbuffer_submit_spin(rb, NULL, 2000);

	if (ret)

		adreno_spin_idle_debug(adreno_dev,

				"Switch to unsecure failed to idle\n");



	return ret;

}



/*

 * a5xx_microcode_load() - Load microcode

 * @adreno_dev: Pointer to adreno device
@@ -2332,7 +2310,7 @@ static void _set_ordinals(struct adreno_device *adreno_dev, 
		*cmds++ = 0x0;

}



static int a5xx_critical_packet_submit(struct adreno_device *adreno_dev,

int a5xx_critical_packet_submit(struct adreno_device *adreno_dev,

					struct adreno_ringbuffer *rb)

{

	unsigned int *cmds;
@@ -2388,27 +2366,6 @@ static int a5xx_send_me_init(struct adreno_device *adreno_dev, 
	return ret;

}



static int a5xx_set_unsecured_mode(struct adreno_device *adreno_dev,

		struct adreno_ringbuffer *rb)

{

	int ret = 0;



	if (ADRENO_QUIRK(adreno_dev, ADRENO_QUIRK_CRITICAL_PACKETS)) {

		ret = a5xx_critical_packet_submit(adreno_dev, rb);

		if (ret)

			return ret;

	}



	/* GPU comes up in secured mode, make it unsecured by default */

	if (ADRENO_FEATURE(adreno_dev, ADRENO_CONTENT_PROTECTION))

		ret = a5xx_switch_to_unsecure_mode(adreno_dev, rb);

	else

		kgsl_regwrite(&adreno_dev->dev,

				A5XX_RBBM_SECVID_TRUST_CNTL, 0x0);



	return ret;

}



/*

 * a5xx_rb_start() - Start the ringbuffer

 * @adreno_dev: Pointer to adreno device
@@ -2452,7 +2409,7 @@ static int a5xx_rb_start(struct adreno_device *adreno_dev, 
		return ret;



	/* GPU comes up in secured mode, make it unsecured by default */

	ret = a5xx_set_unsecured_mode(adreno_dev, rb);

	ret = adreno_set_unsecured_mode(adreno_dev, rb);

	if (ret)

		return ret;