Merge "msm: kgsl: Add gpu_frequency trace during SLUMBER entry and exit" (92fc776b) · Commits · e / devices / android_kernel_xiaomi_nabu

drivers/gpu/msm/kgsl_pwrctrl.c

+7 −1

Original line number	Diff line number	Diff line
		/* Copyright (c) 2010-2019, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2010-2020, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -2791,6 +2791,7 @@ static int _wake(struct kgsl_device *device)
		{
		struct kgsl_pwrctrl *pwr = &device->pwrctrl;
		int status = 0;
		unsigned int state = device->state;

		switch (device->state) {
		case KGSL_STATE_SUSPEND:
		@@ -2817,6 +2818,9 @@ static int _wake(struct kgsl_device *device)
		/* Turn on the core clocks */
		kgsl_pwrctrl_clk(device, KGSL_PWRFLAGS_ON, KGSL_STATE_ACTIVE);

		if (state == KGSL_STATE_SLUMBER \|\| state == KGSL_STATE_SUSPEND)
		trace_gpu_frequency(
		pwr->pwrlevels[pwr->active_pwrlevel].gpu_freq/1000, 0);
		/*
		* No need to turn on/off irq here as it no longer affects
		* power collapse
		@@ -3025,6 +3029,7 @@ _slumber(struct kgsl_device *device)
		kgsl_pwrctrl_clk_set_options(device, false);
		kgsl_pwrctrl_disable(device);
		kgsl_pwrscale_sleep(device);
		trace_gpu_frequency(0, 0);
		kgsl_pwrctrl_set_state(device, KGSL_STATE_SLUMBER);
		pm_qos_update_request(&device->pwrctrl.pm_qos_req_dma,
		PM_QOS_DEFAULT_VALUE);
		@@ -3040,6 +3045,7 @@ _slumber(struct kgsl_device *device)
		break;
		case KGSL_STATE_AWARE:
		kgsl_pwrctrl_disable(device);
		trace_gpu_frequency(0, 0);
		kgsl_pwrctrl_set_state(device, KGSL_STATE_SLUMBER);
		break;
		default: