Received: by 2002:a25:b323:0:0:0:0:0 with SMTP id l35csp3268668ybj; Mon, 23 Sep 2019 18:16:04 -0700 (PDT) X-Google-Smtp-Source: APXvYqxW5Mq14x0jgL3wEXnZULgaw92mAPxnTcWP1rZdp5avAckqaniEZyAE/PCSs1uEs6fGCUqm X-Received: by 2002:a17:906:b204:: with SMTP id p4mr296605ejz.185.1569287764875; Mon, 23 Sep 2019 18:16:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1569287764; cv=none; d=google.com; s=arc-20160816; b=nLtbLjEXsB9guRvXgQls8GRj/IYrIz3nC1e4lk36r90884rCWK+ZqYW6xlw0tgkeHe I62WDyMWylgV/tNn4XsONshQO/7/8WxETDeOp1yOdOoLF7BTxFn1ZEpE1jUPxH3iTGXz NORh7VteVUiAa7CG73A/baGoMPIAAmB2wqftpqw6oBiJqCVlSsRJAVscxZMbHLFDw4nV 3Ek6GSiVtQnuH3oefOgmmZq9nKx4ckwBjbAu1cm7Lx36H/e0o/4RZY4Ij97el0+QsNzq XJoFlg/0W+T4TixsMaXfoC8e2j2xzV54MdeMHZrG2kA7UlWELyP9/FUjm3Wcq2d954PK rDPg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=qiqiUJxWlldD+YvkZiEf2zwi20Lgxt9ts89D2P8AkSQ=; b=T530w07Wx3+EHTn4Algtw9Jzf7ngNpqccnFkZP8rHlPSMMoCecYniNwllkY6iEfj64 tvuRjZyDA2BjLgMrl8angvzTcRjm4WWigErdPKAVno3KjFdLFMY9OlEsgEtxY4F/iaSo tPT2YhYyxlwYnXxjSoJ1PcCt+Y26M70uXeDrp0IEKn0T7M6VoOapN8cB0NT0Fq1BmEvG zaOI21P6iQmOIwNtUB31M6/iJT7emc6O+yOF4DhXzLlpMH6LCVsjzMmO+GJAnHmJ9cfc JaaQUU9ut796RhDoTryG2V9CW+ODc7zowHYwQSRU4a26dyDtTy0LY/uin84wg4cUJgZW ZT+Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=kBvh0k4n; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id i27si85424ejg.249.2019.09.23.18.15.41; Mon, 23 Sep 2019 18:16:04 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=kBvh0k4n; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2392311AbfIVStZ (ORCPT + 99 others); Sun, 22 Sep 2019 14:49:25 -0400 Received: from mail.kernel.org ([198.145.29.99]:46068 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391995AbfIVStF (ORCPT ); Sun, 22 Sep 2019 14:49:05 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 2738E208C2; Sun, 22 Sep 2019 18:49:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569178145; bh=s1xHu8LphYSTJupvhJsAxrab1Glumm0UXtfw4+RHFfA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kBvh0k4nHREXXprWD//Q77tWUGmtzp95iYXbOYLCG3Ujle2NYfhlV1DKDJxEZuQ7b NTRCz6Tb1aA0UksidO92xGIsTb8AN3/0Tt6oroPLa30skDqXcSQ6EXj8FNHrUBcr0f qnODu3aiJh1LmUPZogdqXHqzjocaLt25jEEMsCKo= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Ahzo , Evan Quan , Alex Deucher , Sasha Levin , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 5.3 193/203] drm/amd/powerplay/smu7: enforce minimal VBITimeout (v2) Date: Sun, 22 Sep 2019 14:43:39 -0400 Message-Id: <20190922184350.30563-193-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190922184350.30563-1-sashal@kernel.org> References: <20190922184350.30563-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ahzo [ Upstream commit f659bb6dae58c113805f92822e4c16ddd3156b79 ] This fixes screen corruption/flickering on 75 Hz displays. v2: make print statement debug only (Alex) Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=102646 Reviewed-by: Evan Quan Signed-off-by: Ahzo Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c index 487aeee1cf8a5..3c1084de5d59f 100644 --- a/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c @@ -4068,6 +4068,11 @@ static int smu7_program_display_gap(struct pp_hwmgr *hwmgr) data->frame_time_x2 = frame_time_in_us * 2 / 100; + if (data->frame_time_x2 < 280) { + pr_debug("%s: enforce minimal VBITimeout: %d -> 280\n", __func__, data->frame_time_x2); + data->frame_time_x2 = 280; + } + display_gap2 = pre_vbi_time_in_us * (ref_clock / 100); cgs_write_ind_register(hwmgr->device, CGS_IND_REG__SMC, ixCG_DISPLAY_GAP_CNTL2, display_gap2); -- 2.20.1