From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AG47ELtODrqwRu1yI9LNtiNU8/Xgj+SP1T37OJgpqqGBI8sEI4V0EqWepbf45FnGWIHsG8+1RriF ARC-Seal: i=1; a=rsa-sha256; t=1521484295; cv=none; d=google.com; s=arc-20160816; b=ID0WAWeN+9cWlBeFhScrvkIEpMaicQPmdHmqHV7J0iBGlv/MGPsR3oFtaB2lZjyQkE HEyxxVpvkeTd41f3cNOtY8a60yEGjONNgjfH5TqjXElZvs/C8CeQ6duPC/Lw00DN8IhH LG0BAi4csWjj2EPEAG7E85DmL5WMe3dMr5ILu7QuIhuRMkfG/Yh//5wjqJv8Dfb9vyPD rqLn/pmhzAkn7yqRlwDxZ5XHoSjbf6mixE5qH3VGWbHIvVa8btqMRng5Nmj4j2TRcnWB 5WV9EqHo1RLblxe49jNa82QEG6B/8BLelgZKhL5AzU9mATI/x7eL1RhdmYpOlGsYaBdy nHvw== 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=bSIjpQB8WdZCrOVYjZQJ3xE+kVB34IrDJOQu3xm97gw=; b=M2L+E4lAyJpCQJN0YdI7H734nXvyfFQ/soeL+37+oBKPWQxhLIdiTBnV9B80BF8/g2 GQlJVJItIv6NwwXh3MVfGkHyWGMwcF98w7eMotIPIDvrNic3zqOWisNxE8zSvHEmtAUi Ia5t5Nm6QBGXAt5my1Zm34umYZYECA0j0QTcGMdflwu9iyTphhxVv9zycYQ6dAnxnTRW U7QHTN+lChypX4ucuHDuUMUaVgciHbBn7Vh8JeGyIiXZW912DX+vH4xmskgTYMn8sWcq gtjgoySmsPfvTfLGnJsgzXHwvfxFMuk+Vtf6uTYz/shXFnqRGG2qQ/XRoqy1zaKSCggx PGUw== 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 19/52] drm/amdgpu/dce: Dont turn off DP sink when disconnected Date: Mon, 19 Mar 2018 19:08:17 +0100 Message-Id: <20180319180736.206976829@linuxfoundation.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180319180734.976730813@linuxfoundation.org> References: <20180319180734.976730813@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?1595391004323792945?= X-GMAIL-MSGID: =?utf-8?q?1595391916232006888?= 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 7d617264eb22b18d979eac6e85877a141253034e 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/amd/amdgpu/amdgpu_connectors.c | 29 +++++++++---------------- 1 file changed, 11 insertions(+), 18 deletions(-) --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c @@ -69,25 +69,18 @@ void amdgpu_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 (!amdgpu_display_hpd_sense(adev, amdgpu_connector->hpd.hpd)) { - drm_helper_connector_dpms(connector, DRM_MODE_DPMS_OFF); - } else if (amdgpu_atombios_dp_needs_link_train(amdgpu_connector)) { - /* Don't try to start link training before we - * have the dpcd */ - if (amdgpu_atombios_dp_get_dpcd(amdgpu_connector)) - return; + if (dig_connector->dp_sink_type == CONNECTOR_OBJECT_ID_DISPLAYPORT && + amdgpu_display_hpd_sense(adev, amdgpu_connector->hpd.hpd) && + amdgpu_atombios_dp_needs_link_train(amdgpu_connector)) { + /* Don't start link training before we have the DPCD */ + if (amdgpu_atombios_dp_get_dpcd(amdgpu_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); } } }