From patchwork Tue Mar 22 05:46:12 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 651801 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 p2M5kWLd016056 for ; Tue, 22 Mar 2011 05:46:58 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 003239EB6B for ; Mon, 21 Mar 2011 22:46:31 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qy0-f170.google.com (mail-qy0-f170.google.com [209.85.216.170]) by gabe.freedesktop.org (Postfix) with ESMTP id 4C5A09E84E for ; Mon, 21 Mar 2011 22:46:23 -0700 (PDT) Received: by qyk32 with SMTP id 32so3161380qyk.15 for ; Mon, 21 Mar 2011 22:46:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:cc:subject:date:message-id:x-mailer; bh=g7xfwu10j4ARD2NgFPtQNjiT7jIs3uTTEU4VBNsbp5Q=; b=qJtZzv7DNV8N1LAKF+Rgx8RAprcioqKusM96IK9k9O9rmiw5xNV0KZUkp+faL/N8uV He3hHkt8cvj1qBHOWXc2Huw+6GEMEI16OsQDJWtZHQzx3/5J06GgnxeixVywXvUPOSAQ BS2sr4CnvNat2oGhtLBynwEM2sCvAI/vcqT+I= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=POTNRF9f0yUnqyKQoWdA2Fv/XzBsGpvdKvR388mp9fi+7F2RDBpsMa1PsdobfYtUnK B+xnpdGXdF2l5863yciEh+8xFmDsnHcunUFNkmq6URJDRCFs53gqzMQ3OhbjENlmWz1H iHr/E5L8k/pnyZQTprXAPK9R/0RP8Zz6P1WNU= Received: by 10.229.22.4 with SMTP id l4mr4168588qcb.298.1300772780609; Mon, 21 Mar 2011 22:46:20 -0700 (PDT) Received: from localhost.localdomain (static-74-96-105-7.washdc.fios.verizon.net [74.96.105.7]) by mx.google.com with ESMTPS id d21sm4877392qck.16.2011.03.21.22.46.19 (version=SSLv3 cipher=OTHER); Mon, 21 Mar 2011 22:46:19 -0700 (PDT) From: Alex Deucher To: airlied@gmail.com, dri-devel@lists.freedesktop.org Subject: [PATCH] drm/radeon/kms: prefer legacy pll algo for tv-out Date: Tue, 22 Mar 2011 01:46:12 -0400 Message-Id: <1300772772-22134-1-git-send-email-alexdeucher@gmail.com> X-Mailer: git-send-email 1.7.1.1 Cc: stable@kernel.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 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 X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Tue, 22 Mar 2011 05:46:58 +0000 (UTC) diff --git a/drivers/gpu/drm/radeon/atombios_crtc.c b/drivers/gpu/drm/radeon/atombios_crtc.c index 3cd3234..10e41af 100644 --- a/drivers/gpu/drm/radeon/atombios_crtc.c +++ b/drivers/gpu/drm/radeon/atombios_crtc.c @@ -957,7 +957,11 @@ static void atombios_crtc_set_pll(struct drm_crtc *crtc, struct drm_display_mode /* adjust pixel clock as needed */ adjusted_clock = atombios_adjust_pll(crtc, mode, pll, ss_enabled, &ss); - if (ASIC_IS_AVIVO(rdev)) + if (radeon_encoder->active_device & (ATOM_DEVICE_TV_SUPPORT)) + /* TV seems to prefer the legacy algo on some boards */ + radeon_compute_pll_legacy(pll, adjusted_clock, &pll_clock, &fb_div, &frac_fb_div, + &ref_div, &post_div); + else if (ASIC_IS_AVIVO(rdev)) radeon_compute_pll_avivo(pll, adjusted_clock, &pll_clock, &fb_div, &frac_fb_div, &ref_div, &post_div); else