From patchwork Fri Oct 15 19:58:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Hung X-Patchwork-Id: 1541909 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=ftdYmGSK; 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 4HWHBj0CBPz9sP7 for ; Sat, 16 Oct 2021 06:58:19 +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 1mbTLF-00081x-8J; Fri, 15 Oct 2021 19:58:09 +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 1mbTLC-00081J-OY for kernel-team@lists.ubuntu.com; Fri, 15 Oct 2021 19:58:06 +0000 Received: from mail-pj1-f69.google.com (mail-pj1-f69.google.com [209.85.216.69]) (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 65A744001A for ; Fri, 15 Oct 2021 19:58:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1634327886; bh=8QplF/vkUCnNlVx/25zOzdefAM462kEnZHXojghH2iM=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ftdYmGSKlXC35y5LMGh0FXrRH3cT9eJ17JLxpsFseDZR4bGtGC/QGv1U7c6eWL27w 1EZgLX1DwaxfxdTUbpJeXdl7LiJ3MkQW4bq+49rQJMgw25Q08si9/AuCO2bwfnbGYe OxPIC/XDA5JR22jQV9yF+xBQ+Rd+DODdb8DnxIFYq+1jJ7jVtFKrik9/sq6rBt6VUS AG9xM1zjoE6ZYDG05Ef14R6R9qwsPMUAL3Ir1qhxAWvdCIziyxsDveAZDbZ+86DfvE yvSFQyKmpHR9agnUXRA8XeZQqp+XsnIFyXepZsW6QZWFF5eOVNYdpEH8J8vwYhfKtt K2V3OJXF9+MPA== Received: by mail-pj1-f69.google.com with SMTP id l10-20020a17090ac58a00b001a04b92a5d4so5463432pjt.8 for ; Fri, 15 Oct 2021 12:58:06 -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=8QplF/vkUCnNlVx/25zOzdefAM462kEnZHXojghH2iM=; b=nYzz2MItAncAm3CxgJ71XhlRPUVWRe246I8uObts18Nf50C7gBLtB9eYeV5QmRhRle ZhjpGjipGgkU9wt+KVEIgd5AgEmHvS9xr4tsO5O30ooIgngYbBR2aGhLtGzsfmQKO6dZ 3BKpLtmqdhI97QqLUZc8YvAvamrjmAeiBWpDJou5pHf5Y/QgJaeR6dlGThNzwfsklHbr Sz/8t4k/EAVSxGCgHw/k++RWRlumOC3uQfkAqHp8ck9NjfkTvsRkb+DPnp/XQeVoA8wR WZ5QEJopLFXOElQcf75ark30lu1ECbtP57lHRYSJY7CMqNePI3uON9PG9Fz7PoLok8VQ vGxA== X-Gm-Message-State: AOAM530g5zhnkglMlqJKf9B6vq1rOuqHOoCZ9Qt0/MnHm4OMzcfd8yBv hdK1HsLwVGAAvOEnGdRoNxcMuGNqIvxzutQ/mEvvbUorkRJzmlz6hqmfax6cJ6KBNYQjPYH0m2y I4igxDdfGnCsh8ngZf2pOUdyMUfdzmlRK9OPgrbPKbw== X-Received: by 2002:a63:ea58:: with SMTP id l24mr10754546pgk.334.1634327884655; Fri, 15 Oct 2021 12:58:04 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwGY2URTJEwY2nlsjZBa51CoMcYAYeB10/MaDJE4zTX8CRerWQuU0WjBJH7qYR6wvDmzMXlkg== X-Received: by 2002:a63:ea58:: with SMTP id l24mr10754528pgk.334.1634327884343; Fri, 15 Oct 2021 12:58:04 -0700 (PDT) Received: from canonical.com (node-1w7jr9yebujeq5th4a1ypmgpl.ipv6.telus.net. [2001:56a:78ed:fb00::f19]) by smtp.gmail.com with ESMTPSA id ls7sm5837396pjb.16.2021.10.15.12.58.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Oct 2021 12:58:03 -0700 (PDT) From: Alex Hung To: kernel-team@lists.ubuntu.com Subject: [PATCH 1/1][SRU][OEM-5.14] drm/amdgpu: force exit gfxoff on sdma resume for rmb s0ix Date: Fri, 15 Oct 2021 13:58:01 -0600 Message-Id: <20211015195801.1043106-2-alex.hung@canonical.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211015195801.1043106-1-alex.hung@canonical.com> References: <20211015195801.1043106-1-alex.hung@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: Prike Liang BugLink: https://bugs.launchpad.net/bugs/1945348 In the s2idle stress test sdma resume fail occasionally,in the failed case GPU is in the gfxoff state.This issue may introduce by firmware miss handle doorbell S/R and now temporary fix the issue by forcing exit gfxoff for sdma resume. Signed-off-by: Prike Liang Reviewed-by: Alex Deucher Signed-off-by: Alex Deucher Cc: stable@vger.kernel.org (cherry picked from commit 26db706a6d77b9e184feb11725e97e53b7a89519) Signed-off-by: Alex Hung --- drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c b/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c index 7486e5306786..27e0ca615edc 100644 --- a/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c @@ -883,6 +883,12 @@ static int sdma_v5_2_start(struct amdgpu_device *adev) msleep(1000); } + /* TODO: check whether can submit a doorbell request to raise + * a doorbell fence to exit gfxoff. + */ + if (adev->in_s0ix) + amdgpu_gfx_off_ctrl(adev, false); + sdma_v5_2_soft_reset(adev); /* unhalt the MEs */ sdma_v5_2_enable(adev, true); @@ -891,6 +897,8 @@ static int sdma_v5_2_start(struct amdgpu_device *adev) /* start the gfx rings and rlc compute queues */ r = sdma_v5_2_gfx_resume(adev); + if (adev->in_s0ix) + amdgpu_gfx_off_ctrl(adev, true); if (r) return r; r = sdma_v5_2_rlc_resume(adev);