From patchwork Sun Aug 21 20:36:29 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heinrich Schuchardt X-Patchwork-Id: 9292759 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 F0EB7600CB for ; Mon, 22 Aug 2016 00:40:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D6B5C287DE for ; Mon, 22 Aug 2016 00:40:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C6F54287F4; Mon, 22 Aug 2016 00:40:03 +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.2 required=2.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 5159E287DE for ; Mon, 22 Aug 2016 00:40:03 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 696B56E292; Mon, 22 Aug 2016 00:40:00 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mout.gmx.net (mout.gmx.net [212.227.15.15]) by gabe.freedesktop.org (Postfix) with ESMTPS id AA8B66E08B for ; Sun, 21 Aug 2016 20:36:41 +0000 (UTC) Received: from workstation4.fritz.box ([109.91.48.91]) by mail.gmx.com (mrgmx002) with ESMTPSA (Nemesis) id 0MXr3H-1bgtC00bn5-00WmAr; Sun, 21 Aug 2016 22:36:35 +0200 From: Heinrich Schuchardt To: Alex Deucher , =?UTF-8?q?Christian=20K=C3=B6nig?= Subject: [PATCH 1/1] drm/radeon: remove dead code, si_mc_load_microcode Date: Sun, 21 Aug 2016 22:36:29 +0200 Message-Id: <1471811789-4853-1-git-send-email-xypron.glpk@gmx.de> X-Mailer: git-send-email 2.1.4 X-Provags-ID: V03:K0:dmA4Mf+g2jX2wMPM/j2ijwSnscfHu9g1wZwkSmQqiAj6tljuLb8 B9BP6r5PKuw0TV7Gftml09w6i3H7A6tbYLrewEF7+USc/8RWwsV/3eKSsV3aRilXj/xACQB AkPaPQ+ufnpR6ggb1ckjz7DGnWXGJcWA3OOIBuASr7ISh0n+eC8pnMD7pSaao6g0MimZ0QN OMiFhEM/1aRkJXABQbnvg== X-UI-Out-Filterresults: notjunk:1; V01:K0:TZ5dz9T+9ig=:klK3bBQuxTn7HWx5ikfkAW +PpFjEhJlFjEWDGmyhjwa0SQfY5lD6hffEp5PXG2rurXQ92YwmQ8iRa/WIGCWTCTN+af6I30y B8oE24838C4TPK1sALAznDMcJUmnJkTXIe9dqtnH/yElVvsuITPQWyNSzTv7i8YXjP3H8UBbB etWb2DQAOhP4NLx4SwWL7bl8I2nHVmjsRAwQ7pNUqqg7eSj6rwmOpgQyS3UtWyW3SiTVAHNWI XeiCcnHZTLxGt4+8ez1H++F96/kC6hDJfRiwF8yDUNARk6+ljSUFP3EN2rvz0tNPTbXgMAfSK PHmjwwF0bNZrtMOzSijwZuMzRta3fCH8LT+Tt8GyPxck2IpvWI26uuFEb4p3/TcoUrvn0ZSfk Or3YzAowDUiCBv6WFeJIQeq5G//9HNZAOjS4YXf3ZLiRaR6R/O3FPF3zybdDcmE95WxPO8X89 TaxnTO8taBTALl8/Dk9/ZkvoWhIYgBhFQTGBMzvMqa41pxSfHjre75/j+zwHqRs/MmMPa0KIR qTy4POTyKVnlVrQm4qxKSy1EtcFGVY6iYG2Qq01QGtfzBYTBtv8PReFktd65FMbecKj8q1ei/ HyhuOVaFxArV9tOwaCNOnCRxwUBxkXL1gDDsOJzzBsaoIN5P2QeSNbWKKlHKCXEznRBss7u5q 5iWmWzDBQMAD29WRXN4GT+b4bLlVxPSIswGIE1E2ksee0LP8dEodWwHJKI9oZrnR89PGvsEQm BSwqnv4gCfLLrwtJ3ho5qz/EJnO8oVQ1x19gjgw+41Gnn1aGArDgWPWSEV0= X-Mailman-Approved-At: Mon, 22 Aug 2016 00:39:59 +0000 Cc: Heinrich Schuchardt , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org 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 In an if block for (running == 0) running cannot be non-zero. Signed-off-by: Heinrich Schuchardt --- drivers/gpu/drm/radeon/si.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/drivers/gpu/drm/radeon/si.c b/drivers/gpu/drm/radeon/si.c index 2523ca9..41da47d 100644 --- a/drivers/gpu/drm/radeon/si.c +++ b/drivers/gpu/drm/radeon/si.c @@ -1598,11 +1598,6 @@ int si_mc_load_microcode(struct radeon_device *rdev) running = RREG32(MC_SEQ_SUP_CNTL) & RUN_MASK; if (running == 0) { - if (running) { - blackout = RREG32(MC_SHARED_BLACKOUT_CNTL); - WREG32(MC_SHARED_BLACKOUT_CNTL, blackout | 1); - } - /* reset the engine and set to writable */ WREG32(MC_SEQ_SUP_CNTL, 0x00000008); WREG32(MC_SEQ_SUP_CNTL, 0x00000010); @@ -1641,9 +1636,6 @@ int si_mc_load_microcode(struct radeon_device *rdev) break; udelay(1); } - - if (running) - WREG32(MC_SHARED_BLACKOUT_CNTL, blackout); } return 0;