From patchwork Thu Oct 28 08:09:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Koba Ko X-Patchwork-Id: 1547362 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=TOpirtY9; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4Hfysk2tQpz9sS8 for ; Thu, 28 Oct 2021 19:10:18 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1mg0UC-00020r-O5; Thu, 28 Oct 2021 08:10:08 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1mg0U9-0001zz-1s for kernel-team@lists.ubuntu.com; Thu, 28 Oct 2021 08:10:05 +0000 Received: from mail-pg1-f197.google.com (mail-pg1-f197.google.com [209.85.215.197]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id E6CF83F166 for ; Thu, 28 Oct 2021 08:10:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1635408604; bh=mnBswZ49MRW4Xao3vg6Pt0hdKtx2K0giXf/a9BNVmpg=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=TOpirtY9IgWaaF1YJ/T4ZH/eBVWpeRTQNJvY/VKoiKwbaWA0kiH0ymFpviQSsYRd5 MzAqimB9A96o7rG4fmOAtA+VFq3QUiOka8YKAFr46TBWKXpdqnKMv7z5EyGxZhXTsh m1w8CHgv1TQBg6hTuK8KcJVVFTDpWrgz+tISIoICS8vmqu9CbdffGfJ7rwMBTa0zMw tANWXBxEulDjE/euwtpK2F+pbU1UBiW3no48HLt7PIU5QQlWYwuu6tReZD/eAo+pzc H09B2//l7xs247iYQ1cROvNDGa9U1BqqT8ygwTtIYp0caPbghA5Vbz/GEun19mH+SQ D4Jj4JpKoLS+Q== Received: by mail-pg1-f197.google.com with SMTP id n9-20020a63e049000000b002951886c1c5so2971206pgj.0 for ; Thu, 28 Oct 2021 01:10:04 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=mnBswZ49MRW4Xao3vg6Pt0hdKtx2K0giXf/a9BNVmpg=; b=aYWdkeg2e2RQ8RElbEAsU+G3mKpqhJN165qhK9oL1DNy6SH06lZEcjXgH/IsU/rguv gHKAN8RnbOxflSL8C5SqcAIZvcG7SXPT/VkVusJgy5ZdvqbvcfGg4vYW0ltUGysKSH8q df9w3e7G2EF4KDPFkvSdyilIr1g/qoGmR1liq0clhcNFWVcgamHYDWSp/ZJg5puQDcvn Ukvqc64q9WOagiEx/HekjX29QJpQ4pBz5ennZh6wFESlAWozA1+ecknoiegaUWaKAah7 9t75SUUrFWlhR9J605BizFG2wjqwl5vsSYhneRWXC1TI3eAlwvSoM4beylPy32nTK9gZ up0Q== X-Gm-Message-State: AOAM5322LKTMTdz/2rrF9kp978J2WTTTRgBwmIy+jvajLTegQJ+t5tSm ovqO2TP2IeuVDeM6jADPvkX0e6IIhUSoloGGCOAib5+3dn4egR43Eu+d3fx0+ZAOdE65FjeOZMs 89y/5z0ICcUi3a9MX+SBTcnUfAPHdr5AUytfJt19UUg== X-Received: by 2002:aa7:8198:0:b0:44b:e191:7058 with SMTP id g24-20020aa78198000000b0044be1917058mr2790114pfi.39.1635408603169; Thu, 28 Oct 2021 01:10:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyJlD3Y5bhpkN7sOPB3bVBXbraDrod8rrOj3vJ5Ss8mM3O6BN9i/+Xp+KIQ+uEpDHsibn+FXA== X-Received: by 2002:aa7:8198:0:b0:44b:e191:7058 with SMTP id g24-20020aa78198000000b0044be1917058mr2790094pfi.39.1635408602895; Thu, 28 Oct 2021 01:10:02 -0700 (PDT) Received: from canonical.com (211-75-139-218.hinet-ip.hinet.net. [211.75.139.218]) by smtp.gmail.com with ESMTPSA id g17sm1506093pfc.193.2021.10.28.01.10.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Oct 2021 01:10:02 -0700 (PDT) From: Koba Ko To: kernel-team@lists.ubuntu.com Subject: [PATCH 1/4][SRU][H/I/OEM-5.13/OEM-5.14] drm/amdgpu: reenable BACO support for 699F:C7 polaris12 SKU Date: Thu, 28 Oct 2021 16:09:56 +0800 Message-Id: <20211028080959.2125864-2-koba.ko@canonical.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211028080959.2125864-1-koba.ko@canonical.com> References: <20211028080959.2125864-1-koba.ko@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Evan Quan BugLink: https://bugs.launchpad.net/bugs/1949050 This reverts the commit below: "drm/amdgpu: disable BACO support for 699F:C7 polaris12 SKU temporarily". As the S3 hang issue has been fixed by another commit: "drm/amdgpu: add missing cleanups for Polaris12 UVD/VCE on suspend". Signed-off-by: Evan Quan Acked-by: Alex Deucher Signed-off-by: Alex Deucher (cherry picked from commit 602e338ffed31b1f15c706ea109366e3bae6e39b) Signed-off-by: Koba Ko --- drivers/gpu/drm/amd/amdgpu/vi.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/vi.c b/drivers/gpu/drm/amd/amdgpu/vi.c index 3e911fcd9b1d1..735ebbd1148fd 100644 --- a/drivers/gpu/drm/amd/amdgpu/vi.c +++ b/drivers/gpu/drm/amd/amdgpu/vi.c @@ -904,14 +904,7 @@ static bool vi_asic_supports_baco(struct amdgpu_device *adev) case CHIP_POLARIS11: case CHIP_POLARIS12: case CHIP_TOPAZ: - /* Disable BACO support for the specific polaris12 SKU temporarily */ - if ((adev->pdev->device == 0x699F) && - (adev->pdev->revision == 0xC7) && - (adev->pdev->subsystem_vendor == 0x1028) && - (adev->pdev->subsystem_device == 0x0039)) - return false; - else - return amdgpu_dpm_is_baco_supported(adev); + return amdgpu_dpm_is_baco_supported(adev); default: return false; }