From 1d17933d184265dc29340770a992eec31e3cd0d0 Mon Sep 17 00:00:00 2001 From: Sandor Yu Date: Mon, 23 Mar 2020 18:15:53 +0800 Subject: [PATCH] MLK-23545-1: drm: bridge: hdp: Remove force_mode_set flag when cable plugin Keep force_mode_set flag when cable plugin, remove it from cable plugout. Signed-off-by: Sandor Yu --- drivers/gpu/drm/bridge/cadence/cdns-dp-core.c | 4 ++-- drivers/gpu/drm/bridge/cadence/cdns-hdmi-core.c | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/bridge/cadence/cdns-dp-core.c b/drivers/gpu/drm/bridge/cadence/cdns-dp-core.c index 2578b6bbe3a3..17deef45f509 100644 --- a/drivers/gpu/drm/bridge/cadence/cdns-dp-core.c +++ b/drivers/gpu/drm/bridge/cadence/cdns-dp-core.c @@ -374,12 +374,12 @@ static void hotplug_work_func(struct work_struct *work) if (connector->status == connector_status_connected) { /* Cable connedted */ DRM_INFO("HDMI/DP Cable Plug In\n"); + /* force mode set to recovery weston DP video display */ + mhdp->force_mode_set = true; enable_irq(mhdp->irq[IRQ_OUT]); } else if (connector->status == connector_status_disconnected) { /* Cable Disconnedted */ DRM_INFO("HDMI/DP Cable Plug Out\n"); - /* force mode set for cable replugin to recovery DP video modes */ - mhdp->force_mode_set = true; enable_irq(mhdp->irq[IRQ_IN]); } } diff --git a/drivers/gpu/drm/bridge/cadence/cdns-hdmi-core.c b/drivers/gpu/drm/bridge/cadence/cdns-hdmi-core.c index 4569834b3da2..73a7d0a04f21 100644 --- a/drivers/gpu/drm/bridge/cadence/cdns-hdmi-core.c +++ b/drivers/gpu/drm/bridge/cadence/cdns-hdmi-core.c @@ -478,13 +478,12 @@ static void hotplug_work_func(struct work_struct *work) if (connector->status == connector_status_connected) { DRM_INFO("HDMI Cable Plug In\n"); + /* force mode set to recovery weston HDMI2.0 video modes */ mhdp->force_mode_set = true; enable_irq(mhdp->irq[IRQ_OUT]); } else if (connector->status == connector_status_disconnected) { /* Cable Disconnedted */ DRM_INFO("HDMI Cable Plug Out\n"); - /* force mode set for cable replugin to recovery HDMI2.0 video modes */ - mhdp->force_mode_set = true; enable_irq(mhdp->irq[IRQ_IN]); } }