From patchwork Fri Oct 5 14:25:29 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 1553311 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 3A4183FCFC for ; Fri, 5 Oct 2012 14:26:09 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 31D39A01D4 for ; Fri, 5 Oct 2012 07:26:09 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wi0-f171.google.com (mail-wi0-f171.google.com [209.85.212.171]) by gabe.freedesktop.org (Postfix) with ESMTP id 12CC6A0AF1 for ; Fri, 5 Oct 2012 07:25:29 -0700 (PDT) Received: by mail-wi0-f171.google.com with SMTP id hj13so604502wib.12 for ; Fri, 05 Oct 2012 07:25:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=ehCcAx8g8dwKL43pHLf/1NCOacn8TqXVCam3rwrZst8=; b=h01/x7TCDtD1CvpZUiv6Jg3TNeuxqgsKLVhoU+bOgRbyODcs1cpShTkg/SBvMQADzK R9sFRqzdVIPH+oXijugr/d2xsXOEA/bWylxYB8N5MZ6KZD8ZeqGaPNWumonHJ5Kw54+v eyEH8OcPJ7QwNOUVCoDxmU87FLVEvRlMlh3r/xWk2WZlXP+RDOSY2VZjd1yBftm9nskV GwfB1AsihYqpgl7OaZC+VBSuGcEX1T99JiBsKYhkolVaBXkUkLXL7Oz3igBXj6uvR2bQ 6AGaPgr65fLlrvLzaXyoc53QWp+SWEdtfR4qmer+SVmPoRe68fLEyXbfT/aAbZaarXas 7DWA== MIME-Version: 1.0 Received: by 10.216.218.73 with SMTP id j51mr960792wep.161.1349447129088; Fri, 05 Oct 2012 07:25:29 -0700 (PDT) Received: by 10.227.6.213 with HTTP; Fri, 5 Oct 2012 07:25:29 -0700 (PDT) In-Reply-To: <20121005141524.GA246@x4> References: <20121005123752.GA245@x4> <20121005133817.GA247@x4> <20121005141524.GA246@x4> Date: Fri, 5 Oct 2012 10:25:29 -0400 Message-ID: Subject: Re: Monitor sync out of range with current Linux git tree From: Alex Deucher To: Markus Trippelsdorf Cc: 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 On Fri, Oct 5, 2012 at 10:15 AM, Markus Trippelsdorf wrote: > On 2012.10.05 at 10:02 -0400, Alex Deucher wrote: >> On Fri, Oct 5, 2012 at 9:38 AM, Markus Trippelsdorf >> wrote: >> > On 2012.10.05 at 09:14 -0400, Alex Deucher wrote: >> >> On Fri, Oct 5, 2012 at 8:37 AM, Markus Trippelsdorf >> >> wrote: >> >> > When I cold start my machine I see the following error message on my >> >> > monitor: >> >> > >> >> > Out of Range >> >> > 48.2kHz / 44Hz >> >> > >> >> > I have to reboot on older kernel and kexec to the current one to get it >> >> > working again. >> >> >> >> I don't see anything amiss; can you bisect? >> > >> > Yes. It's your commit: >> > >> > commit 9dbbcfc6894957fdbb311ba92c85c026659878b5 >> > Author: Alex Deucher >> > Date: Wed Sep 12 17:39:57 2012 -0400 >> > >> > drm/radeon/dce3: use a single PPLL for all DP displays >> >> Can you apply the attached patch and send me the output? > > [drm] == start crtc 0 driving DVI-D-1 == > [drm] crtc 0 is not DP > [drm] plls in use 0x0 > [drm] crtc 0 using pll 0x1 > [drm] == end crtc 0 == Does the attached patch fix the issue? Alex From 22044ce8b98127eea9761f3dd86d70abe7dd0a09 Mon Sep 17 00:00:00 2001 From: Alex Deucher Date: Fri, 5 Oct 2012 10:22:02 -0400 Subject: [PATCH] drm/radeon: allocate PPLLs from low to high The order shouldn't matter, but there have been problems reported on certain older asics. This behaves more like the original code before the PPLL allocation rework. Signed-off-by: Alex Deucher --- drivers/gpu/drm/radeon/atombios_crtc.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/radeon/atombios_crtc.c b/drivers/gpu/drm/radeon/atombios_crtc.c index 96184d0..2e566e1 100644 --- a/drivers/gpu/drm/radeon/atombios_crtc.c +++ b/drivers/gpu/drm/radeon/atombios_crtc.c @@ -1690,10 +1690,10 @@ static int radeon_atom_pick_pll(struct drm_crtc *crtc) } /* all other cases */ pll_in_use = radeon_get_pll_use_mask(crtc); - if (!(pll_in_use & (1 << ATOM_PPLL2))) - return ATOM_PPLL2; if (!(pll_in_use & (1 << ATOM_PPLL1))) return ATOM_PPLL1; + if (!(pll_in_use & (1 << ATOM_PPLL2))) + return ATOM_PPLL2; DRM_ERROR("unable to allocate a PPLL\n"); return ATOM_PPLL_INVALID; } else { @@ -1715,10 +1715,10 @@ static int radeon_atom_pick_pll(struct drm_crtc *crtc) } /* all other cases */ pll_in_use = radeon_get_pll_use_mask(crtc); - if (!(pll_in_use & (1 << ATOM_PPLL2))) - return ATOM_PPLL2; if (!(pll_in_use & (1 << ATOM_PPLL1))) return ATOM_PPLL1; + if (!(pll_in_use & (1 << ATOM_PPLL2))) + return ATOM_PPLL2; DRM_ERROR("unable to allocate a PPLL\n"); return ATOM_PPLL_INVALID; } else { -- 1.7.7.5