From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BC8C3C10F14 for ; Thu, 3 Oct 2019 17:08:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 90F9B2086A for ; Thu, 3 Oct 2019 17:08:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1570122520; bh=8RTrsxUPtiQV8fJJjQUR1PBXXKK19v9iUcCIGPA+was=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=H2zKvPeKKFkomVQnLMThI9bKOavkCFgiagR7uOvVwt9SSuvmSRyOQOsg2IeuIMFZk QF3ft2H5J7Qe4guyAT8TR4FE25y2usLJZflcN9JWovjz8WDm8byWyV6pP9qnJh3RaX bXasTORft788ewP3mpurN35acxRx2sXOCAhLfQD4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2404245AbfJCQfM (ORCPT ); Thu, 3 Oct 2019 12:35:12 -0400 Received: from mail.kernel.org ([198.145.29.99]:44014 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2404244AbfJCQfL (ORCPT ); Thu, 3 Oct 2019 12:35:11 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 8F3B12070B; Thu, 3 Oct 2019 16:35:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1570120510; bh=8RTrsxUPtiQV8fJJjQUR1PBXXKK19v9iUcCIGPA+was=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bp/35aTqRsprUIBmOPF/Ud6wurilA7CxqdnPTg5uGUDTez0v7jpJD7Utbn+AVg/6X E475SStoSgLxlKAh/uQ4HeW6GowzoBOJCAE4cA5bME8T1h46Y1t4XvLpyaLEqvlyZz M4czfOCn1hsUD1DvdjXTLL41wVAWwWcYsBrCkPgc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Evan Quan , Ahzo , Alex Deucher , Sasha Levin Subject: [PATCH 5.2 200/313] drm/amd/powerplay/smu7: enforce minimal VBITimeout (v2) Date: Thu, 3 Oct 2019 17:52:58 +0200 Message-Id: <20191003154552.672604061@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191003154533.590915454@linuxfoundation.org> References: <20191003154533.590915454@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@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 048757e8f4949..d1919d343cce4 100644 --- a/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c @@ -4064,6 +4064,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