From patchwork Fri Feb 21 07:36:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 230600 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,URIBL_BLOCKED,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 AC200C35640 for ; Fri, 21 Feb 2020 08:48:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 79D1020722 for ; Fri, 21 Feb 2020 08:48:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582274927; bh=tud2cv99dE6wjxlK392HtWbNS/Q2yAcd7HSkB+mD/w0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=twMIZTmb8I/73HvQVEk93qGks+SkCj4aWj9Zr2Kb0J4N9laC5uxnjevUBcz4rFJzn zWBW5tsQzc4IH554rfLG0jqhVccgSXVBCFMmuRYWFX8sfTjlccB7qRhQLs6hzS8QSE LQkgoBnsPE99JEwVvxi5KtBcap4q5UTbKatYurkY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728699AbgBUHq0 (ORCPT ); Fri, 21 Feb 2020 02:46:26 -0500 Received: from mail.kernel.org ([198.145.29.99]:41898 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728687AbgBUHqY (ORCPT ); Fri, 21 Feb 2020 02:46:24 -0500 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 4F54424650; Fri, 21 Feb 2020 07:46:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582271183; bh=tud2cv99dE6wjxlK392HtWbNS/Q2yAcd7HSkB+mD/w0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=y/QKPcTD/gtXmdsREkTILNEe/8tEt2ZGK2qvySJknqBFq06m0zg19hTe0dqoY5OGr jl43ERf7njBzCbP424TIOoLt5QFk0rXerccGO+LklfbGPVNL4Sh6MAnpCpmJQiCoPd 6DmIS5o3cQRcpPYJcbo65JjeilogJ4cMSNDmGZN4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Amanda Liu , Anthony Koo , Harry Wentland , Rodrigo Siqueira , Alex Deucher , Sasha Levin Subject: [PATCH 5.5 069/399] drm/amd/display: Clear state after exiting fixed active VRR state Date: Fri, 21 Feb 2020 08:36:34 +0100 Message-Id: <20200221072409.067636564@linuxfoundation.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200221072402.315346745@linuxfoundation.org> References: <20200221072402.315346745@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Amanda Liu [ Upstream commit 6f8f76444baf405bacb0591d97549a71a9aaa1ac ] [why] Upon exiting a fixed active VRR state, the state isn't cleared. This leads to the variable VRR range to be calculated incorrectly. [how] Set fixed active state to false when updating vrr params Signed-off-by: Amanda Liu Reviewed-by: Anthony Koo Acked-by: Harry Wentland Acked-by: Rodrigo Siqueira Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/display/modules/freesync/freesync.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/amd/display/modules/freesync/freesync.c b/drivers/gpu/drm/amd/display/modules/freesync/freesync.c index 5437b50e9f90d..d9ea4ae690af6 100644 --- a/drivers/gpu/drm/amd/display/modules/freesync/freesync.c +++ b/drivers/gpu/drm/amd/display/modules/freesync/freesync.c @@ -807,6 +807,7 @@ void mod_freesync_build_vrr_params(struct mod_freesync *mod_freesync, 2 * in_out_vrr->min_refresh_in_uhz) in_out_vrr->btr.btr_enabled = false; + in_out_vrr->fixed.fixed_active = false; in_out_vrr->btr.btr_active = false; in_out_vrr->btr.inserted_duration_in_us = 0; in_out_vrr->btr.frames_to_insert = 0; @@ -826,6 +827,7 @@ void mod_freesync_build_vrr_params(struct mod_freesync *mod_freesync, in_out_vrr->adjust.v_total_max = stream->timing.v_total; } else if (in_out_vrr->state == VRR_STATE_ACTIVE_VARIABLE && refresh_range >= MIN_REFRESH_RANGE_IN_US) { + in_out_vrr->adjust.v_total_min = calc_v_total_from_refresh(stream, in_out_vrr->max_refresh_in_uhz);