Received: by 2002:ac0:e34a:0:0:0:0:0 with SMTP id g10csp479048imn; Wed, 27 Jul 2022 11:20:28 -0700 (PDT) X-Google-Smtp-Source: AGRyM1vHQLlq3j0RwS09TfTLHSO4XtN1GtNDQ4ZOT2wSKex8uHVEPW5qspQEIKNE0B6UMF+XHTBE X-Received: by 2002:a05:6402:540c:b0:434:d965:f8a with SMTP id ev12-20020a056402540c00b00434d9650f8amr24744324edb.30.1658946028083; Wed, 27 Jul 2022 11:20:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1658946028; cv=none; d=google.com; s=arc-20160816; b=hNjBe4+rYuw7TmtHpGRK1TETYiZZPbZydT0aj1OkeDxXt7Scb+/zOQHctSsv44WMpl Z5cAVj8sZ2Ck1jsM4QW/SL4rAJWfkrGuMvFB8LVUisjTpoOJYPXgvAegf+jsWYYSUdku XcOtOrA41x63Sn/RVzsX1KxAUfRt00/tWV4EmReelh7VfpyHCYkAaVs8rmy477eu3vll TYnxgWKV52vzkPuXvyy3kvgkohUNeYE1+/VDoWsv4KOloSgt3ZQX5lKdNEBYZVfac9Ni 3Z/Kut9a696HG5TIepIl5ivPY0jyWUgbw4owVvz4w+h46tJxUGOlmDt9thpOwe7URB4F 5Diw== 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=zJaYz9fMGF3Q2udTfVWXgrHxu4e5I61PcjYNRHeOv5I=; b=0Zmoz+aJmBRcPH7GN4SH1WWx7AbI2xhub/gyYfEvv0hErzjL4rHMre+6TneTkB2zRt d4LrdsSwkM+eYmgzS6S/12qeyy91IUHPuzZB3N63BI0x/pIU2D2YL27K+gaJZ+IMTl9T x9Ljb/Y6ALYrWfrhfoeRLea1inS5erhsXpcTrIgNCB+JvP0P7VZWBcgIk3Bm8KoyAt3f y0J1WBp5JSdU0bVDsfldRAeotbaUQW2k36ZegxVyVko2tpyMStOGeS+zfcDGPoAYzPwV b2Llren9Q/OTHkoN51Dfp0PScof7nAr9lWa9mIpenhgDCMlai79BYBQ+V0di7RFE2M3N Ot8A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="hz/G/Z+9"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id cf20-20020a170906b2d400b0072f1d8e7300si8872736ejb.430.2022.07.27.11.20.02; Wed, 27 Jul 2022 11:20:28 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="hz/G/Z+9"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240925AbiG0Qx1 (ORCPT + 99 others); Wed, 27 Jul 2022 12:53:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57980 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240840AbiG0QwS (ORCPT ); Wed, 27 Jul 2022 12:52:18 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ED3E554AE7; Wed, 27 Jul 2022 09:34:17 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id A7A36B821C5; Wed, 27 Jul 2022 16:34:16 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id F0065C433C1; Wed, 27 Jul 2022 16:34:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1658939655; bh=+g2pLYhP4bQmZMk3IlOF+le1a4hQ0xKeaAGPi1gxwdo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hz/G/Z+9ZLGn1o4v/oW+TSVTOb5IfzVWnYPS3thvrbPyqpzypRS/uR1t1EtfcOs3b ufRBOPbKcgnMlkZ1mDXz3yLP8+uQoTIIcjZ+JAStucG4o+FB47sk3U1m8+rbkWdn/N AioVajWEVCB1doXu6X558bPxDSMZMgPcixOySLxQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Harry Wentland , Alex Deucher , Sasha Levin Subject: [PATCH 5.10 026/105] drm/amdgpu/display: add quirk handling for stutter mode Date: Wed, 27 Jul 2022 18:10:12 +0200 Message-Id: <20220727161013.149328291@linuxfoundation.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220727161012.056867467@linuxfoundation.org> References: <20220727161012.056867467@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.7 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Alex Deucher [ Upstream commit 3ce51649cdf23ab463494df2bd6d1e9529ebdc6a ] Stutter mode is a power saving feature on GPUs, however at least one early raven system exhibits stability issues with it. Add a quirk to disable it for that system. Bug: https://bugzilla.kernel.org/show_bug.cgi?id=214417 Fixes: 005440066f929b ("drm/amdgpu: enable gfxoff again on raven series (v2)") Reviewed-by: Harry Wentland Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c index f069d0faba64..55ecc67592eb 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -922,6 +922,37 @@ static void amdgpu_check_debugfs_connector_property_change(struct amdgpu_device } } +struct amdgpu_stutter_quirk { + u16 chip_vendor; + u16 chip_device; + u16 subsys_vendor; + u16 subsys_device; + u8 revision; +}; + +static const struct amdgpu_stutter_quirk amdgpu_stutter_quirk_list[] = { + /* https://bugzilla.kernel.org/show_bug.cgi?id=214417 */ + { 0x1002, 0x15dd, 0x1002, 0x15dd, 0xc8 }, + { 0, 0, 0, 0, 0 }, +}; + +static bool dm_should_disable_stutter(struct pci_dev *pdev) +{ + const struct amdgpu_stutter_quirk *p = amdgpu_stutter_quirk_list; + + while (p && p->chip_device != 0) { + if (pdev->vendor == p->chip_vendor && + pdev->device == p->chip_device && + pdev->subsystem_vendor == p->subsys_vendor && + pdev->subsystem_device == p->subsys_device && + pdev->revision == p->revision) { + return true; + } + ++p; + } + return false; +} + static int amdgpu_dm_init(struct amdgpu_device *adev) { struct dc_init_data init_data; @@ -1014,6 +1045,8 @@ static int amdgpu_dm_init(struct amdgpu_device *adev) if (adev->asic_type != CHIP_CARRIZO && adev->asic_type != CHIP_STONEY) adev->dm.dc->debug.disable_stutter = amdgpu_pp_feature_mask & PP_STUTTER_MODE ? false : true; + if (dm_should_disable_stutter(adev->pdev)) + adev->dm.dc->debug.disable_stutter = true; if (amdgpu_dc_debug_mask & DC_DISABLE_STUTTER) adev->dm.dc->debug.disable_stutter = true; -- 2.35.1