From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934035AbcI2Or3 (ORCPT ); Thu, 29 Sep 2016 10:47:29 -0400 Received: from regular1.263xmail.com ([211.150.99.140]:50375 "EHLO regular1.263xmail.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933958AbcI2OrS (ORCPT ); Thu, 29 Sep 2016 10:47:18 -0400 X-263anti-spam: KSV:0; X-MAIL-GRAY: 0 X-MAIL-DELIVERY: 1 X-KSVirus-check: 0 X-ABS-CHECKED: 4 X-ADDR-CHECKED: 0 X-RL-SENDER: wzz@rock-chips.com X-FST-TO: seanpaul@chromium.org X-SENDER-IP: 58.22.7.114 X-LOGIN-NAME: wzz@rock-chips.com X-UNIQUE-TAG: <579579492a22990340ea4018a11e2f7a> X-ATTACHMENT-NUM: 0 X-DNS-TYPE: 0 From: zain wang To: Sean Paul , Daniel Vetter , Inki Dae , David Airlie Cc: Tomeu Vizoso , Mika Kahola , =?UTF-8?q?St=C3=A9phane=20Marchesin?= , Tomasz Figa , dianders@chromium.org, Thierry Reding , Krzysztof Kozlowski , Heiko Stuebner , Jingoo Han , Javier Martinez Canillas , Yakir Yang , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-samsung-soc@vger.kernel.org, linux-rockchip@lists.infradead.org, zain wang Subject: [PATCH v1 1/4] drm/bridge: analogix_dp: prevent runing enable_psr when disabled bridge. Date: Thu, 29 Sep 2016 22:46:37 +0800 Message-Id: <1475160400-30782-2-git-send-email-wzz@rock-chips.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1475160400-30782-1-git-send-email-wzz@rock-chips.com> References: <1475160400-30782-1-git-send-email-wzz@rock-chips.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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