Received: by 2002:a05:6a10:16a7:0:0:0:0 with SMTP id gp39csp832902pxb; Tue, 3 Nov 2020 13:51:53 -0800 (PST) X-Google-Smtp-Source: ABdhPJy97lidpZkpmZCjPHB7b2ViiYXdoBQJtpXDGftJEYhkyGW25IHNqWTflyEd1e15GHgyiEm3 X-Received: by 2002:a17:906:4e99:: with SMTP id v25mr21679401eju.242.1604440312859; Tue, 03 Nov 2020 13:51:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1604440312; cv=none; d=google.com; s=arc-20160816; b=iwDkdgdgKW3QxK4fRCzM7NZU4K8A6utbLy5RmHInfi3MPvLFU+4S8j20/fil7O32Sc dhL+Ive1n97SyqVXKUde4N+zRAsn6DsXAjug27Qv8r/d/HlA46aZ8ewlz/nhZ1IFi1rH V3hr1z4/plhOOBoSg9b3C0bcU65y/LotGDzitAj0Y9dWIk5ibrMungBHV1weqK1otv6o /bSANVGtWaUTyqsvFswqlNtib0SoB02tuHCFf+ltvSiPyH6MRCbTGotaUL8U2gaURY04 Qbh45VF63PFbF3SisPGfkbU9b34odG9HkodISWqXLDqGoqfjmOwdKTkMkvectvRvMMMt dztQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=A/O27NMf4+qghkW9fP2YV+Ioe8ZFn7fMDPZQgUtwlXM=; b=XrZ4Y8/YXBK5yP3CRsPyKcgYsqh1FA/YQUAneCUtgyxR9YWye2hYoFmHD1pKduIihu I02zuR4IhPexaizNwcEZaxt9ppLH15oaRTbWgLJpErdxQ5SUVRENb6L2YzSxfcGBM76h d7VVEY5KSQN2fKbFIk6GemQEmL+/cDpbKo4ooojeCnT6Q8GYW6RSuPF0dBfIGyqWo3dw OGuahJdb5HaZDi5HvrEWwSSNGhAGEKrLTbcAsCw+dR8xqdb+veBvmRnAMp5PEp1ubfhL Nv0iHw73i85QqaVQh0z1fFg55wTchBbSuHOn35cnU84x3zEOtRyykGKSHpq6OBBOFh/m 1kvg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=sdV2lYOq; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id r7si68865ejb.27.2020.11.03.13.51.29; Tue, 03 Nov 2020 13:51:52 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=sdV2lYOq; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732121AbgKCVsz (ORCPT + 99 others); Tue, 3 Nov 2020 16:48:55 -0500 Received: from mail.kernel.org ([198.145.29.99]:43350 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731711AbgKCUtw (ORCPT ); Tue, 3 Nov 2020 15:49:52 -0500 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 9228C20719; Tue, 3 Nov 2020 20:49:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604436592; bh=rjcczr0OLYDAKSqe2DMFn5QK29CM71Zq1WwY+8RlS2w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sdV2lYOqs11kTBPPIuF2IPTHMJlI98mbAs0ziQuk+3uWVTSuUwpFoC/CGaE7LTkLL JiaexDVhW6e4IIU2zNkSmMrUY1aOPPTA+BGEKPOsUxFMajPu8fZyJWsc5WFTDv4pzJ aEqNm0S3haHSoYosJOm85uWidvinG6514NBAye18= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Wesley Chalmers , Aric Cyr , Qingqing Zhuo , Alex Deucher Subject: [PATCH 5.9 318/391] drm/amd/display: Increase timeout for DP Disable Date: Tue, 3 Nov 2020 21:36:09 +0100 Message-Id: <20201103203408.568136235@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201103203348.153465465@linuxfoundation.org> References: <20201103203348.153465465@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Wesley Chalmers commit 37b7cb10f07c1174522faafc1d51c6591b1501d4 upstream. [WHY] When disabling DP video, the current REG_WAIT timeout of 50ms is too low for certain cases with very high VSYNC intervals. [HOW] Increase the timeout to 102ms, so that refresh rates as low as 10Hz can be handled properly. Signed-off-by: Wesley Chalmers Reviewed-by: Aric Cyr Acked-by: Qingqing Zhuo Signed-off-by: Alex Deucher Cc: Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/amd/display/dc/dcn10/dcn10_stream_encoder.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_stream_encoder.c +++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_stream_encoder.c @@ -896,10 +896,10 @@ void enc1_stream_encoder_dp_blank( */ REG_UPDATE(DP_VID_STREAM_CNTL, DP_VID_STREAM_DIS_DEFER, 2); /* Larger delay to wait until VBLANK - use max retry of - * 10us*5000=50ms. This covers 41.7ms of minimum 24 Hz mode + + * 10us*10200=102ms. This covers 100.0ms of minimum 10 Hz mode + * a little more because we may not trust delay accuracy. */ - max_retries = DP_BLANK_MAX_RETRY * 250; + max_retries = DP_BLANK_MAX_RETRY * 501; /* disable DP stream */ REG_UPDATE(DP_VID_STREAM_CNTL, DP_VID_STREAM_ENABLE, 0);