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

Commit 14fa61dd authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: kgsl: Use legacy PM4 check instead of adreno version" into msm-4.9

parents 1d7c7808 b6b96a4e

drivers/gpu/msm/adreno_ringbuffer.c

+3 −3
Original line number Diff line number Diff line
@@ -796,10 +796,10 @@ int adreno_ringbuffer_submitcmd(struct adreno_device *adreno_dev, 
		dwords += 6;



		/*

		 * REG_TO_MEM packet on A5xx needs another ordinal.

		 * REG_TO_MEM packet on A5xx and above needs another ordinal.

		 * Add 2 more dwords since we do profiling before and after.

		 */

		if (adreno_is_a5xx(adreno_dev))

		if (!ADRENO_LEGACY_PM4(adreno_dev))

			dwords += 2;



		/*
@@ -816,7 +816,7 @@ int adreno_ringbuffer_submitcmd(struct adreno_device *adreno_dev, 
	if (test_bit(CMDOBJ_PROFILE, &cmdobj->priv)) {

		kernel_profiling = true;

		dwords += 6;

		if (adreno_is_a5xx(adreno_dev))

		if (!ADRENO_LEGACY_PM4(adreno_dev))

			dwords += 2;

	}