From patchwork Thu Jan 13 16:54:28 2011 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: 476161 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p0DGtA6M002719 for ; Thu, 13 Jan 2011 16:55:36 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id AF02E9E7F9 for ; Thu, 13 Jan 2011 08:55:09 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from lists.sourceforge.net (lists.sourceforge.net [216.34.181.88]) by gabe.freedesktop.org (Postfix) with ESMTP id 3E7CF9E92A; Thu, 13 Jan 2011 08:54:56 -0800 (PST) Received: from localhost ([127.0.0.1] helo=sfs-ml-1.v29.ch3.sourceforge.com) by sfs-ml-1.v29.ch3.sourceforge.com with esmtp (Exim 4.69) (envelope-from ) id 1PdQRa-0002uc-4F; Thu, 13 Jan 2011 16:54:38 +0000 Received: from sog-mx-3.v43.ch3.sourceforge.com ([172.29.43.193] helo=mx.sourceforge.net) by sfs-ml-1.v29.ch3.sourceforge.com with esmtp (Exim 4.69) (envelope-from ) id 1PdQRZ-0002uU-17 for dri-devel@lists.sourceforge.net; Thu, 13 Jan 2011 16:54:37 +0000 X-ACL-Warn: Received: from demeter2.kernel.org ([140.211.167.42]) by sog-mx-3.v43.ch3.sourceforge.com with esmtps (TLSv1:AES256-SHA:256) (Exim 4.72) id 1PdQRX-0008Uu-1c for dri-devel@lists.sourceforge.net; Thu, 13 Jan 2011 16:54:36 +0000 Received: from demeter2.kernel.org (localhost.localdomain [127.0.0.1]) by demeter2.kernel.org (8.14.4/8.14.3) with ESMTP id p0DGsSnh017302 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Thu, 13 Jan 2011 16:54:29 GMT Received: (from apache@localhost) by demeter2.kernel.org (8.14.4/8.14.4/Submit) id p0DGsSgq017301; Thu, 13 Jan 2011 16:54:28 GMT Date: Thu, 13 Jan 2011 16:54:28 GMT Message-Id: <201101131654.p0DGsSgq017301@demeter2.kernel.org> From: bugzilla-daemon@bugzilla.kernel.org To: dri-devel@lists.sourceforge.net Subject: [Bug 26552] Screen flickering with 2.6.37 [ATI X1600] 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.6 (demeter1.kernel.org [140.211.167.41]); Thu, 13 Jan 2011 16:55:42 +0000 (UTC) X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [127.0.0.1]); Thu, 13 Jan 2011 16:54:29 +0000 (UTC) X-Spam-Score: -0.0 (/) 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.0 AWL AWL: From: address is in the auto white-list X-Headers-End: 1PdQRX-0008Uu-1c X-BeenThere: dri-devel@lists.sourceforge.net X-Mailman-Version: 2.1.9 Precedence: list X-BeenThere: dri-devel@lists.freedesktop.org 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 diff --git a/drivers/gpu/drm/radeon/atombios_crtc.c b/drivers/gpu/drm/radeon/atombios_crtc.c index 46178f9..50b4ef4 100644 --- a/drivers/gpu/drm/radeon/atombios_crtc.c +++ b/drivers/gpu/drm/radeon/atombios_crtc.c @@ -521,6 +521,7 @@ static u32 atombios_adjust_pll(struct drm_crtc *crtc, pll->flags = 0; if (ASIC_IS_AVIVO(rdev)) { + pll->flags |= RADEON_PLL_PREFER_MINM_OVER_MAXP; if ((rdev->family == CHIP_RS600) || (rdev->family == CHIP_RS690) || (rdev->family == CHIP_RS740)) diff --git a/drivers/gpu/drm/radeon/atombios_crtc.c b/drivers/gpu/drm/radeon/atombios_crtc.c index 46178f9..24aa984 100644 --- a/drivers/gpu/drm/radeon/atombios_crtc.c +++ b/drivers/gpu/drm/radeon/atombios_crtc.c @@ -521,6 +521,8 @@ static u32 atombios_adjust_pll(struct drm_crtc *crtc, pll->flags = 0; if (ASIC_IS_AVIVO(rdev)) { + pll->flags |= (RADEON_PLL_PREFER_MINM_OVER_MAXP | + RADEON_PLL_USE_FRAC_FB_DIV); if ((rdev->family == CHIP_RS600) || (rdev->family == CHIP_RS690) || (rdev->family == CHIP_RS740)) diff --git a/drivers/gpu/drm/radeon/atombios_crtc.c b/drivers/gpu/drm/radeon/atombios_crtc.c index 46178f9..fa8b96a 100644 --- a/drivers/gpu/drm/radeon/atombios_crtc.c +++ b/drivers/gpu/drm/radeon/atombios_crtc.c @@ -521,6 +521,7 @@ static u32 atombios_adjust_pll(struct drm_crtc *crtc, pll->flags = 0; if (ASIC_IS_AVIVO(rdev)) { + pll->flags |= RADEON_PLL_USE_FRAC_FB_DIV; if ((rdev->family == CHIP_RS600) || (rdev->family == CHIP_RS690) || (rdev->family == CHIP_RS740))