From patchwork Mon May 23 21:04:53 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 9132367 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 B54226075F for ; Mon, 23 May 2016 21:05:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AC0A428233 for ; Mon, 23 May 2016 21:05:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A0C6128247; Mon, 23 May 2016 21:05:05 +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=-4.1 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, 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 0A60128233 for ; Mon, 23 May 2016 21:05:05 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A8F736E545; Mon, 23 May 2016 21:05:03 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qk0-x242.google.com (mail-qk0-x242.google.com [IPv6:2607:f8b0:400d:c09::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id D6F496E545 for ; Mon, 23 May 2016 21:05:01 +0000 (UTC) Received: by mail-qk0-x242.google.com with SMTP id l68so19720969qkf.3 for ; Mon, 23 May 2016 14:05:01 -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; bh=y6+SxjeCfDGHIPfV0DkViIkfka7ZJAvQUma8NXdr4FQ=; b=T35y0Fhorfvflg53TsUPDfp/AxbNz2SWEvNluPlsiO/SqHHqYzK9Uw4bsEYerTofC9 u69SPDr6/FXcWVQY04szUeD8AA6TPtS/4SF7OJXlqmuNr+vfJgPvwpmZP6AXUANdHkG+ ApIcMESx2M0lT7ykunrWoC33sVre90F3uPveHqvZqNYtNd0gvk1TIVwPpkRJGQLQ4jUA H75aqsRjhBPgZNJLhmfjNNIkZoNQpHM0LgHdVaCSFWInHJ5eos7i7Ay41Ey69ZOlHcPO Sril0Y8odu5ygrWZdh+P1dSyMNKm3EB5KHPTaVx+Y29mO2p6ll0dpWhjmpaHv2ccV9bQ 9bxQ== 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; bh=y6+SxjeCfDGHIPfV0DkViIkfka7ZJAvQUma8NXdr4FQ=; b=DFzUA6cEGQG0eleKYITv7fgi0SGIvl6U1ZKl/86ER5a/eLxiSM2gAjcZJJhx5XD23j J3KiA6tJn4luPt5xlYR5GtEUhMfPfoPm0vBGoZxY2mTKaGUZj1nu/rh1BL5HDROMzTdw 7H8jJPyj2qFJrjzxpgldIioClSq5/Y6PVJlXm8Fd/MuhNyDAt4lesd1pKkK0bzAdrNjt XTfMXk7LuVMLUjFJEkNqtlq8fZDnZZklyM3oxGrJAJr7E6yuS/ERDH4CtxaExeoDsKZY mmw5pC5jbYsqRkN/8lCUfX+m82PivKR2p5NmYKvNclYD92W3/dHrZ273wJbkm3pa7dVi OqYg== X-Gm-Message-State: ALyK8tJn+iwBfzr4u88GW3TsIdPwHn2LJm9Lo7m59J8nEKnDywEQYclwi3WcfyqpkxvgXg== X-Received: by 10.200.54.108 with SMTP id n41mr999089qtb.18.1464037500673; Mon, 23 May 2016 14:05:00 -0700 (PDT) Received: from cm.localdomain (static-74-96-105-49.washdc.fios.verizon.net. [74.96.105.49]) by smtp.gmail.com with ESMTPSA id 127sm4694984qhg.49.2016.05.23.14.05.00 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 23 May 2016 14:05:00 -0700 (PDT) From: Alex Deucher X-Google-Original-From: Alex Deucher To: dri-devel@lists.freedesktop.org Subject: [PATCH] drm/amdgpu/gfx6: set compute ring->ready = false on disable Date: Mon, 23 May 2016 17:04:53 -0400 Message-Id: <1464037493-19098-1-git-send-email-alexander.deucher@amd.com> X-Mailer: git-send-email 2.5.5 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: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Need to properly update the sw ring status when we disable the gfx MEs on SI. Signed-off-by: Alex Deucher Reviewed-by: Michel Dänzer --- drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c index b9093a6..561d67a 100644 --- a/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c @@ -1464,6 +1464,8 @@ static void gfx_v6_0_cp_gfx_enable(struct amdgpu_device *adev, bool enable) WREG32(SCRATCH_UMSK, 0); for (i = 0; i < adev->gfx.num_gfx_rings; i++) adev->gfx.gfx_ring[i].ready = false; + for (i = 0; i < adev->gfx.num_compute_rings; i++) + adev->gfx.compute_ring[i].ready = false; } udelay(50); }