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

Commit 4d4e4d04 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: Do not enable/disable SPTP if already enabled/disabled"

parents 67f9af20 7631272f

drivers/gpu/msm/adreno.c

+12 −2
Original line number Diff line number Diff line
@@ -2769,8 +2769,13 @@ static void adreno_regulator_enable(struct kgsl_device *device) 
{

	struct adreno_device *adreno_dev = ADRENO_DEVICE(device);

	struct adreno_gpudev *gpudev  = ADRENO_GPU_DEVICE(adreno_dev);

	if (gpudev->regulator_enable)

	if (gpudev->regulator_enable &&

		!test_bit(ADRENO_DEVICE_GPU_REGULATOR_ENABLED,

			&adreno_dev->priv)) {

		gpudev->regulator_enable(adreno_dev);

		set_bit(ADRENO_DEVICE_GPU_REGULATOR_ENABLED,

			&adreno_dev->priv);

	}

}



static bool adreno_is_hw_collapsible(struct kgsl_device *device)
@@ -2786,8 +2791,13 @@ static void adreno_regulator_disable(struct kgsl_device *device) 
{

	struct adreno_device *adreno_dev = ADRENO_DEVICE(device);

	struct adreno_gpudev *gpudev  = ADRENO_GPU_DEVICE(adreno_dev);

	if (gpudev->regulator_disable)

	if (gpudev->regulator_disable &&

		test_bit(ADRENO_DEVICE_GPU_REGULATOR_ENABLED,

			&adreno_dev->priv)) {

		gpudev->regulator_disable(adreno_dev);

		clear_bit(ADRENO_DEVICE_GPU_REGULATOR_ENABLED,

			&adreno_dev->priv);

	}

}



static const struct kgsl_functable adreno_functable = {

drivers/gpu/msm/adreno.h

+1 −0
Original line number Diff line number Diff line
@@ -271,6 +271,7 @@ enum adreno_device_flags { 
	ADRENO_DEVICE_STARTED = 5,

	ADRENO_DEVICE_FAULT = 6,

	ADRENO_DEVICE_CMDBATCH_PROFILE = 7,

	ADRENO_DEVICE_GPU_REGULATOR_ENABLED = 8,

};



#define PERFCOUNTER_FLAG_NONE 0x0