mirror of
https://github.com/hardkernel/linux.git
synced 2026-06-08 20:07:46 +09:00
PM / devfreq: rockchip_dmc: ignore notifier during dmcfreq suspend
Do not allow changes to frequency and voltage after dmcfreq enter suspend. Change-Id: Ide146cfd49d77ee7dff88bd3b9eeb2e5d2ec82c0 Signed-off-by: YouMin Chen <cym@rock-chips.com>
This commit is contained in:
@@ -110,7 +110,7 @@ struct rockchip_dmcfreq {
|
||||
struct rockchip_dmcfreq_ondemand_data ondemand_data;
|
||||
struct clk *dmc_clk;
|
||||
struct devfreq_event_dev **edev;
|
||||
struct mutex lock; /* serializes access to video_info_list */
|
||||
struct mutex lock;
|
||||
struct dram_timing *timing;
|
||||
struct notifier_block status_nb;
|
||||
struct notifier_block panic_nb;
|
||||
@@ -161,6 +161,7 @@ struct rockchip_dmcfreq {
|
||||
|
||||
bool is_fixed;
|
||||
bool is_set_rate_direct;
|
||||
bool is_in_suspend;
|
||||
|
||||
unsigned int touchboostpulse_duration_val;
|
||||
u64 touchboostpulse_endtime;
|
||||
@@ -2524,15 +2525,16 @@ static void rockchip_dmcfreq_update_target(struct rockchip_dmcfreq *dmcfreq)
|
||||
mutex_unlock(&devfreq->lock);
|
||||
}
|
||||
|
||||
static int rockchip_dmcfreq_system_status_notifier(struct notifier_block *nb,
|
||||
unsigned long status,
|
||||
void *ptr)
|
||||
static int rockchip_dmcfreq_system_status_notifier_locked(struct rockchip_dmcfreq *dmcfreq,
|
||||
unsigned long status)
|
||||
{
|
||||
struct rockchip_dmcfreq *dmcfreq = system_status_to_dmcfreq(nb);
|
||||
unsigned long target_rate = 0;
|
||||
unsigned int refresh = false;
|
||||
bool is_fixed = false;
|
||||
|
||||
if (dmcfreq->is_in_suspend)
|
||||
return NOTIFY_DONE;
|
||||
|
||||
if (dmcfreq->fixed_rate && (is_dualview(status) || is_isp(status))) {
|
||||
if (dmcfreq->is_fixed)
|
||||
return NOTIFY_OK;
|
||||
@@ -2614,6 +2616,20 @@ next:
|
||||
return NOTIFY_OK;
|
||||
}
|
||||
|
||||
static int rockchip_dmcfreq_system_status_notifier(struct notifier_block *nb,
|
||||
unsigned long status,
|
||||
void *ptr)
|
||||
{
|
||||
struct rockchip_dmcfreq *dmcfreq = system_status_to_dmcfreq(nb);
|
||||
int ret;
|
||||
|
||||
mutex_lock(&dmcfreq->lock);
|
||||
ret = rockchip_dmcfreq_system_status_notifier_locked(dmcfreq, status);
|
||||
mutex_unlock(&dmcfreq->lock);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int rockchip_dmcfreq_panic_notifier(struct notifier_block *nb,
|
||||
unsigned long v, void *p)
|
||||
{
|
||||
@@ -3358,17 +3374,13 @@ static int rockchip_dmcfreq_probe(struct platform_device *pdev)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static __maybe_unused int rockchip_dmcfreq_suspend(struct device *dev)
|
||||
static int rockchip_dmcfreq_suspend_locked(struct rockchip_dmcfreq *dmcfreq)
|
||||
{
|
||||
struct rockchip_dmcfreq *dmcfreq = dev_get_drvdata(dev);
|
||||
struct rockchip_opp_info *opp_info;
|
||||
struct regulator *vdd_reg = NULL;
|
||||
struct regulator *mem_reg = NULL;
|
||||
int ret = 0;
|
||||
|
||||
if (!dmcfreq)
|
||||
return 0;
|
||||
|
||||
ret = rockchip_dmcfreq_disable_event(dmcfreq);
|
||||
if (ret)
|
||||
return ret;
|
||||
@@ -3376,7 +3388,7 @@ static __maybe_unused int rockchip_dmcfreq_suspend(struct device *dev)
|
||||
if (dmcfreq->info.devfreq) {
|
||||
ret = devfreq_suspend_device(dmcfreq->info.devfreq);
|
||||
if (ret < 0) {
|
||||
dev_err(dev, "failed to suspend the devfreq devices\n");
|
||||
dev_err(dmcfreq->dev, "failed to suspend the devfreq devices\n");
|
||||
return ret;
|
||||
}
|
||||
}
|
||||
@@ -3393,7 +3405,7 @@ static __maybe_unused int rockchip_dmcfreq_suspend(struct device *dev)
|
||||
dmcfreq->sleep_volt != dmcfreq->volt) {
|
||||
ret = regulator_set_voltage(vdd_reg, dmcfreq->sleep_volt, INT_MAX);
|
||||
if (ret) {
|
||||
dev_err(dev, "Cannot set vdd voltage %lu uV\n",
|
||||
dev_err(dmcfreq->dev, "Cannot set vdd voltage %lu uV\n",
|
||||
dmcfreq->sleep_volt);
|
||||
return ret;
|
||||
}
|
||||
@@ -3402,7 +3414,7 @@ static __maybe_unused int rockchip_dmcfreq_suspend(struct device *dev)
|
||||
dmcfreq->sleep_mem_volt != dmcfreq->mem_volt) {
|
||||
ret = regulator_set_voltage(mem_reg, dmcfreq->sleep_mem_volt, INT_MAX);
|
||||
if (ret) {
|
||||
dev_err(dev, "Cannot set mem voltage %lu uV\n",
|
||||
dev_err(dmcfreq->dev, "Cannot set mem voltage %lu uV\n",
|
||||
dmcfreq->sleep_mem_volt);
|
||||
return ret;
|
||||
}
|
||||
@@ -3411,17 +3423,13 @@ static __maybe_unused int rockchip_dmcfreq_suspend(struct device *dev)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static __maybe_unused int rockchip_dmcfreq_resume(struct device *dev)
|
||||
static int rockchip_dmcfreq_resume_locked(struct rockchip_dmcfreq *dmcfreq)
|
||||
{
|
||||
struct rockchip_dmcfreq *dmcfreq = dev_get_drvdata(dev);
|
||||
struct rockchip_opp_info *opp_info;
|
||||
struct regulator *vdd_reg = NULL;
|
||||
struct regulator *mem_reg = NULL;
|
||||
int ret = 0;
|
||||
|
||||
if (!dmcfreq)
|
||||
return 0;
|
||||
|
||||
opp_info = &dmcfreq->opp_info;
|
||||
if (opp_info->regulators) {
|
||||
vdd_reg = opp_info->regulators[0];
|
||||
@@ -3434,7 +3442,7 @@ static __maybe_unused int rockchip_dmcfreq_resume(struct device *dev)
|
||||
ret = regulator_set_voltage(vdd_reg, dmcfreq->volt,
|
||||
INT_MAX);
|
||||
if (ret) {
|
||||
dev_err(dev, "Cannot set vdd voltage %lu uV\n",
|
||||
dev_err(dmcfreq->dev, "Cannot set vdd voltage %lu uV\n",
|
||||
dmcfreq->volt);
|
||||
return ret;
|
||||
}
|
||||
@@ -3444,7 +3452,7 @@ static __maybe_unused int rockchip_dmcfreq_resume(struct device *dev)
|
||||
ret = regulator_set_voltage(mem_reg, dmcfreq->mem_volt,
|
||||
INT_MAX);
|
||||
if (ret) {
|
||||
dev_err(dev, "Cannot set mem voltage %lu uV\n",
|
||||
dev_err(dmcfreq->dev, "Cannot set mem voltage %lu uV\n",
|
||||
dmcfreq->mem_volt);
|
||||
return ret;
|
||||
}
|
||||
@@ -3458,7 +3466,7 @@ static __maybe_unused int rockchip_dmcfreq_resume(struct device *dev)
|
||||
if (dmcfreq->info.devfreq) {
|
||||
ret = devfreq_resume_device(dmcfreq->info.devfreq);
|
||||
if (ret < 0) {
|
||||
dev_err(dev, "failed to resume the devfreq devices\n");
|
||||
dev_err(dmcfreq->dev, "failed to resume the devfreq devices\n");
|
||||
return ret;
|
||||
}
|
||||
}
|
||||
@@ -3466,6 +3474,39 @@ static __maybe_unused int rockchip_dmcfreq_resume(struct device *dev)
|
||||
return ret;
|
||||
}
|
||||
|
||||
static __maybe_unused int rockchip_dmcfreq_suspend(struct device *dev)
|
||||
{
|
||||
struct rockchip_dmcfreq *dmcfreq = dev_get_drvdata(dev);
|
||||
int ret = 0;
|
||||
|
||||
if (!dmcfreq)
|
||||
return 0;
|
||||
|
||||
mutex_lock(&dmcfreq->lock);
|
||||
ret = rockchip_dmcfreq_suspend_locked(dmcfreq);
|
||||
if (!ret)
|
||||
dmcfreq->is_in_suspend = true;
|
||||
mutex_unlock(&dmcfreq->lock);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
static __maybe_unused int rockchip_dmcfreq_resume(struct device *dev)
|
||||
{
|
||||
struct rockchip_dmcfreq *dmcfreq = dev_get_drvdata(dev);
|
||||
int ret = 0;
|
||||
|
||||
if (!dmcfreq)
|
||||
return 0;
|
||||
|
||||
mutex_lock(&dmcfreq->lock);
|
||||
ret = rockchip_dmcfreq_resume_locked(dmcfreq);
|
||||
dmcfreq->is_in_suspend = false;
|
||||
mutex_unlock(&dmcfreq->lock);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
static SIMPLE_DEV_PM_OPS(rockchip_dmcfreq_pm, rockchip_dmcfreq_suspend,
|
||||
rockchip_dmcfreq_resume);
|
||||
static struct platform_driver rockchip_dmcfreq_driver = {
|
||||
|
||||
Reference in New Issue
Block a user