* [PATCH v1 0/4] Misc changes to Rockchip PSR drivers
@ 2016-09-29 14:46 zain wang
2016-09-29 14:46 ` [PATCH v1 1/4] drm/bridge: analogix_dp: prevent runing enable_psr when disabled bridge zain wang
` (3 more replies)
0 siblings, 4 replies; 6+ messages in thread
From: zain wang @ 2016-09-29 14:46 UTC (permalink / raw)
To: Sean Paul, Daniel Vetter, Inki Dae, David Airlie
Cc: Tomeu Vizoso, Mika Kahola, Stéphane Marchesin, Tomasz Figa,
dianders, Thierry Reding, Krzysztof Kozlowski, Heiko Stuebner,
Jingoo Han, Javier Martinez Canillas, Yakir Yang, linux-kernel,
dri-devel, linux-samsung-soc, linux-rockchip, zain wang
1. prevent runing enable_psr when disabled bridge
2. get sync PM when init eDP
3. detect Sink PSR state after configuring the PSR
4. switch Main-Link and eDP phy when enable/disable psr
BR,
- Zain
Yakir Yang (1):
drm/bridge: analogix_dp: detect Sink PSR state after configuring the
PSR
zain wang (3):
drm/bridge: analogix_dp: prevent runing enable_psr when disabled
bridge.
drm/bridge: analogix_dp: get sync PM when init eDP
drm: bridge/analogix: switch Main-link and eDP PHY when enable/disable
psr
drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 107 +++++++++++----------
drivers/gpu/drm/bridge/analogix/analogix_dp_core.h | 6 +-
drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c | 25 ++++-
drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 8 +-
4 files changed, 88 insertions(+), 58 deletions(-)
--
1.9.1
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v1 1/4] drm/bridge: analogix_dp: prevent runing enable_psr when disabled bridge.
2016-09-29 14:46 [PATCH v1 0/4] Misc changes to Rockchip PSR drivers zain wang
@ 2016-09-29 14:46 ` zain wang
2016-09-29 14:46 ` [PATCH v1 2/4] drm/bridge: analogix_dp: get sync PM when init eDP zain wang
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: zain wang @ 2016-09-29 14:46 UTC (permalink / raw)
To: Sean Paul, Daniel Vetter, Inki Dae, David Airlie
Cc: Tomeu Vizoso, Mika Kahola, Stéphane Marchesin, Tomasz Figa,
dianders, Thierry Reding, Krzysztof Kozlowski, Heiko Stuebner,
Jingoo Han, Javier Martinez Canillas, Yakir Yang, linux-kernel,
dri-devel, linux-samsung-soc, linux-rockchip, zain wang
When disabled bridge, analogix_dp_enable_psr() may run due to timer was set
by rockchip_drm_do_flush(), in this case we should return -EBUSY.
Signed-off-by: zain wang <wzz@rock-chips.com>
---
drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
index 0f2e423..206529a 100644
--- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
+++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
@@ -106,6 +106,9 @@ int analogix_dp_enable_psr(struct device *dev)
if (!dp->psr_support)
return -EINVAL;
+ if (dp->dpms_mode != DRM_MODE_DPMS_ON)
+ return -EBUSY;
+
/* Prepare VSC packet as per EDP 1.4 spec, Table 6.9 */
memset(&psr_vsc, 0, sizeof(psr_vsc));
psr_vsc.sdp_header.HB0 = 0;
@@ -129,6 +132,9 @@ int analogix_dp_disable_psr(struct device *dev)
if (!dp->psr_support)
return -EINVAL;
+ if (dp->dpms_mode != DRM_MODE_DPMS_ON)
+ return -EBUSY;
+
/* Prepare VSC packet as per EDP 1.4 spec, Table 6.9 */
memset(&psr_vsc, 0, sizeof(psr_vsc));
psr_vsc.sdp_header.HB0 = 0;
@@ -1097,6 +1103,8 @@ static void analogix_dp_bridge_disable(struct drm_bridge *bridge)
if (dp->dpms_mode != DRM_MODE_DPMS_ON)
return;
+ dp->dpms_mode = DRM_MODE_DPMS_OFF;
+
if (dp->plat_data->panel) {
if (drm_panel_disable(dp->plat_data->panel)) {
DRM_ERROR("failed to disable the panel\n");
@@ -1115,8 +1123,6 @@ static void analogix_dp_bridge_disable(struct drm_bridge *bridge)
ret = analogix_dp_prepare_panel(dp, false, true);
if (ret)
DRM_ERROR("failed to setup the panel ret = %d\n", ret);
-
- dp->dpms_mode = DRM_MODE_DPMS_OFF;
}
static void analogix_dp_bridge_mode_set(struct drm_bridge *bridge,
--
1.9.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v1 2/4] drm/bridge: analogix_dp: get sync PM when init eDP
2016-09-29 14:46 [PATCH v1 0/4] Misc changes to Rockchip PSR drivers zain wang
2016-09-29 14:46 ` [PATCH v1 1/4] drm/bridge: analogix_dp: prevent runing enable_psr when disabled bridge zain wang
@ 2016-09-29 14:46 ` zain wang
2016-09-29 14:46 ` [PATCH v1 3/4] drm/bridge: analogix_dp: detect Sink PSR state after configuring the PSR zain wang
2016-09-29 14:46 ` zain wang
3 siblings, 0 replies; 6+ messages in thread
From: zain wang @ 2016-09-29 14:46 UTC (permalink / raw)
To: Sean Paul, Daniel Vetter, Inki Dae, David Airlie
Cc: Tomeu Vizoso, Mika Kahola, Stéphane Marchesin, Tomasz Figa,
dianders, Thierry Reding, Krzysztof Kozlowski, Heiko Stuebner,
Jingoo Han, Javier Martinez Canillas, Yakir Yang, linux-kernel,
dri-devel, linux-samsung-soc, linux-rockchip, zain wang
Signed-off-by: zain wang <wzz@rock-chips.com>
---
drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
index 206529a..026ec91 100644
--- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
+++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
@@ -1386,10 +1386,12 @@ 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);
+ pm_runtime_put_sync(dev);
ret = devm_request_threaded_irq(&pdev->dev, dp->irq,
analogix_dp_hardirq,
--
1.9.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v1 3/4] drm/bridge: analogix_dp: detect Sink PSR state after configuring the PSR
2016-09-29 14:46 [PATCH v1 0/4] Misc changes to Rockchip PSR drivers zain wang
2016-09-29 14:46 ` [PATCH v1 1/4] drm/bridge: analogix_dp: prevent runing enable_psr when disabled bridge zain wang
2016-09-29 14:46 ` [PATCH v1 2/4] drm/bridge: analogix_dp: get sync PM when init eDP zain wang
@ 2016-09-29 14:46 ` zain wang
2016-09-29 14:46 ` zain wang
3 siblings, 0 replies; 6+ messages in thread
From: zain wang @ 2016-09-29 14:46 UTC (permalink / raw)
To: Sean Paul, Daniel Vetter, Inki Dae, David Airlie
Cc: Tomeu Vizoso, Mika Kahola, Stéphane Marchesin, Tomasz Figa,
dianders, Thierry Reding, Krzysztof Kozlowski, Heiko Stuebner,
Jingoo Han, Javier Martinez Canillas, Yakir Yang, linux-kernel,
dri-devel, linux-samsung-soc, linux-rockchip, Zain Wang
From: Yakir Yang <ykk@rock-chips.com>
Make sure the request PSR state takes effect in analogix_dp_send_psr_spd()
function, or print the sink PSR error state if we failed to apply the
requested PSR setting.
Signed-off-by: Yakir Yang <ykk@rock-chips.com>
Signed-off-by: Zain Wang <wzz@rock-chips.com>
---
drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 6 ++----
drivers/gpu/drm/bridge/analogix/analogix_dp_core.h | 6 ++++--
drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c | 25 ++++++++++++++++++++--
drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 8 ++++---
4 files changed, 34 insertions(+), 11 deletions(-)
diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
index 026ec91..7177f5f 100644
--- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
+++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
@@ -119,8 +119,7 @@ int analogix_dp_enable_psr(struct device *dev)
psr_vsc.DB0 = 0;
psr_vsc.DB1 = EDP_VSC_PSR_STATE_ACTIVE | EDP_VSC_PSR_CRC_VALUES_VALID;
- analogix_dp_send_psr_spd(dp, &psr_vsc);
- return 0;
+ return analogix_dp_send_psr_spd(dp, &psr_vsc);
}
EXPORT_SYMBOL_GPL(analogix_dp_enable_psr);
@@ -145,8 +144,7 @@ int analogix_dp_disable_psr(struct device *dev)
psr_vsc.DB0 = 0;
psr_vsc.DB1 = 0;
- analogix_dp_send_psr_spd(dp, &psr_vsc);
- return 0;
+ return analogix_dp_send_psr_spd(dp, &psr_vsc);
}
EXPORT_SYMBOL_GPL(analogix_dp_disable_psr);
diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.h b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.h
index 5c6a288..cdc0535 100644
--- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.h
+++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.h
@@ -20,6 +20,8 @@
#define MAX_CR_LOOP 5
#define MAX_EQ_LOOP 5
+#define DP_TIMEOUT_PSR_LOOP_MS msecs_to_jiffies(300)
+
/* DP_MAX_LANE_COUNT */
#define DPCD_ENHANCED_FRAME_CAP(x) (((x) >> 7) & 0x1)
#define DPCD_MAX_LANE_COUNT(x) ((x) & 0x1f)
@@ -247,8 +249,8 @@ void analogix_dp_config_video_slave_mode(struct analogix_dp_device *dp);
void analogix_dp_enable_scrambling(struct analogix_dp_device *dp);
void analogix_dp_disable_scrambling(struct analogix_dp_device *dp);
void analogix_dp_enable_psr_crc(struct analogix_dp_device *dp);
-void analogix_dp_send_psr_spd(struct analogix_dp_device *dp,
- struct edp_vsc_psr *vsc);
+int analogix_dp_send_psr_spd(struct analogix_dp_device *dp,
+ struct edp_vsc_psr *vsc);
ssize_t analogix_dp_transfer(struct analogix_dp_device *dp,
struct drm_dp_aux_msg *msg);
diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c b/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c
index cd37ac0..9e1177c 100644
--- a/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c
+++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c
@@ -992,10 +992,12 @@ void analogix_dp_enable_psr_crc(struct analogix_dp_device *dp)
writel(PSR_VID_CRC_ENABLE, dp->reg_base + ANALOGIX_DP_CRC_CON);
}
-void analogix_dp_send_psr_spd(struct analogix_dp_device *dp,
- struct edp_vsc_psr *vsc)
+int analogix_dp_send_psr_spd(struct analogix_dp_device *dp,
+ struct edp_vsc_psr *vsc)
{
+ unsigned long timeout;
unsigned int val;
+ u8 sink;
/* don't send info frame */
val = readl(dp->reg_base + ANALOGIX_DP_PKT_SEND_CTL);
@@ -1036,6 +1038,25 @@ void analogix_dp_send_psr_spd(struct analogix_dp_device *dp,
val = readl(dp->reg_base + ANALOGIX_DP_PKT_SEND_CTL);
val |= IF_EN;
writel(val, dp->reg_base + ANALOGIX_DP_PKT_SEND_CTL);
+
+ timeout = jiffies + DP_TIMEOUT_PSR_LOOP_MS;
+ while (time_before(jiffies, timeout)) {
+ val = drm_dp_dpcd_readb(&dp->aux, DP_PSR_STATUS, &sink);
+ if (val != 1) {
+ dev_err(dp->dev, "PSR_STATUS read failed ret=%d", val);
+ return -EBUSY;
+ }
+
+ if ((vsc->DB1 && sink == DP_PSR_SINK_ACTIVE_RFB) ||
+ (!vsc->DB1 && sink == DP_PSR_SINK_INACTIVE))
+ return 0;
+
+ usleep_range(1000, 1500);
+ }
+
+ dev_warn(dp->dev, "Failed to apply PSR, sink state was [%x]", sink);
+
+ return -ETIMEDOUT;
}
ssize_t analogix_dp_transfer(struct analogix_dp_device *dp,
diff --git a/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c b/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c
index e83be15..dc106d0 100644
--- a/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c
+++ b/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c
@@ -102,10 +102,10 @@ static void analogix_dp_psr_work(struct work_struct *work)
struct rockchip_dp_device *dp =
container_of(work, typeof(*dp), psr_work);
struct drm_crtc *crtc = dp->encoder.crtc;
- int psr_state = dp->psr_state;
+ unsigned long flags;
+ unsigned int psr_state;
int vact_end;
int ret;
- unsigned long flags;
if (!crtc)
return;
@@ -120,11 +120,13 @@ static void analogix_dp_psr_work(struct work_struct *work)
}
spin_lock_irqsave(&dp->psr_lock, flags);
+ psr_state = dp->psr_state;
+ spin_unlock_irqrestore(&dp->psr_lock, flags);
+
if (psr_state == EDP_VSC_PSR_STATE_ACTIVE)
analogix_dp_enable_psr(dp->dev);
else
analogix_dp_disable_psr(dp->dev);
- spin_unlock_irqrestore(&dp->psr_lock, flags);
}
static int rockchip_dp_pre_init(struct rockchip_dp_device *dp)
--
1.9.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v1 4/4] drm: bridge/analogix: switch Main-link and eDP PHY when enable/disable psr
@ 2016-09-29 14:46 ` zain wang
0 siblings, 0 replies; 6+ messages in thread
From: zain wang @ 2016-09-29 14:46 UTC (permalink / raw)
To: Sean Paul, Daniel Vetter, Inki Dae, David Airlie
Cc: Tomeu Vizoso, Mika Kahola, Stéphane Marchesin, Tomasz Figa,
dianders, Thierry Reding, Krzysztof Kozlowski, Heiko Stuebner,
Jingoo Han, Javier Martinez Canillas, Yakir Yang, linux-kernel,
dri-devel, linux-samsung-soc, linux-rockchip, zain wang
turn off Main-link and power down eDP PHY when enable psr,
turn on Main-link and power up eDP PHY when disable psr.
Signed-off-by: zain wang <wzz@rock-chips.com>
---
drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 105 ++++++++++-----------
1 file changed, 52 insertions(+), 53 deletions(-)
diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
index 7177f5f..1bc98ab 100644
--- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
+++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
@@ -98,56 +98,6 @@ static int analogix_dp_detect_hpd(struct analogix_dp_device *dp)
return 0;
}
-int analogix_dp_enable_psr(struct device *dev)
-{
- struct analogix_dp_device *dp = dev_get_drvdata(dev);
- struct edp_vsc_psr psr_vsc;
-
- if (!dp->psr_support)
- return -EINVAL;
-
- if (dp->dpms_mode != DRM_MODE_DPMS_ON)
- return -EBUSY;
-
- /* Prepare VSC packet as per EDP 1.4 spec, Table 6.9 */
- memset(&psr_vsc, 0, sizeof(psr_vsc));
- psr_vsc.sdp_header.HB0 = 0;
- psr_vsc.sdp_header.HB1 = 0x7;
- psr_vsc.sdp_header.HB2 = 0x2;
- psr_vsc.sdp_header.HB3 = 0x8;
-
- psr_vsc.DB0 = 0;
- psr_vsc.DB1 = EDP_VSC_PSR_STATE_ACTIVE | EDP_VSC_PSR_CRC_VALUES_VALID;
-
- return analogix_dp_send_psr_spd(dp, &psr_vsc);
-}
-EXPORT_SYMBOL_GPL(analogix_dp_enable_psr);
-
-int analogix_dp_disable_psr(struct device *dev)
-{
- struct analogix_dp_device *dp = dev_get_drvdata(dev);
- struct edp_vsc_psr psr_vsc;
-
- if (!dp->psr_support)
- return -EINVAL;
-
- if (dp->dpms_mode != DRM_MODE_DPMS_ON)
- return -EBUSY;
-
- /* Prepare VSC packet as per EDP 1.4 spec, Table 6.9 */
- memset(&psr_vsc, 0, sizeof(psr_vsc));
- psr_vsc.sdp_header.HB0 = 0;
- psr_vsc.sdp_header.HB1 = 0x7;
- psr_vsc.sdp_header.HB2 = 0x2;
- psr_vsc.sdp_header.HB3 = 0x8;
-
- psr_vsc.DB0 = 0;
- psr_vsc.DB1 = 0;
-
- return analogix_dp_send_psr_spd(dp, &psr_vsc);
-}
-EXPORT_SYMBOL_GPL(analogix_dp_disable_psr);
-
static bool analogix_dp_detect_sink_psr(struct analogix_dp_device *dp)
{
unsigned char psr_version;
@@ -168,12 +118,11 @@ static void analogix_dp_enable_sink_psr(struct analogix_dp_device *dp)
drm_dp_dpcd_writeb(&dp->aux, DP_PSR_EN_CFG, psr_en);
/* Main-Link transmitter remains active during PSR active states */
- psr_en = DP_PSR_MAIN_LINK_ACTIVE | DP_PSR_CRC_VERIFICATION;
+ psr_en = DP_PSR_CRC_VERIFICATION;
drm_dp_dpcd_writeb(&dp->aux, DP_PSR_EN_CFG, psr_en);
/* Enable psr function */
- psr_en = DP_PSR_ENABLE | DP_PSR_MAIN_LINK_ACTIVE |
- DP_PSR_CRC_VERIFICATION;
+ psr_en = DP_PSR_ENABLE | DP_PSR_CRC_VERIFICATION;
drm_dp_dpcd_writeb(&dp->aux, DP_PSR_EN_CFG, psr_en);
analogix_dp_enable_psr_crc(dp);
@@ -876,6 +825,56 @@ static void analogix_dp_commit(struct analogix_dp_device *dp)
analogix_dp_enable_sink_psr(dp);
}
+int analogix_dp_enable_psr(struct device *dev)
+{
+ struct analogix_dp_device *dp = dev_get_drvdata(dev);
+ struct edp_vsc_psr psr_vsc;
+
+ if (!dp->psr_support)
+ return -EINVAL;
+
+ if (dp->dpms_mode != DRM_MODE_DPMS_ON)
+ return -EBUSY;
+
+ /* Prepare VSC packet as per EDP 1.4 spec, Table 6.9 */
+ memset(&psr_vsc, 0, sizeof(psr_vsc));
+ psr_vsc.sdp_header.HB0 = 0;
+ psr_vsc.sdp_header.HB1 = 0x7;
+ psr_vsc.sdp_header.HB2 = 0x2;
+ psr_vsc.sdp_header.HB3 = 0x8;
+
+ psr_vsc.DB0 = 0;
+ psr_vsc.DB1 = EDP_VSC_PSR_STATE_ACTIVE | EDP_VSC_PSR_CRC_VALUES_VALID;
+
+ return analogix_dp_send_psr_spd(dp, &psr_vsc);
+}
+EXPORT_SYMBOL_GPL(analogix_dp_enable_psr);
+
+int analogix_dp_disable_psr(struct device *dev)
+{
+ struct analogix_dp_device *dp = dev_get_drvdata(dev);
+ struct edp_vsc_psr psr_vsc;
+
+ if (!dp->psr_support)
+ return -EINVAL;
+
+ if (dp->dpms_mode != DRM_MODE_DPMS_ON)
+ return -EBUSY;
+
+ /* Prepare VSC packet as per EDP 1.4 spec, Table 6.9 */
+ memset(&psr_vsc, 0, sizeof(psr_vsc));
+ psr_vsc.sdp_header.HB0 = 0;
+ psr_vsc.sdp_header.HB1 = 0x7;
+ psr_vsc.sdp_header.HB2 = 0x2;
+ psr_vsc.sdp_header.HB3 = 0x8;
+
+ psr_vsc.DB0 = 0;
+ psr_vsc.DB1 = 0;
+
+ return analogix_dp_send_psr_spd(dp, &psr_vsc);
+}
+EXPORT_SYMBOL_GPL(analogix_dp_disable_psr);
+
/*
* This function is a bit of a catch-all for panel preparation, hopefully
* simplifying the logic of functions that need to prepare/unprepare the panel
--
1.9.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v1 4/4] drm: bridge/analogix: switch Main-link and eDP PHY when enable/disable psr
@ 2016-09-29 14:46 ` zain wang
0 siblings, 0 replies; 6+ messages in thread
From: zain wang @ 2016-09-29 14:46 UTC (permalink / raw)
To: Sean Paul, Daniel Vetter, Inki Dae, David Airlie
Cc: Krzysztof Kozlowski, linux-samsung-soc-u79uwXL29TY76Z2rM5mHXA,
Heiko Stuebner, Tomeu Vizoso,
linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, Jingoo Han,
dianders-F7+t8E8rja9g9hUCZPvPmw,
dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW, Tomasz Figa,
Javier Martinez Canillas, zain wang, Mika Kahola, Yakir Yang,
Stéphane Marchesin, Thierry Reding,
linux-kernel-u79uwXL29TY76Z2rM5mHXA
turn off Main-link and power down eDP PHY when enable psr,
turn on Main-link and power up eDP PHY when disable psr.
Signed-off-by: zain wang <wzz-TNX95d0MmH7DzftRWevZcw@public.gmane.org>
---
drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 105 ++++++++++-----------
1 file changed, 52 insertions(+), 53 deletions(-)
diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
index 7177f5f..1bc98ab 100644
--- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
+++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
@@ -98,56 +98,6 @@ static int analogix_dp_detect_hpd(struct analogix_dp_device *dp)
return 0;
}
-int analogix_dp_enable_psr(struct device *dev)
-{
- struct analogix_dp_device *dp = dev_get_drvdata(dev);
- struct edp_vsc_psr psr_vsc;
-
- if (!dp->psr_support)
- return -EINVAL;
-
- if (dp->dpms_mode != DRM_MODE_DPMS_ON)
- return -EBUSY;
-
- /* Prepare VSC packet as per EDP 1.4 spec, Table 6.9 */
- memset(&psr_vsc, 0, sizeof(psr_vsc));
- psr_vsc.sdp_header.HB0 = 0;
- psr_vsc.sdp_header.HB1 = 0x7;
- psr_vsc.sdp_header.HB2 = 0x2;
- psr_vsc.sdp_header.HB3 = 0x8;
-
- psr_vsc.DB0 = 0;
- psr_vsc.DB1 = EDP_VSC_PSR_STATE_ACTIVE | EDP_VSC_PSR_CRC_VALUES_VALID;
-
- return analogix_dp_send_psr_spd(dp, &psr_vsc);
-}
-EXPORT_SYMBOL_GPL(analogix_dp_enable_psr);
-
-int analogix_dp_disable_psr(struct device *dev)
-{
- struct analogix_dp_device *dp = dev_get_drvdata(dev);
- struct edp_vsc_psr psr_vsc;
-
- if (!dp->psr_support)
- return -EINVAL;
-
- if (dp->dpms_mode != DRM_MODE_DPMS_ON)
- return -EBUSY;
-
- /* Prepare VSC packet as per EDP 1.4 spec, Table 6.9 */
- memset(&psr_vsc, 0, sizeof(psr_vsc));
- psr_vsc.sdp_header.HB0 = 0;
- psr_vsc.sdp_header.HB1 = 0x7;
- psr_vsc.sdp_header.HB2 = 0x2;
- psr_vsc.sdp_header.HB3 = 0x8;
-
- psr_vsc.DB0 = 0;
- psr_vsc.DB1 = 0;
-
- return analogix_dp_send_psr_spd(dp, &psr_vsc);
-}
-EXPORT_SYMBOL_GPL(analogix_dp_disable_psr);
-
static bool analogix_dp_detect_sink_psr(struct analogix_dp_device *dp)
{
unsigned char psr_version;
@@ -168,12 +118,11 @@ static void analogix_dp_enable_sink_psr(struct analogix_dp_device *dp)
drm_dp_dpcd_writeb(&dp->aux, DP_PSR_EN_CFG, psr_en);
/* Main-Link transmitter remains active during PSR active states */
- psr_en = DP_PSR_MAIN_LINK_ACTIVE | DP_PSR_CRC_VERIFICATION;
+ psr_en = DP_PSR_CRC_VERIFICATION;
drm_dp_dpcd_writeb(&dp->aux, DP_PSR_EN_CFG, psr_en);
/* Enable psr function */
- psr_en = DP_PSR_ENABLE | DP_PSR_MAIN_LINK_ACTIVE |
- DP_PSR_CRC_VERIFICATION;
+ psr_en = DP_PSR_ENABLE | DP_PSR_CRC_VERIFICATION;
drm_dp_dpcd_writeb(&dp->aux, DP_PSR_EN_CFG, psr_en);
analogix_dp_enable_psr_crc(dp);
@@ -876,6 +825,56 @@ static void analogix_dp_commit(struct analogix_dp_device *dp)
analogix_dp_enable_sink_psr(dp);
}
+int analogix_dp_enable_psr(struct device *dev)
+{
+ struct analogix_dp_device *dp = dev_get_drvdata(dev);
+ struct edp_vsc_psr psr_vsc;
+
+ if (!dp->psr_support)
+ return -EINVAL;
+
+ if (dp->dpms_mode != DRM_MODE_DPMS_ON)
+ return -EBUSY;
+
+ /* Prepare VSC packet as per EDP 1.4 spec, Table 6.9 */
+ memset(&psr_vsc, 0, sizeof(psr_vsc));
+ psr_vsc.sdp_header.HB0 = 0;
+ psr_vsc.sdp_header.HB1 = 0x7;
+ psr_vsc.sdp_header.HB2 = 0x2;
+ psr_vsc.sdp_header.HB3 = 0x8;
+
+ psr_vsc.DB0 = 0;
+ psr_vsc.DB1 = EDP_VSC_PSR_STATE_ACTIVE | EDP_VSC_PSR_CRC_VALUES_VALID;
+
+ return analogix_dp_send_psr_spd(dp, &psr_vsc);
+}
+EXPORT_SYMBOL_GPL(analogix_dp_enable_psr);
+
+int analogix_dp_disable_psr(struct device *dev)
+{
+ struct analogix_dp_device *dp = dev_get_drvdata(dev);
+ struct edp_vsc_psr psr_vsc;
+
+ if (!dp->psr_support)
+ return -EINVAL;
+
+ if (dp->dpms_mode != DRM_MODE_DPMS_ON)
+ return -EBUSY;
+
+ /* Prepare VSC packet as per EDP 1.4 spec, Table 6.9 */
+ memset(&psr_vsc, 0, sizeof(psr_vsc));
+ psr_vsc.sdp_header.HB0 = 0;
+ psr_vsc.sdp_header.HB1 = 0x7;
+ psr_vsc.sdp_header.HB2 = 0x2;
+ psr_vsc.sdp_header.HB3 = 0x8;
+
+ psr_vsc.DB0 = 0;
+ psr_vsc.DB1 = 0;
+
+ return analogix_dp_send_psr_spd(dp, &psr_vsc);
+}
+EXPORT_SYMBOL_GPL(analogix_dp_disable_psr);
+
/*
* This function is a bit of a catch-all for panel preparation, hopefully
* simplifying the logic of functions that need to prepare/unprepare the panel
--
1.9.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2016-09-29 14:54 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-09-29 14:46 [PATCH v1 0/4] Misc changes to Rockchip PSR drivers zain wang
2016-09-29 14:46 ` [PATCH v1 1/4] drm/bridge: analogix_dp: prevent runing enable_psr when disabled bridge zain wang
2016-09-29 14:46 ` [PATCH v1 2/4] drm/bridge: analogix_dp: get sync PM when init eDP zain wang
2016-09-29 14:46 ` [PATCH v1 3/4] drm/bridge: analogix_dp: detect Sink PSR state after configuring the PSR zain wang
2016-09-29 14:46 ` [PATCH v1 4/4] drm: bridge/analogix: switch Main-link and eDP PHY when enable/disable psr zain wang
2016-09-29 14:46 ` zain wang
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.