lkml.org 
[lkml]   [2018]   [Jan]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 40/40] drm/bridge: analogix_dp: Split the platform-specific poweron in two parts
    Date
    From: Douglas Anderson <dianders@chromium.org>

    Some of the platform-specific stuff in rockchip_dp_poweron() needs to
    happen before the generic code. Some needs to happen after. Let's
    split the callback in two.

    Specifically we can't start doing PSR work until _after_ the whole
    controller is up, so don't set the enable until the end.

    Cc: Kristian H. Kristensen <hoegsberg@chromium.org>
    Signed-off-by: Douglas Anderson <dianders@chromium.org>
    [seanpaul added exynos change]
    Signed-off-by: Sean Paul <seanpaul@chromium.org>
    Signed-off-by: Thierry Escande <thierry.escande@collabora.com>
    Reviewed-by: Andrzej Hajda <a.hajda@samsung.com>
    ---
    drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 7 +++++--
    drivers/gpu/drm/exynos/exynos_dp.c | 2 +-
    drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 12 ++++++++++--
    include/drm/bridge/analogix_dp.h | 3 ++-
    4 files changed, 18 insertions(+), 6 deletions(-)

    diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
    index 12c97e0a8dcd..870569193719 100644
    --- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
    +++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
    @@ -1258,8 +1258,8 @@ static int analogix_dp_set_bridge(struct analogix_dp_device *dp)
    goto out_dp_clk_pre;
    }

    - if (dp->plat_data->power_on)
    - dp->plat_data->power_on(dp->plat_data);
    + if (dp->plat_data->power_on_start)
    + dp->plat_data->power_on_start(dp->plat_data);

    phy_power_on(dp->phy);

    @@ -1284,6 +1284,9 @@ static int analogix_dp_set_bridge(struct analogix_dp_device *dp)
    goto out_dp_init;
    }

    + if (dp->plat_data->power_on_end)
    + dp->plat_data->power_on_end(dp->plat_data);
    +
    enable_irq(dp->irq);
    return 0;

    diff --git a/drivers/gpu/drm/exynos/exynos_dp.c b/drivers/gpu/drm/exynos/exynos_dp.c
    index 33319a858f3a..b316249a3f89 100644
    --- a/drivers/gpu/drm/exynos/exynos_dp.c
    +++ b/drivers/gpu/drm/exynos/exynos_dp.c
    @@ -162,7 +162,7 @@ static int exynos_dp_bind(struct device *dev, struct device *master, void *data)
    dp->drm_dev = drm_dev;

    dp->plat_data.dev_type = EXYNOS_DP;
    - dp->plat_data.power_on = exynos_dp_poweron;
    + dp->plat_data.power_on_start = exynos_dp_poweron;
    dp->plat_data.power_off = exynos_dp_poweroff;
    dp->plat_data.attach = exynos_dp_bridge_attach;
    dp->plat_data.get_modes = exynos_dp_get_modes;
    diff --git a/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c b/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c
    index eaa025730c28..3b406a55d2a5 100644
    --- a/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c
    +++ b/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c
    @@ -109,7 +109,7 @@ static int rockchip_dp_pre_init(struct rockchip_dp_device *dp)
    return 0;
    }

    -static int rockchip_dp_poweron(struct analogix_dp_plat_data *plat_data)
    +static int rockchip_dp_poweron_start(struct analogix_dp_plat_data *plat_data)
    {
    struct rockchip_dp_device *dp = to_dp(plat_data);
    int ret;
    @@ -127,6 +127,13 @@ static int rockchip_dp_poweron(struct analogix_dp_plat_data *plat_data)
    return ret;
    }

    + return ret;
    +}
    +
    +static int rockchip_dp_poweron_end(struct analogix_dp_plat_data *plat_data)
    +{
    + struct rockchip_dp_device *dp = to_dp(plat_data);
    +
    return rockchip_drm_psr_activate(&dp->encoder);
    }

    @@ -337,7 +344,8 @@ static int rockchip_dp_bind(struct device *dev, struct device *master,
    dp->plat_data.encoder = &dp->encoder;

    dp->plat_data.dev_type = dp->data->chip_type;
    - dp->plat_data.power_on = rockchip_dp_poweron;
    + dp->plat_data.power_on_start = rockchip_dp_poweron_start;
    + dp->plat_data.power_on_end = rockchip_dp_poweron_end;
    dp->plat_data.power_off = rockchip_dp_powerdown;
    dp->plat_data.get_modes = rockchip_dp_get_modes;
    dp->plat_data.cleanup = rockchip_dp_cleanup;
    diff --git a/include/drm/bridge/analogix_dp.h b/include/drm/bridge/analogix_dp.h
    index ed3ae1b5bb65..05e7e7ffc1c3 100644
    --- a/include/drm/bridge/analogix_dp.h
    +++ b/include/drm/bridge/analogix_dp.h
    @@ -32,7 +32,8 @@ struct analogix_dp_plat_data {
    struct drm_encoder *encoder;
    struct drm_connector *connector;

    - int (*power_on)(struct analogix_dp_plat_data *);
    + int (*power_on_start)(struct analogix_dp_plat_data *);
    + int (*power_on_end)(struct analogix_dp_plat_data *);
    int (*power_off)(struct analogix_dp_plat_data *);
    int (*attach)(struct analogix_dp_plat_data *, struct drm_bridge *,
    struct drm_connector *);
    --
    2.14.1
    \
     
     \ /
      Last update: 2018-01-15 18:19    [W:4.155 / U:0.060 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site