CHERRY-PICK: CHROMIUM: drm/exynos: dp: Add force_connected flag

Add a new flag to the DisplayPort platform data to optionally force
is_connected to return true. This is useful for cases such as ours where
we don't have a proper DP monitor connected, but rather a noisy bridge
that doesn't know when it's actually ready to assert hotplug.

This will also prevent drm from assuming we're disconnected and detaching
our encoder from the connector (thus losing us forever as a result of
the interrupt scheme in the driver, which needs to be fixed).

BUG=chromium-os:38006
TEST=Tested manually using Doug's reproduction instructions in c17 on the bug

Change-Id: I5d71248ca8e4506cdae09f55b331a2582deb7267
Original-Change-Id:  If2034458d9de93259e92a0f3eb8f386c340b0d7d
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Reviewed-by: Doug Anderson <dianders@chromium.org>
Reviewed-by: Stéphane Marchesin <marcheu@chromium.org>
(cherry picked from commit 657dd039a241ae12510fe126329ac9f03aec4bbe)

Reviewed-on: https://gerrit.chromium.org/gerrit/42144
Commit-Queue: Doug Anderson <dianders@chromium.org>
Tested-by: Doug Anderson <dianders@chromium.org>

diff --git a/arch/arm/mach-exynos/mach-exynos5-dt.c b/arch/arm/mach-exynos/mach-exynos5-dt.c
index 1b1b62ad48c19be54411bc57530595a3f50a54ce..f7818dbced4bac5bb858dc1a521aeb58763b4543 100644 (file)
--- a/arch/arm/mach-exynos/mach-exynos5-dt.c
+++ b/arch/arm/mach-exynos/mach-exynos5-dt.c
@@ -592,11 +592,12 @@ static struct video_info ps8622_dp_config = {
 };
 
 static struct exynos_dp_platdata smdk5250_dp_data = {
-       .video_info     = &ptn3460_dp_config,
-       .training_type  = SW_LINK_TRAINING,
-       .hpd_gpio       = -ENODEV,
-       .phy_init       = s5p_dp_phy_init,
-       .phy_exit       = s5p_dp_phy_exit,
+       .video_info             = &ptn3460_dp_config,
+       .training_type          = SW_LINK_TRAINING,
+       .hpd_gpio               = -ENODEV,
+       .force_connected        = true,
+       .phy_init               = s5p_dp_phy_init,
+       .phy_exit               = s5p_dp_phy_exit,
 };
 
 #define S5P_PMU_DEBUG                          S5P_PMUREG(0x0A00)

diff --git a/drivers/gpu/drm/exynos/exynos_dp_core.c b/drivers/gpu/drm/exynos/exynos_dp_core.c
index b1eb02ddd6ece02f9ed756b1a4870df48ab784f0..e2f168654a6b25724df2624b375f886687e6453c 100644 (file)
--- a/drivers/gpu/drm/exynos/exynos_dp_core.c
+++ b/drivers/gpu/drm/exynos/exynos_dp_core.c
@@ -1049,10 +1049,11 @@ static int exynos_dp_check_timing(void *ctx, void *timing)
 static bool exynos_dp_is_connected(void *ctx)
 {
        struct exynos_dp_device *dp = ctx;
-       int ret;
 
-       ret = exynos_dp_detect_hpd(dp);
-       return !ret;
+       if (dp->force_connected)
+               return true;
+       else
+               return !exynos_dp_detect_hpd(dp);
 }
 
 static int exynos_dp_subdrv_probe(void *ctx, struct drm_device *drm_dev)
@@ -1148,6 +1149,7 @@ static int __devinit exynos_dp_probe(struct platform_device *pdev)
 
        dp->training_type = pdata->training_type;
        dp->video_info = pdata->video_info;
+       dp->force_connected = pdata->force_connected;
        if (pdata->phy_init) {
                dp->phy_ops.phy_init = pdata->phy_init;
                dp->phy_ops.phy_init();

diff --git a/drivers/gpu/drm/exynos/exynos_dp_core.h b/drivers/gpu/drm/exynos/exynos_dp_core.h
index 85a081212593fce24c5d69ecdf8a51ddad34c22b..934f5d2eed75e84f603026463a4ae273dcd679c7 100644 (file)
--- a/drivers/gpu/drm/exynos/exynos_dp_core.h
+++ b/drivers/gpu/drm/exynos/exynos_dp_core.h
@@ -46,6 +46,7 @@ struct exynos_dp_device {
        unsigned int            irq;
        void __iomem            *reg_base;
        int                     hpd_gpio;
+       bool                    force_connected;
 
        struct dp_phy_ops       phy_ops;
        struct video_info       *video_info;

diff --git a/include/video/exynos_dp.h b/include/video/exynos_dp.h
index de5a9a26059357a2b76e9f9366b04e1093f5144e..ae33babec622e3d971480de49458cb732fccff63 100644 (file)
--- a/include/video/exynos_dp.h
+++ b/include/video/exynos_dp.h
@@ -132,6 +132,7 @@ struct exynos_dp_platdata {
        enum link_training_type training_type;
 
        int hpd_gpio;
+       bool force_connected;
 
        void (*phy_init)(void);
        void (*phy_exit)(void);