From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AIpwx49t22C8mJ1Y4zoB2clCWom2CBgdAzSQmXDNPdIPWOEmTWKSw1gNP7qbAAzP6gthDc3049Qa ARC-Seal: i=1; a=rsa-sha256; t=1522168858; cv=none; d=google.com; s=arc-20160816; b=pAC8cFEtAzGgSf3nr9JDiRPknfhDF5FE/BcUmAR8J8fPc+dqtdC14Sw9/zVaV6ALBc DJ9K29+GWdw9SHzaiSW+ZOrT/d21OqvkHdJTOEmMmSpVznbrS0wf80COOS5JloIwUcCc bhg3WMvAv01ji0U3JnHHeSwGSzp+KZpYIaQC1IYNo4T5/RT7hIFi5LIDx+04jChIlfd3 inJb46pDu+i8wIV25cdyuAd0pwFMiOOFeBZvjphdpY+MHBwRckTChMDc14ubpnlSN3l5 EJJfjAPal4WGCrPdMSIOF7lihgLaRCfVEWLMHjdc09lic7BKuWVESPScgyXNJAHc7E8M lMVQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:user-agent:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=bOkP/KTTyLQLucaShcwaNi9nrVF2cvLcwg2BRWce93Y=; b=fdS0ZDh9JHiKv3MJ2j97CLXa2CujQGshEmnlKhn8mDOjhCZlP6hyD6I4UPaz9HdCm6 DOBq9SypgtXpPPrpzp0N9QC5zKON7tvJoanEA1vPCg54nY44Zpb/u0oZm5gByDfO+hZ/ 2Rl/n1CDsyOaeZypyZ+Ja+51qK65OEDPBSWGLCOjT56hHZxhb2SqVLL1pwjPqKI9QB72 OIb9uudBhXW3Kpzpp3Jr9QFWpQaV6IgpbvCY5Wx5yUrUl47i6uGkZturA5MWTmtBx6bC yiiBYRdlHiH8Ryk98iOZhIWoGkT/FxY2G1enPiV5gjKDG4km3X8W8ZM3jYCsHMz40p7q 7s8A== ARC-Authentication-Results: i=1; mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.61.202 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org Authentication-Results: mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.61.202 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Alex Deucher , =?UTF-8?q?Michel=20D=C3=A4nzer?= Subject: [PATCH 4.15 057/105] drm/radeon: Dont turn off DP sink when disconnected Date: Tue, 27 Mar 2018 18:27:37 +0200 Message-Id: <20180327162800.937086228@linuxfoundation.org> X-Mailer: git-send-email 2.16.3 In-Reply-To: <20180327162757.813009222@linuxfoundation.org> References: <20180327162757.813009222@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-LABELS: =?utf-8?b?IlxcU2VudCI=?= X-GMAIL-THRID: =?utf-8?q?1596108997827947853?= X-GMAIL-MSGID: =?utf-8?q?1596109733562152880?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 4.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Michel Dänzer commit 2681bc79eeb640562c932007bfebbbdc55bf6a7d upstream. Turning off the sink in this case causes various issues, because userspace expects it to stay on until it turns it off explicitly. Instead, turn the sink off and back on when a display is connected again. This dance seems necessary for link training to work correctly. Bugzilla: https://bugs.freedesktop.org/105308 Cc: stable@vger.kernel.org Reviewed-by: Alex Deucher Signed-off-by: Michel Dänzer Signed-off-by: Alex Deucher Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/radeon/radeon_connectors.c | 29 +++++++++++------------------ 1 file changed, 11 insertions(+), 18 deletions(-) --- a/drivers/gpu/drm/radeon/radeon_connectors.c +++ b/drivers/gpu/drm/radeon/radeon_connectors.c @@ -90,25 +90,18 @@ void radeon_connector_hotplug(struct drm /* don't do anything if sink is not display port, i.e., * passive dp->(dvi|hdmi) adaptor */ - if (dig_connector->dp_sink_type == CONNECTOR_OBJECT_ID_DISPLAYPORT) { - int saved_dpms = connector->dpms; - /* Only turn off the display if it's physically disconnected */ - if (!radeon_hpd_sense(rdev, radeon_connector->hpd.hpd)) { - drm_helper_connector_dpms(connector, DRM_MODE_DPMS_OFF); - } else if (radeon_dp_needs_link_train(radeon_connector)) { - /* Don't try to start link training before we - * have the dpcd */ - if (!radeon_dp_getdpcd(radeon_connector)) - return; + if (dig_connector->dp_sink_type == CONNECTOR_OBJECT_ID_DISPLAYPORT && + radeon_hpd_sense(rdev, radeon_connector->hpd.hpd) && + radeon_dp_needs_link_train(radeon_connector)) { + /* Don't start link training before we have the DPCD */ + if (!radeon_dp_getdpcd(radeon_connector)) + return; - /* set it to OFF so that drm_helper_connector_dpms() - * won't return immediately since the current state - * is ON at this point. - */ - connector->dpms = DRM_MODE_DPMS_OFF; - drm_helper_connector_dpms(connector, DRM_MODE_DPMS_ON); - } - connector->dpms = saved_dpms; + /* Turn the connector off and back on immediately, which + * will trigger link training + */ + drm_helper_connector_dpms(connector, DRM_MODE_DPMS_OFF); + drm_helper_connector_dpms(connector, DRM_MODE_DPMS_ON); } } }