From patchwork Tue Jun 7 14:24:18 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 9161531 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id D879C60467 for ; Tue, 7 Jun 2016 14:24:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C94EB25404 for ; Tue, 7 Jun 2016 14:24:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BE0152793B; Tue, 7 Jun 2016 14:24:31 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RCVD_IN_SORBS_WEB, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8666C25404 for ; Tue, 7 Jun 2016 14:24:31 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id EF8C66E7A7; Tue, 7 Jun 2016 14:24:29 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-it0-x242.google.com (mail-it0-x242.google.com [IPv6:2607:f8b0:4001:c0b::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id 12FD76E79B for ; Tue, 7 Jun 2016 14:24:28 +0000 (UTC) Received: by mail-it0-x242.google.com with SMTP id h190so1863247ith.3 for ; Tue, 07 Jun 2016 07:24:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=A/ixBif0RA5PrIf7HYwQsaqpLHVtpXCwzB+ld9dVqGY=; b=BErpqK32Ms8u2zdo1bQsrNqtaecCvsSSbJtzR49aw77i0JCOpFp7d7XrCDWxizeCcs DyxSazGeNxDYqPRGLdzqczGB7RMj7/gMMIQ+KM2pQCzZBHmtwUXmK6uWElPClHRA6/HA mzCX96Ju0jLSNp8rUXgJh2htdEm/GDe9pbGlTtG685BOk2PjzRDDBSnGzyhQ0bDbqYQi 9FadkX26mYLLXGDnDacy4DYg+5on8A9Sx5bPMQKLsqvgdPa7T48GhcwLzWYYlgwlvGwn vxwCKEUoV2DLHdJ0RqzuJM7dcWjNhKuOw8+hn6prdwJGLUlrK8Zs6YlCZJdAIOJbMmv+ p1hw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=A/ixBif0RA5PrIf7HYwQsaqpLHVtpXCwzB+ld9dVqGY=; b=JKLKmgVBKA1GItMJTKfVDK2Bs7yCBM/Jpp3C4Tc4HozPozuf4wSPcB++1cAt1qSxta 0yHGZrUApqF79rFsIZa5moRQb5NRsA/14bBgUWWRaVXxu6qW64pBVYHVuPFBkqrGQjVG QV1caE0uYjIc5OodLa+1uUgqBw2hVSt+/f4sjCHm1duiRL4hAYgbRXmUgLNDDJrit6HZ QQNa5UqJxwdlsvCAYC12ZO7/5ybfOnJ2pzOddExsNsVVpnlqtCYKdNirlycRr8R+9gmp sUnjUci/gbAVw167z4c8Wd6BpAoDvygYJvpL0Lyofb36+S0G/v7flwp1ws6IYbICGkU8 BiVg== X-Gm-Message-State: ALyK8tKZ/IqlEmB2yR/hPYFvpKSYxnxm07G8V68RG0Gn6v8COu8kJ2jkmeEXGHLE0/FS+Q== X-Received: by 10.107.178.86 with SMTP id b83mr16895890iof.83.1465309467040; Tue, 07 Jun 2016 07:24:27 -0700 (PDT) Received: from cm.amd.com ([165.204.55.251]) by smtp.gmail.com with ESMTPSA id j9sm4899056itj.8.2016.06.07.07.24.26 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 07 Jun 2016 07:24:26 -0700 (PDT) From: Alex Deucher X-Google-Original-From: Alex Deucher To: dri-devel@lists.freedesktop.org Subject: [PATCH 2/2] drm/amdgpu: enable BUS master after pci reset Date: Tue, 7 Jun 2016 10:24:18 -0400 Message-Id: <1465309458-25050-2-git-send-email-alexander.deucher@amd.com> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1465309458-25050-1-git-send-email-alexander.deucher@amd.com> References: <1465309458-25050-1-git-send-email-alexander.deucher@amd.com> MIME-Version: 1.0 Cc: Alex Deucher X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Chunming Zhou Re-enable bus mastering after GPU reset. We disable it at the top of these functions, so balance them by re-enabling it. Signed-off-by: Chunming Zhou eviewed-by: Christian König Reviewed-by: Alex Deucher Signed-off-by: Alex Deucher --- drivers/gpu/drm/amd/amdgpu/cik.c | 2 ++ drivers/gpu/drm/amd/amdgpu/vi.c | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/cik.c b/drivers/gpu/drm/amd/amdgpu/cik.c index 924c85c..9f61cdc 100644 --- a/drivers/gpu/drm/amd/amdgpu/cik.c +++ b/drivers/gpu/drm/amd/amdgpu/cik.c @@ -1173,6 +1173,8 @@ static int cik_gpu_pci_config_reset(struct amdgpu_device *adev) /* wait for asic to come out of reset */ for (i = 0; i < adev->usec_timeout; i++) { if (RREG32(mmCONFIG_MEMSIZE) != 0xffffffff) { + /* enable BM */ + pci_set_master(adev->pdev); r = 0; break; } diff --git a/drivers/gpu/drm/amd/amdgpu/vi.c b/drivers/gpu/drm/amd/amdgpu/vi.c index dcc937e..b102d31 100644 --- a/drivers/gpu/drm/amd/amdgpu/vi.c +++ b/drivers/gpu/drm/amd/amdgpu/vi.c @@ -598,8 +598,11 @@ static int vi_gpu_pci_config_reset(struct amdgpu_device *adev) /* wait for asic to come out of reset */ for (i = 0; i < adev->usec_timeout; i++) { - if (RREG32(mmCONFIG_MEMSIZE) != 0xffffffff) + if (RREG32(mmCONFIG_MEMSIZE) != 0xffffffff) { + /* enable BM */ + pci_set_master(adev->pdev); return 0; + } udelay(1); } return -EINVAL;