From patchwork Fri Jan 25 18:10:09 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Staite X-Patchwork-Id: 2049671 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork1.kernel.org (Postfix) with ESMTP id 3FF543FDBC for ; Sat, 26 Jan 2013 13:47:41 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3CC0CE61F9 for ; Sat, 26 Jan 2013 05:47:41 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org X-Greylist: delayed 474 seconds by postgrey-1.32 at gabe; Fri, 25 Jan 2013 10:18:05 PST Received: from smtp.negativezero.co.uk (mail.negativezero.co.uk [94.102.149.130]) by gabe.freedesktop.org (Postfix) with ESMTP id A6679E6E02 for ; Fri, 25 Jan 2013 10:18:05 -0800 (PST) Received: from localhost (localhost.localdomain [127.0.0.1]) by smtp.negativezero.co.uk (Postfix) with ESMTP id 8ABD78EE44; Fri, 25 Jan 2013 18:10:08 +0000 (GMT) Authentication-Results: smtp.negativezero.co.uk; domainkeys=pass header.from=chris@yourdreamnet.co.uk DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yourdreamnet.co.uk; s=default; t=1359137408; bh=f7d6v5ySOPrnzq41/noaye5oWfgTIzPt1fSSaGyuG9A=; h=From:Subject:Date:Cc:To; b=zHbKAKKrcpHl0Zh8ZpOrISvjUhlyK+Qm0XaCHiqiIiM33M8DEOhTbNb03W2hLZ5mS YImIAz71qqxs1YhwFYKVPyDMVTfyiJXW8kxIuUlvq0uhD1fLRDN3fegx98w1EV2Et3 E2a60QbLhLOixtvEcQQSaFkDQkrokp/5lWdXAIvM= Authentication-Results: smtp.negativezero.co.uk (amavisd-new); domainkeys=pass header.from=chris@yourdreamnet.co.uk Authentication-Results: smtp.negativezero.co.uk (amavisd-new); dkim=pass header.i=@yourdreamnet.co.uk Received: from smtp.negativezero.co.uk ([127.0.0.1]) by localhost (smtp.negativezero.co.uk [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id EglEVaAQEtCe; Fri, 25 Jan 2013 18:10:08 +0000 (GMT) Received: from [192.168.1.109] (cpc8-soli5-2-0-cust51.perr.cable.virginmedia.com [195.188.224.52]) by smtp.negativezero.co.uk (Postfix) with ESMTPSA id E932B8EE3E; Fri, 25 Jan 2013 18:10:07 +0000 (GMT) DomainKey-Signature: a=rsa-sha1; s=default; d=yourdreamnet.co.uk; c=simple; q=dns; b=quVhBMsfAC9EqzSoGFv8YuH4uADynHktDvf+VYJQYXqXl/HFHThExckZ9YehMCCUo 7bFzSWisEmzqHMisC/ksPr8zYrb1HCpYX8yqusqo7487Os1qxiOrjBv3mXxHuztX5yl vtIi+W28cFfqohwZpHMBy2iu37DMK11k6rNzHd4= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yourdreamnet.co.uk; s=default; t=1359137408; bh=f7d6v5ySOPrnzq41/noaye5oWfgTIzPt1fSSaGyuG9A=; h=From:Subject:Date:Cc:To; b=zHbKAKKrcpHl0Zh8ZpOrISvjUhlyK+Qm0XaCHiqiIiM33M8DEOhTbNb03W2hLZ5mS YImIAz71qqxs1YhwFYKVPyDMVTfyiJXW8kxIuUlvq0uhD1fLRDN3fegx98w1EV2Et3 E2a60QbLhLOixtvEcQQSaFkDQkrokp/5lWdXAIvM= From: Chris Staite Subject: [PATCH] drm: fix to radeon driver for HD 6450 Date: Fri, 25 Jan 2013 18:10:09 +0000 Message-Id: To: David Airlie Mime-Version: 1.0 (Mac OS X Mail 6.2 \(1499\)) X-Mailer: Apple Mail (2.1499) X-Mailman-Approved-At: Sat, 26 Jan 2013 05:46:43 -0800 Cc: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Errors-To: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org From: Christopher Staite Fix commit 62444b7462a2b98bc78d68736c03a7c4e66ba7e2 for HD 6450. The stop and resume causes the screen to glitch and the X server to reboot constantly. Re-instating the UPDATE_LOCK fixes the issue in tests on the v3.6.11 stable, and the code has not been altered to fix this since. Signed-off-by: Christopher Staite --- drivers/gpu/drm/radeon/evergreen.c.org 2013-01-25 17:45:06.000000000 +0000 +++ drivers/gpu/drm/radeon/evergreen.c 2013-01-25 17:48:14.000000000 +0000 @@ -1320,7 +1320,9 @@ void evergreen_mc_stop(struct radeon_dev if (!(tmp & EVERGREEN_CRTC_DISP_READ_REQUEST_DISABLE)) { radeon_wait_for_vblank(rdev, i); tmp |= EVERGREEN_CRTC_DISP_READ_REQUEST_DISABLE; + WREG32(EVERGREEN_CRTC_UPDATE_LOCK + crtc_offsets[i], 1); WREG32(EVERGREEN_CRTC_CONTROL + crtc_offsets[i], tmp); + WREG32(EVERGREEN_CRTC_UPDATE_LOCK + crtc_offsets[i], 0); } } /* wait for the next frame */ @@ -1382,7 +1384,9 @@ void evergreen_mc_resume(struct radeon_d } else { tmp = RREG32(EVERGREEN_CRTC_CONTROL + crtc_offsets[i]); tmp &= ~EVERGREEN_CRTC_DISP_READ_REQUEST_DISABLE; + WREG32(EVERGREEN_CRTC_UPDATE_LOCK + crtc_offsets[i], 1); WREG32(EVERGREEN_CRTC_CONTROL + crtc_offsets[i], tmp); + WREG32(EVERGREEN_CRTC_UPDATE_LOCK + crtc_offsets[i], 0); } /* wait for the next frame */ frame_count = radeon_get_vblank_counter(rdev, i);