From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dan Carpenter Date: Wed, 29 Oct 2014 15:47:07 +0000 Subject: [patch] drm/radeon: remove some buggy dead code Message-Id: <20141029154707.GA5290@mwanda> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Alex Deucher Cc: kernel-janitors@vger.kernel.org, Christian =?iso-8859-1?Q?K=F6nig?= , dri-devel@lists.freedesktop.org The calculation of "num_shader_engines" has a precedence bug because the right shift happens before the mask, but this variable is never used so we can just delete it. Signed-off-by: Dan Carpenter diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c index a31f1ca..f37d39d 100644 --- a/drivers/gpu/drm/radeon/evergreen.c +++ b/drivers/gpu/drm/radeon/evergreen.c @@ -3005,7 +3005,7 @@ static void evergreen_gpu_init(struct radeon_device *rdev) u32 vgt_cache_invalidation; u32 hdp_host_path_cntl, tmp; u32 disabled_rb_mask; - int i, j, num_shader_engines, ps_thread_count; + int i, j, ps_thread_count; switch (rdev->family) { case CHIP_CYPRESS: @@ -3303,8 +3303,6 @@ static void evergreen_gpu_init(struct radeon_device *rdev) rdev->config.evergreen.tile_config | ((gb_addr_config & 0x30000000) >> 28) << 12; - num_shader_engines = (gb_addr_config & NUM_SHADER_ENGINES(3) >> 12) + 1; - if ((rdev->family >= CHIP_CEDAR) && (rdev->family <= CHIP_HEMLOCK)) { u32 efuse_straps_4; u32 efuse_straps_3; From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dan Carpenter Subject: [patch] drm/radeon: remove some buggy dead code Date: Wed, 29 Oct 2014 18:47:07 +0300 Message-ID: <20141029154707.GA5290@mwanda> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from aserp1040.oracle.com (aserp1040.oracle.com [141.146.126.69]) by gabe.freedesktop.org (Postfix) with ESMTP id 934B46E5DD for ; Wed, 29 Oct 2014 08:47:22 -0700 (PDT) Content-Disposition: inline List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Alex Deucher Cc: kernel-janitors@vger.kernel.org, Christian =?iso-8859-1?Q?K=F6nig?= , dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org VGhlIGNhbGN1bGF0aW9uIG9mICJudW1fc2hhZGVyX2VuZ2luZXMiIGhhcyBhIHByZWNlZGVuY2Ug YnVnIGJlY2F1c2UKdGhlIHJpZ2h0IHNoaWZ0IGhhcHBlbnMgYmVmb3JlIHRoZSBtYXNrLCBidXQg dGhpcyB2YXJpYWJsZSBpcyBuZXZlciB1c2VkCnNvIHdlIGNhbiBqdXN0IGRlbGV0ZSBpdC4KClNp Z25lZC1vZmYtYnk6IERhbiBDYXJwZW50ZXIgPGRhbi5jYXJwZW50ZXJAb3JhY2xlLmNvbT4KCmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vcmFkZW9uL2V2ZXJncmVlbi5jIGIvZHJpdmVycy9n cHUvZHJtL3JhZGVvbi9ldmVyZ3JlZW4uYwppbmRleCBhMzFmMWNhLi5mMzdkMzlkIDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vcmFkZW9uL2V2ZXJncmVlbi5jCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9yYWRlb24vZXZlcmdyZWVuLmMKQEAgLTMwMDUsNyArMzAwNSw3IEBAIHN0YXRpYyB2b2lk IGV2ZXJncmVlbl9ncHVfaW5pdChzdHJ1Y3QgcmFkZW9uX2RldmljZSAqcmRldikKIAl1MzIgdmd0 X2NhY2hlX2ludmFsaWRhdGlvbjsKIAl1MzIgaGRwX2hvc3RfcGF0aF9jbnRsLCB0bXA7CiAJdTMy IGRpc2FibGVkX3JiX21hc2s7Ci0JaW50IGksIGosIG51bV9zaGFkZXJfZW5naW5lcywgcHNfdGhy ZWFkX2NvdW50OworCWludCBpLCBqLCBwc190aHJlYWRfY291bnQ7CiAKIAlzd2l0Y2ggKHJkZXYt PmZhbWlseSkgewogCWNhc2UgQ0hJUF9DWVBSRVNTOgpAQCAtMzMwMyw4ICszMzAzLDYgQEAgc3Rh dGljIHZvaWQgZXZlcmdyZWVuX2dwdV9pbml0KHN0cnVjdCByYWRlb25fZGV2aWNlICpyZGV2KQog CXJkZXYtPmNvbmZpZy5ldmVyZ3JlZW4udGlsZV9jb25maWcgfD0KIAkJKChnYl9hZGRyX2NvbmZp ZyAmIDB4MzAwMDAwMDApID4+IDI4KSA8PCAxMjsKIAotCW51bV9zaGFkZXJfZW5naW5lcyA9IChn Yl9hZGRyX2NvbmZpZyAmIE5VTV9TSEFERVJfRU5HSU5FUygzKSA+PiAxMikgKyAxOwotCiAJaWYg KChyZGV2LT5mYW1pbHkgPj0gQ0hJUF9DRURBUikgJiYgKHJkZXYtPmZhbWlseSA8PSBDSElQX0hF TUxPQ0spKSB7CiAJCXUzMiBlZnVzZV9zdHJhcHNfNDsKIAkJdTMyIGVmdXNlX3N0cmFwc18zOwpf X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwg bWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3Rz LmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo=