summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Gortmaker <paul.gortmaker@windriver.com>2017-06-02 12:29:57 -0400
committerPaul Gortmaker <paul.gortmaker@windriver.com>2017-06-02 12:29:57 -0400
commitf9538eb446be87a1da3c2abf04de0250455704c7 (patch)
treea9f2938c016a06a72618cef7a6b129fa60ae5a89
parent3999c3a7fd25a737a48243a55684ade4233b8180 (diff)
downloadlongterm-queue-4.8-f9538eb446be87a1da3c2abf04de0250455704c7.tar.gz
drm: context refresh
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
-rw-r--r--queue/drm-bridge-analogix-dp-Fix-runtime-PM-state-on-drive.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/queue/drm-bridge-analogix-dp-Fix-runtime-PM-state-on-drive.patch b/queue/drm-bridge-analogix-dp-Fix-runtime-PM-state-on-drive.patch
index 2c3f4b6..f1f45f4 100644
--- a/queue/drm-bridge-analogix-dp-Fix-runtime-PM-state-on-drive.patch
+++ b/queue/drm-bridge-analogix-dp-Fix-runtime-PM-state-on-drive.patch
@@ -1,4 +1,4 @@
-From f0a8b49c03d22a511a601dc54b2a3425a41e35fa Mon Sep 17 00:00:00 2001
+From 5bbccb3aeaa53fd1a4ef5b7c7baaef9e5c4bf237 Mon Sep 17 00:00:00 2001
From: Marek Szyprowski <m.szyprowski@samsung.com>
Date: Fri, 30 Dec 2016 10:57:46 +0100
Subject: [PATCH] drm/bridge: analogix dp: Fix runtime PM state on driver bind
@@ -55,18 +55,18 @@ Signed-off-by: Archit Taneja <architt@codeaurora.org>
Link: http://patchwork.freedesktop.org/patch/msgid/1483091866-1088-1-git-send-email-m.szyprowski@samsung.com
diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
-index eb9bf8786c24..18eefdcbf1ba 100644
+index 32715daf73cb..81d112aef7dd 100644
--- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
+++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
-@@ -1382,6 +1382,7 @@ int analogix_dp_bind(struct device *dev, struct drm_device *drm_dev,
+@@ -1331,6 +1331,7 @@ int analogix_dp_bind(struct device *dev, struct drm_device *drm_dev,
pm_runtime_enable(dev);
+ pm_runtime_get_sync(dev);
phy_power_on(dp->phy);
- analogix_dp_init_dp(dp);
-@@ -1414,9 +1415,15 @@ int analogix_dp_bind(struct device *dev, struct drm_device *drm_dev,
+ if (dp->plat_data->panel) {
+@@ -1362,9 +1363,15 @@ int analogix_dp_bind(struct device *dev, struct drm_device *drm_dev,
goto err_disable_pm_runtime;
}