From patchwork Sun Aug 21 19:41:49 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heinrich Schuchardt X-Patchwork-Id: 9292771 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 144F2600CB for ; Mon, 22 Aug 2016 00:40:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 07033287DE for ; Mon, 22 Aug 2016 00:40:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EFED3287F4; Mon, 22 Aug 2016 00:40:11 +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 C0ECC287DE for ; Mon, 22 Aug 2016 00:40:11 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 642E66E2AC; Mon, 22 Aug 2016 00:40:01 +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.17.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id 349DE6E257 for ; Sun, 21 Aug 2016 19:42:03 +0000 (UTC) Received: from workstation4.fritz.box ([109.91.48.91]) by mail.gmx.com (mrgmx102) with ESMTPSA (Nemesis) id 0MBZ9u-1bTLAT2BbK-00AV3i; Sun, 21 Aug 2016 21:41:55 +0200 From: Heinrich Schuchardt To: Alex Deucher , =?UTF-8?q?Christian=20K=C3=B6nig?= Subject: [PATCH 1/1] drm/radeon/cik: remove dead code Date: Sun, 21 Aug 2016 21:41:49 +0200 Message-Id: <1471808509-4194-1-git-send-email-xypron.glpk@gmx.de> X-Mailer: git-send-email 2.1.4 X-Provags-ID: V03:K0:VmtLUTDzESIQysgi8tbIcUtkas3NvULFNoY3g7jPKsG35f/qE3/ hZpiKbwWwyalLPczC4rI8Ky+UcO65xQopHzePF9QT/9KxY/z8+pIUkswjMX69wlL8K07af9 SBGunWy7w6/iUXdwvrQyi5DhfULFxqFrDTeDTC231Krzq7ESFsxmQ/k3F+fEPj/miuWzqTu 7AWCTDYBfwDo2vM3An//Q== X-UI-Out-Filterresults: notjunk:1; V01:K0:XyclogaTNt0=:JbsGTzo+9dr7yr4SfW+cm3 oI7cKkdeLjhqYjmsG4x6eMaBLblj0f/6Kgy5HoRPDaGomZDfAN6NAe306bfjBdTmuw95JmdWU GjIwx9JcHn340r1zEZwvdWOlCHKzJsbukOowv+STnSH82obW3vrU+rpE3Tq8yxJyf1ABD+NiE Do2aDWjn4V+h9ci/IAFXhE6nyMg6U+XBhtYyeNtAyyETMW+hoaMyeKMVIHBhDivuvInDmze2Z e16tVa2YETJgxd9FzwLuOEBLks6qXrXycPBwevUq6Y0Vq3t3HWOXP+aUxpodgHH0qPA3G4c7c 8HQkmHi8YyZhksvqtP02scFX7cb1NrVAp0cw/wuiDGRh2dwcG/mdRhWIRGsYdp7aZKpMCNFs9 IxJJcQf2THKaDz8yT/KZOV6fKMW0PbHivAaRdkYK+FxDaEGq71RwFZHi1E3AVnPgBcxWXilmq C19W4Zmg39EdSBzTbYDPIuxddMRfSnHnTqcEn1fo4bW466Mr6s5/CgbEu1RQj2NXGsfJyd+Iv PvSLFQYC9k0y3m8rEoQcfVAKcIDYo5gkpRJB7En6khCOBjONSscL6EaNZfoXmI+PeQSZldR1q BIALyEXMnaC3zMWOSxHfihtI3MWM5Ed3whavWjPIJRRqEOzKmQ1KjG5Kkso2QRCY/yMQ2Iidy C9KZDP5E6mgKLEurAJLbnMBkeEwwcE8JsPHr8196+UP32njQBi+evqjxQLVJBeTrQMjHStFO6 bkWVkqeFjeUc2I3VDBvPdVtoC05sdMJH33DYCSRtmJMbL/NTdpQ56rpIOqE= 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/cik.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/drivers/gpu/drm/radeon/cik.c b/drivers/gpu/drm/radeon/cik.c index 0c1b9ff..c8e1515 100644 --- a/drivers/gpu/drm/radeon/cik.c +++ b/drivers/gpu/drm/radeon/cik.c @@ -1912,11 +1912,6 @@ int ci_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); @@ -1964,9 +1959,6 @@ int ci_mc_load_microcode(struct radeon_device *rdev) break; udelay(1); } - - if (running) - WREG32(MC_SHARED_BLACKOUT_CNTL, blackout); } return 0;