On Monday, April 23, 2018 6:50 AM, Enric Balletbo i Serra wrote:
>
> From: Douglas Anderson <dianders@xxxxxxxxxxxx>
>
> 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@xxxxxxxxxxxx>
> Signed-off-by: Douglas Anderson <dianders@xxxxxxxxxxxx>
> [seanpaul added exynos change]
> Signed-off-by: Sean Paul <seanpaul@xxxxxxxxxxxx>
> Signed-off-by: Thierry Escande <thierry.escande@xxxxxxxxxxxxx>
> Reviewed-by: Andrzej Hajda <a.hajda@xxxxxxxxxxx>
> Signed-off-by: Enric Balletbo i Serra <enric.balletbo@xxxxxxxxxxxxx>
> Tested-by: Marek Szyprowski <m.szyprowski@xxxxxxxxxxx>
> Reviewed-by: Archit Taneja <architt@xxxxxxxxxxxxxx>
Acked-by: Jingoo Han <jingoohan1@xxxxxxxxx>
Best regards,
Jingoo Han
> ---
>
> 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 a260de4f0bd8..2bcbfadb6ac5 100644
> --- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
> +++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
> @@ -1260,8 +1260,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);
>
> @@ -1286,6 +1286,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 964831dab102..86330f396784 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 b3f46ed24cdc..23317a2269e1 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);
> }
>
> @@ -330,7 +337,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;
>
> diff --git a/include/drm/bridge/analogix_dp.h
> b/include/drm/bridge/analogix_dp.h
> index e9a1116d2f8e..475b706b49de 100644
> --- a/include/drm/bridge/analogix_dp.h
> +++ b/include/drm/bridge/analogix_dp.h
> @@ -33,7 +33,8 @@ struct analogix_dp_plat_data {
> struct drm_connector *connector;
> bool skip_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.17.0
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
