From patchwork Wed Nov 4 22:10:00 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Machek X-Patchwork-Id: 7554411 Return-Path: X-Original-To: patchwork-linux-fbdev@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 5FC7DBEEA4 for ; Wed, 4 Nov 2015 22:11:16 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7539120684 for ; Wed, 4 Nov 2015 22:11:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7B84920414 for ; Wed, 4 Nov 2015 22:11:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1031275AbbKDWKH (ORCPT ); Wed, 4 Nov 2015 17:10:07 -0500 Received: from atrey.karlin.mff.cuni.cz ([195.113.26.193]:34079 "EHLO atrey.karlin.mff.cuni.cz" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1031261AbbKDWKE (ORCPT ); Wed, 4 Nov 2015 17:10:04 -0500 Received: by atrey.karlin.mff.cuni.cz (Postfix, from userid 512) id C17EF821DB; Wed, 4 Nov 2015 23:10:01 +0100 (CET) Date: Wed, 4 Nov 2015 23:10:00 +0100 From: Pavel Machek To: Christian =?iso-8859-1?Q?K=F6nig?= Cc: Alex Deucher , "Deucher, Alexander" , "linux-fbdev@vger.kernel.org" , Christian =?iso-8859-1?Q?K=F6nig?= , Maling list - DRI developers , kernel list Subject: Re: Mobility Radeon HD 4530/4570/545v: flicker in 1920x1080 Message-ID: <20151104221000.GA3608@amd> References: <20151031201344.GA30459@amd> <563522C5.1000206@amd.com> <20151031212259.GA6253@amd> <20151103220919.GA4824@amd> <20151103230329.GA4167@amd> <5639B580.1050409@vodafone.de> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <5639B580.1050409@vodafone.de> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-fbdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Hi! > >>>>index dac78ad..b86f06a 100644 > >>>>--- a/drivers/gpu/drm/radeon/atombios_crtc.c > >>>>+++ b/drivers/gpu/drm/radeon/atombios_crtc.c > >>>>@@ -569,6 +569,8 @@ static u32 atombios_adjust_pll(struct drm_crtc *crtc, > >>>> radeon_crtc->pll_flags = 0; > >>>> > >>>> if (ASIC_IS_AVIVO(rdev)) { > >>>>+ radeon_crtc->pll_flags |= RADEON_PLL_PREFER_MINM_OVER_MAXP; > >>>>+ > >>>> if ((rdev->family == CHIP_RS600) || > >>>> (rdev->family == CHIP_RS690) || > >>>> (rdev->family == CHIP_RS740)) > >>>> > >>>Help.. maybe... it is tricky to tell. It definitely does _not_ fix the > >>>issue completely. > >>You could also try the old pll algorithm: > >I reverted the patch above, and switched to the old algorithm. > > > >The flicker is still there. (But maybe its less horrible, like with > >RADEON_PLL_PREFER_MINM_OVER_MAXP). > > The flickering would vanish completely if that's the reason for the issue > you are seeing. > Try setting ref_div_min and ref_div_max to 2 in > radeon_compute_pll_avivo(). Ok, I did this, but no luck, still flickers. But the flicker only happens when something changes on screen, like dragging a big window. Is that consistent with wrong PLL timings? > But I'm not 100% convinced that this is actually a PLL problem, try to > compile the firmware it complains about into the kernel as well. Did that, too. Best regards, Pavel diff --git a/config.32 b/config.32 index 00e5dd2..4734158 100644 --- a/config.32 +++ b/config.32 @@ -1090,7 +1090,7 @@ CONFIG_DEVTMPFS_MOUNT=y CONFIG_PREVENT_FIRMWARE_BUILD=y CONFIG_FW_LOADER=y CONFIG_FIRMWARE_IN_KERNEL=y -CONFIG_EXTRA_FIRMWARE="radeon/R700_rlc.bin" +CONFIG_EXTRA_FIRMWARE="radeon/R700_rlc.bin radeon/RV710_smc.bin radeon/RV710_uvd.bin" CONFIG_EXTRA_FIRMWARE_DIR="/lib/firmware" # CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set CONFIG_ALLOW_DEV_COREDUMP=y diff --git a/drivers/gpu/drm/radeon/atombios_crtc.c b/drivers/gpu/drm/radeon/atombios_crtc.c index dac78ad..dcc4f4d 100644 --- a/drivers/gpu/drm/radeon/atombios_crtc.c +++ b/drivers/gpu/drm/radeon/atombios_crtc.c @@ -569,6 +569,8 @@ static u32 atombios_adjust_pll(struct drm_crtc *crtc, radeon_crtc->pll_flags = 0; if (ASIC_IS_AVIVO(rdev)) { + //radeon_crtc->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/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c index 6743174..bebaf4f 100644 --- a/drivers/gpu/drm/radeon/radeon_display.c +++ b/drivers/gpu/drm/radeon/radeon_display.c @@ -947,6 +947,7 @@ void radeon_compute_pll_avivo(struct radeon_pll *pll, fb_div_max = pll->max_feedback_div; if (pll->flags & RADEON_PLL_USE_FRAC_FB_DIV) { + printk("radeon: fractional divider\n"); fb_div_min *= 10; fb_div_max *= 10; } @@ -966,6 +967,9 @@ void radeon_compute_pll_avivo(struct radeon_pll *pll, else ref_div_max = pll->max_ref_div; + ref_div_min = 2; + ref_div_max = 2; + /* determine allowed post divider range */ if (pll->flags & RADEON_PLL_USE_POST_DIV) { post_div_min = pll->post_div; @@ -1020,6 +1024,8 @@ void radeon_compute_pll_avivo(struct radeon_pll *pll, diff = abs(target_clock - (pll->reference_freq * fb_div) / (ref_div * post_div)); + printk("post_div = %d, diff = %d\n", post_div, diff); + if (diff < diff_best || (diff == diff_best && !(pll->flags & RADEON_PLL_PREFER_MINM_OVER_MAXP))) { @@ -1028,6 +1034,7 @@ void radeon_compute_pll_avivo(struct radeon_pll *pll, } } post_div = post_div_best; + printk("Selected post_div = %d\n", post_div); /* get the feedback and reference divider for the optimal value */ avivo_get_fb_ref_div(nom, den, post_div, fb_div_max, ref_div_max, @@ -1062,7 +1069,7 @@ void radeon_compute_pll_avivo(struct radeon_pll *pll, *ref_div_p = ref_div; *post_div_p = post_div; - DRM_DEBUG_KMS("%d - %d, pll dividers - fb: %d.%d ref: %d, post %d\n", + printk("%d - %d, pll dividers - fb: %d.%d ref: %d, post %d\n", freq, *dot_clock_p * 10, *fb_div_p, *frac_fb_div_p, ref_div, post_div); }