summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2018-10-05 01:30:07 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2018-10-05 01:30:06 -0700
commit8ce3cab712ce1c94b4bce853213826ff2afa8a80 (patch)
tree44fc4dbfde7f6dc00b76d7920499c89f1e700498
parent6ff7453f913b1d780eae57a0d2da4d5b5b8a3985 (diff)
parent6be9ea0129ab29428aaaf14b73b8f90bc6867a88 (diff)
Merge "drm: msm: update cpu1 hotplug by using cpu_device node"
-rw-r--r--drivers/gpu/drm/msm/sde/sde_connector.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/drivers/gpu/drm/msm/sde/sde_connector.c b/drivers/gpu/drm/msm/sde/sde_connector.c
index a986f5db2c41..5f6b93931c35 100644
--- a/drivers/gpu/drm/msm/sde/sde_connector.c
+++ b/drivers/gpu/drm/msm/sde/sde_connector.c
@@ -19,6 +19,8 @@
#include "sde_splash.h"
#include <linux/workqueue.h>
#include <linux/atomic.h>
+#include <linux/cpu.h>
+#include <linux/device.h>
#define SDE_DEBUG_CONN(c, fmt, ...) SDE_DEBUG("conn%d " fmt,\
(c) ? (c)->base.base.id : -1, ##__VA_ARGS__)
@@ -574,7 +576,14 @@ void sde_connector_prepare_fence(struct drm_connector *connector)
static void wake_up_cpu(struct work_struct *work)
{
- if (!cpu_up(1))
+ struct device *cpu_dev = NULL;
+
+ cpu_dev = get_cpu_device(1);
+ if (!cpu_dev) {
+ pr_err("Could not get cpu1 device\n");
+ return;
+ }
+ if (!device_online(cpu_dev))
pr_info("cpu1 is online\n");
}