From patchwork Mon Aug 6 21:09:22 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 1281161 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork2.kernel.org (Postfix) with ESMTP id CDD4BDF288 for ; Mon, 6 Aug 2012 21:09:40 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 163FFA090E for ; Mon, 6 Aug 2012 14:09:40 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qc0-f177.google.com (mail-qc0-f177.google.com [209.85.216.177]) by gabe.freedesktop.org (Postfix) with ESMTP id 25F9D9E997 for ; Mon, 6 Aug 2012 14:09:30 -0700 (PDT) Received: by qcsu28 with SMTP id u28so2072958qcs.36 for ; Mon, 06 Aug 2012 14:09:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=oFhOCqrz6L4YsZSeVv4ELNnkTWN48kXweBD2s08GYlI=; b=ygbdWERpxS7/Xn59SQ41CrXGA+gCumHppSR8RDwX81diHa2+ku3pdMSjK4Y3se67jo 52ih89M5RsLPv3SFLrdKRK6mF4DVk2TWA91oQqF/nRL7np4fm7jUmMc3Klk2++vsWSkP uKqsRbNLN2jWhinQFpxBOuhVKMhXH3kF5l/qtK9iV3j4iAbEU427iLFUTstHs3NJbh/n Y8U0qDxpGYb6moSxPKDnjyBt2pxxZnRM0V0old+r+6QDK+/8/ejK5uvfgEPim72zYIvn CeLGD8a8zva0pAWrhz/0pA5FkVBp6HIKQzfQJ9V8HtGK+L/fSgPzFxM6nOUsaO4pTvpL ZHjw== Received: by 10.224.1.72 with SMTP id 8mr12350565qae.76.1344287369470; Mon, 06 Aug 2012 14:09:29 -0700 (PDT) Received: from localhost.localdomain (static-74-96-105-49.washdc.fios.verizon.net. [74.96.105.49]) by mx.google.com with ESMTPS id ej6sm14872983qab.0.2012.08.06.14.09.28 (version=SSLv3 cipher=OTHER); Mon, 06 Aug 2012 14:09:28 -0700 (PDT) From: alexdeucher@gmail.com To: airlied@gmail.com, dri-devel@lists.freedesktop.org Subject: [PATCH] drm/radeon: fix ordering in pll picking on dce4+ Date: Mon, 6 Aug 2012 17:09:22 -0400 Message-Id: <1344287362-6698-1-git-send-email-alexdeucher@gmail.com> X-Mailer: git-send-email 1.7.7.5 Cc: Alex Deucher 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: , 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 From: Alex Deucher No functional change, but re-order the cases so they evaluate properly due to the way the DCE macros work. Noticed by kallisti5 on IRC. 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 dc279eb..c6fcb5b 100644 --- a/drivers/gpu/drm/radeon/atombios_crtc.c +++ b/drivers/gpu/drm/radeon/atombios_crtc.c @@ -1531,12 +1531,12 @@ static int radeon_atom_pick_pll(struct drm_crtc *crtc) * crtc virtual pixel clock. */ if (ENCODER_MODE_IS_DP(atombios_get_encoder_mode(test_encoder))) { - if (ASIC_IS_DCE5(rdev)) - return ATOM_DCPLL; + if (rdev->clock.dp_extclk) + return ATOM_PPLL_INVALID; else if (ASIC_IS_DCE6(rdev)) return ATOM_PPLL0; - else if (rdev->clock.dp_extclk) - return ATOM_PPLL_INVALID; + else if (ASIC_IS_DCE5(rdev)) + return ATOM_DCPLL; } } }