From patchwork Mon Dec 28 09:24:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AceLan Kao X-Patchwork-Id: 1420825 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=krtnPyen; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 4D4DbY565vz9sWV; Mon, 28 Dec 2020 21:40:41 +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 1ktolo-0002wH-IF; Mon, 28 Dec 2020 09:24:52 +0000 Received: from mail-wr1-f53.google.com ([209.85.221.53]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1ktolm-0002w2-6Z for kernel-team@lists.ubuntu.com; Mon, 28 Dec 2020 09:24:50 +0000 Received: by mail-wr1-f53.google.com with SMTP id q18so10805488wrn.1 for ; Mon, 28 Dec 2020 01:24:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=IjKkCW0jbyYzh+ZFf8bqGGN436DsU7ZpmzXGZqbkRNU=; b=krtnPyenz157/3/TA/Y/ZqobRJ3C2LkwB2a0OynY4/lonu79+k0aHsZpUfeC3h7FFY JadJG0/aTCG8naHxgK1XYzL+q/z/bAmgCNZ5UpgZEjwG9wbbLbU5k9+txaXj5hjBRrZM BzE8lrdg65S4nI7lnvVUuFgaIHU1cpkg3jTm17j76TZ+HaXkLHVTAqBJar+c4iLe+nm0 nqqZea0qtU9b9R/TdSGCQVKy8RIM9fLBvTXTJe26SJLhJFpFtajhTHLEQAe81ZCXcPfm 5E1ikCTe0axl34y+VA80FgguOeMfn9ThH8gQS4NPfbQvGwZwk8t00papbDlnqUZn8HFu BMxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=IjKkCW0jbyYzh+ZFf8bqGGN436DsU7ZpmzXGZqbkRNU=; b=Lnury1G9XmU4g6zWtkQnkR3hwfe6XrAIlUR7Q7UdlDD5Alc9MJCN3Gn6APwZT1NlnE S5hOERV8mfjw3sWQyjVgUhUpo4garjLo2gHJrFlzM4YK46LwHFJMuHvtRhoNk+iZXSNG 2rOoQNxQBlPhP91GjlXE0AlO24Q19TcKQD0AxDx2osNUygwaLHYm1jbslrB+pTZq+YkH APl+7xkKW1KFfPGw+Z/34CjsCqMQAyemEBbE3Xi3qFg39DodBZi9I8V1sfYtSj5gqdS9 1ly7r0maHPqmhMuvxFeJ2FdtUeffvC67+89P9maZg8QgYxNb/yKkDoVzdpWv9o/FccAL wzFg== X-Gm-Message-State: AOAM5336oq903xy6PfM6N9nUzCBFOkrlBundRTAD9wg5pbarL5vG0hBD 6Y3bQrUmyhmNVVwQ/ACoo6kBuk+0HysMeQ== X-Google-Smtp-Source: ABdhPJzCfLiu2/8luctZBEIqWAHhd6Q8cTj+xdrzUowol0zTlB4AG3CKrG+G5nPhmfONDj2lurdTig== X-Received: by 2002:adf:a4cc:: with SMTP id h12mr50395078wrb.391.1609147489297; Mon, 28 Dec 2020 01:24:49 -0800 (PST) Received: from localhost ([2001:67c:1560:8007::aac:c469]) by smtp.gmail.com with ESMTPSA id c4sm60456667wrw.72.2020.12.28.01.24.47 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Dec 2020 01:24:48 -0800 (PST) From: AceLan Kao To: kernel-team@lists.ubuntu.com Subject: [PATCH 1/2][SRU][OEM-5.6] drm/amdgpu: asd function needs to be unloaded in suspend phase Date: Mon, 28 Dec 2020 17:24:40 +0800 Message-Id: <20201228092441.926727-2-acelan.kao@canonical.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201228092441.926727-1-acelan.kao@canonical.com> References: <20201228092441.926727-1-acelan.kao@canonical.com> MIME-Version: 1.0 Received-SPF: pass client-ip=209.85.221.53; envelope-from=acelan@gmail.com; helo=mail-wr1-f53.google.com 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: Huang Rui BugLink: https://bugs.launchpad.net/bugs/1909453 Unload ASD function in suspend phase. Signed-off-by: Huang Rui Reviewed-by: Alex Deucher Signed-off-by: Alex Deucher (cherry picked from commit 429f3d24384b049925771c56b5bc2850cede958f) Signed-off-by: Chia-Lin Kao (AceLan) --- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c index 146f96661b6b..d50f29b9a64e 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c @@ -1580,6 +1580,12 @@ static int psp_suspend(void *handle) } } + ret = psp_asd_unload(psp); + if (ret) { + DRM_ERROR("Failed to unload asd\n"); + return ret; + } + ret = psp_ring_stop(psp, PSP_RING_TYPE__KM); if (ret) { DRM_ERROR("PSP ring stop failed\n");