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

Commit 8872faa0 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Promotion of kernel.lnx.4.4-161021. 

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
1079803   Idee07f2104911180a9ca60490fe30f628f90b71f   ASoC: wcd934x: fix click and pop in Tx path
1077922   I8b4d464c793fd943abca2b9041f5751abc9ed22b   defconfig: msm: avoid compilation of MDSS DP driver for
1074879   I41512b4af9cd56712a241c114583b0021d1395d2   sched: don't bias towards waker cluster when sched_boost
1071757   Ife0a31e96975239bf4fefd59ac6266568c4db1a5   msm: kgsl: Add sysfs control for pwrscale

Change-Id: I26d8e461407e03bf384f5f7c33e60c50c4d67398
CRs-Fixed: 1074879, 1071757, 1079803, 1077922
parents 3564f146 8456550a

arch/arm/configs/msmfalcon_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -336,7 +336,6 @@ CONFIG_FB_MSM=y 
CONFIG_FB_MSM_MDSS=y

CONFIG_FB_MSM_MDSS_WRITEBACK=y

CONFIG_FB_MSM_MDSS_HDMI_PANEL=y

CONFIG_FB_MSM_MDSS_DP_PANEL=y

CONFIG_FB_MSM_MDSS_XLOG_DEBUG=y

CONFIG_LOGO=y

# CONFIG_LOGO_LINUX_MONO is not set

drivers/gpu/msm/adreno.c

+1 −1
Original line number Diff line number Diff line
@@ -1961,7 +1961,7 @@ static int adreno_setproperty(struct kgsl_device_private *dev_priv, 
							KGSL_STATE_ACTIVE);

				device->pwrctrl.ctrl_flags = KGSL_PWR_ON;

				adreno_fault_detect_stop(adreno_dev);

				kgsl_pwrscale_disable(device);

				kgsl_pwrscale_disable(device, true);

			}



			mutex_unlock(&device->mutex);

drivers/gpu/msm/kgsl_pwrctrl.c

+45 −0
Original line number Diff line number Diff line
@@ -1387,6 +1387,47 @@ done: 
	return 0;

}



static ssize_t kgsl_pwrctrl_pwrscale_store(struct device *dev,

					   struct device_attribute *attr,

					   const char *buf, size_t count)

{

	struct kgsl_device *device = kgsl_device_from_dev(dev);

	int ret;

	unsigned int enable = 0;



	if (device == NULL)

		return 0;



	ret = kgsl_sysfs_store(buf, &enable);

	if (ret)

		return ret;



	mutex_lock(&device->mutex);



	if (enable)

		kgsl_pwrscale_enable(device);

	else

		kgsl_pwrscale_disable(device, false);



	mutex_unlock(&device->mutex);



	return count;

}



static ssize_t kgsl_pwrctrl_pwrscale_show(struct device *dev,

					  struct device_attribute *attr,

					  char *buf)

{

	struct kgsl_device *device = kgsl_device_from_dev(dev);

	struct kgsl_pwrscale *psc;



	if (device == NULL)

		return 0;

	psc = &device->pwrscale;



	return snprintf(buf, PAGE_SIZE, "%u\n", psc->enabled);

}



static DEVICE_ATTR(gpuclk, 0644, kgsl_pwrctrl_gpuclk_show,

	kgsl_pwrctrl_gpuclk_store);

static DEVICE_ATTR(max_gpuclk, 0644, kgsl_pwrctrl_max_gpuclk_show,
@@ -1449,6 +1490,9 @@ static DEVICE_ATTR(clock_mhz, 0444, kgsl_pwrctrl_clock_mhz_show, NULL); 
static DEVICE_ATTR(freq_table_mhz, 0444,

	kgsl_pwrctrl_freq_table_mhz_show, NULL);

static DEVICE_ATTR(temp, 0444, kgsl_pwrctrl_temp_show, NULL);

static DEVICE_ATTR(pwrscale, 0644,

	kgsl_pwrctrl_pwrscale_show,

	kgsl_pwrctrl_pwrscale_store);



static const struct device_attribute *pwrctrl_attr_list[] = {

	&dev_attr_gpuclk,
@@ -1477,6 +1521,7 @@ static const struct device_attribute *pwrctrl_attr_list[] = { 
	&dev_attr_clock_mhz,

	&dev_attr_freq_table_mhz,

	&dev_attr_temp,

	&dev_attr_pwrscale,

	NULL

};

drivers/gpu/msm/kgsl_pwrscale.c

+4 −2
Original line number Diff line number Diff line
@@ -189,18 +189,20 @@ EXPORT_SYMBOL(kgsl_pwrscale_update); 
/*

 * kgsl_pwrscale_disable - temporarily disable the governor

 * @device: The device

 * @turbo: Indicates if pwrlevel should be forced to turbo

 *

 * Temporarily disable the governor, to prevent interference

 * with profiling tools that expect a fixed clock frequency.

 * This function must be called with the device mutex locked.

 */

void kgsl_pwrscale_disable(struct kgsl_device *device)

void kgsl_pwrscale_disable(struct kgsl_device *device, bool turbo)

{

	BUG_ON(!mutex_is_locked(&device->mutex));

	if (device->pwrscale.devfreqptr)

		queue_work(device->pwrscale.devfreq_wq,

			&device->pwrscale.devfreq_suspend_ws);

	device->pwrscale.enabled = false;

	if (turbo)

		kgsl_pwrctrl_pwrlevel_change(device, KGSL_PWRLEVEL_TURBO);

}

EXPORT_SYMBOL(kgsl_pwrscale_disable);

drivers/gpu/msm/kgsl_pwrscale.h

+2 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2010-2015, The Linux Foundation. All rights reserved.

/* Copyright (c) 2010-2016, 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
@@ -123,7 +123,7 @@ void kgsl_pwrscale_sleep(struct kgsl_device *device); 
void kgsl_pwrscale_wake(struct kgsl_device *device);



void kgsl_pwrscale_enable(struct kgsl_device *device);

void kgsl_pwrscale_disable(struct kgsl_device *device);

void kgsl_pwrscale_disable(struct kgsl_device *device, bool turbo);



int kgsl_devfreq_target(struct device *dev, unsigned long *freq, u32 flags);

int kgsl_devfreq_get_dev_status(struct device *, struct devfreq_dev_status *);