From patchwork Mon Aug 23 14:22:37 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: bugzilla-daemon@bugzilla.kernel.org X-Patchwork-Id: 124171 Received: from lists.sourceforge.net (lists.sourceforge.net [216.34.181.88]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o7NENQxR029592 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Mon, 23 Aug 2010 14:24:01 GMT Received: from localhost ([127.0.0.1] helo=sfs-ml-4.v29.ch3.sourceforge.com) by sfs-ml-4.v29.ch3.sourceforge.com with esmtp (Exim 4.69) (envelope-from ) id 1OnXvI-0004lm-0M; Mon, 23 Aug 2010 14:22:52 +0000 Received: from sog-mx-3.v43.ch3.sourceforge.com ([172.29.43.193] helo=mx.sourceforge.net) by sfs-ml-4.v29.ch3.sourceforge.com with esmtp (Exim 4.69) (envelope-from ) id 1OnXvF-0004ld-TK for dri-devel@lists.sourceforge.net; Mon, 23 Aug 2010 14:22:49 +0000 X-ACL-Warn: Received: from demeter.kernel.org ([140.211.167.39]) by sog-mx-3.v43.ch3.sourceforge.com with esmtps (TLSv1:AES256-SHA:256) (Exim 4.69) id 1OnXvA-0001ji-1m for dri-devel@lists.sourceforge.net; Mon, 23 Aug 2010 14:22:49 +0000 Received: from demeter1.kernel.org (localhost.localdomain [127.0.0.1]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o7NEMbKF029428 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Mon, 23 Aug 2010 14:22:37 GMT Received: (from apache@localhost) by demeter1.kernel.org (8.14.4/8.14.3/Submit) id o7NEMbYL029427; Mon, 23 Aug 2010 14:22:37 GMT Date: Mon, 23 Aug 2010 14:22:37 GMT Message-Id: <201008231422.o7NEMbYL029427@demeter1.kernel.org> From: bugzilla-daemon@bugzilla.kernel.org To: dri-devel@lists.sourceforge.net Subject: [Bug 16376] random - possibly Radeon DRM KMS related - freezes X-Bugzilla-Reason: None X-Bugzilla-Type: newchanged X-Bugzilla-Watch-Reason: AssignedTo drivers_video-dri@kernel-bugs.osdl.org X-Bugzilla-Product: Drivers X-Bugzilla-Component: Video(DRI - non Intel) X-Bugzilla-Keywords: X-Bugzilla-Severity: normal X-Bugzilla-Who: alexdeucher@gmail.com X-Bugzilla-Status: NEW X-Bugzilla-Priority: P1 X-Bugzilla-Assigned-To: drivers_video-dri@kernel-bugs.osdl.org X-Bugzilla-Target-Milestone: --- X-Bugzilla-Changed-Fields: In-Reply-To: References: Auto-Submitted: auto-generated MIME-Version: 1.0 X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Mon, 23 Aug 2010 14:24:06 +0000 (UTC) X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [127.0.0.1]); Mon, 23 Aug 2010 14:22:37 +0000 (UTC) X-Spam-Score: 0.2 (/) X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. -0.0 T_RP_MATCHES_RCVD Envelope sender domain matches handover relay domain 0.2 AWL AWL: From: address is in the auto white-list X-Headers-End: 1OnXvA-0001ji-1m X-BeenThere: dri-devel@lists.sourceforge.net X-Mailman-Version: 2.1.9 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.sourceforge.net diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c index c0c5cef..7d9cc47 100644 --- a/drivers/gpu/drm/radeon/r100.c +++ b/drivers/gpu/drm/radeon/r100.c @@ -1996,6 +1996,8 @@ bool r100_gpu_is_lockup(struct radeon_device *rdev) u32 rbbm_status; int r; + return false; + rbbm_status = RREG32(R_000E40_RBBM_STATUS); if (!G_000E40_GUI_ACTIVE(rbbm_status)) { r100_gpu_lockup_update(&rdev->config.r100.lockup, &rdev->cp); diff --git a/drivers/gpu/drm/radeon/r300.c b/drivers/gpu/drm/radeon/r300.c index 3ba05d0..176f791 100644 --- a/drivers/gpu/drm/radeon/r300.c +++ b/drivers/gpu/drm/radeon/r300.c @@ -384,6 +384,8 @@ bool r300_gpu_is_lockup(struct radeon_device *rdev) u32 rbbm_status; int r; + return false; + rbbm_status = RREG32(R_000E40_RBBM_STATUS); if (!G_000E40_GUI_ACTIVE(rbbm_status)) { r100_gpu_lockup_update(&rdev->config.r300.lockup, &rdev->cp); diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c index 667c237..bba86d5 100644 --- a/drivers/gpu/drm/radeon/r600.c +++ b/drivers/gpu/drm/radeon/r600.c @@ -1345,6 +1345,8 @@ bool r600_gpu_is_lockup(struct radeon_device *rdev) u32 grbm_status2; int r; + return false; + srbm_status = RREG32(R_000E50_SRBM_STATUS); grbm_status = RREG32(R_008010_GRBM_STATUS); grbm_status2 = RREG32(R_008014_GRBM_STATUS2);