From patchwork Tue Apr 21 18:02:16 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 6252471 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 100E09F1C4 for ; Tue, 21 Apr 2015 18:02:28 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4AA5F20295 for ; Tue, 21 Apr 2015 18:02:27 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 3C8F22026C for ; Tue, 21 Apr 2015 18:02:26 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5BB876E1B1; Tue, 21 Apr 2015 11:02:24 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-vn0-f45.google.com (mail-vn0-f45.google.com [209.85.216.45]) by gabe.freedesktop.org (Postfix) with ESMTP id 1BB516E1B1 for ; Tue, 21 Apr 2015 11:02:23 -0700 (PDT) Received: by vnbf1 with SMTP id f1so33565999vnb.5 for ; Tue, 21 Apr 2015 11:02:22 -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; bh=P3Ezq+OKkMeqt4Z6gCEMtThMamjns5+MXmwezrBOPOQ=; b=I6eGkQAlXJ78/gq3YLy8YxH/R3zeOl1vXkq9smD15ftbC5s7DasjKSmhk793VNovF7 JlG5M3OwDzWJEy9If9wSNYMZ9eH7eIsR+nnvbUCng74HNgq52q3IVWI1mjgAOsgVEOYa C0l8PxkPobzDYmOQzIjF8MiZZeo3b6/Wib3iDAxuFvvtKExKDAkM0sCf/p2qfsIzqHTs lwkQsHkiUbSxPCFblOt6WNfk/Yk2IFkUGlA6zWIt2biYIHl9UNCzKeFARPRfqYwPJQuk it4Q+si5mla/WWFBsvlDCfhFv8LbrL+ZtFoSV8+PsxdgqiHCPvPnNMg2SX/f/N1CLg6C cS3A== X-Received: by 10.52.10.202 with SMTP id k10mr23237058vdb.44.1429639342401; Tue, 21 Apr 2015 11:02:22 -0700 (PDT) Received: from localhost.localdomain (static-74-96-105-49.washdc.fios.verizon.net. [74.96.105.49]) by mx.google.com with ESMTPSA id at6sm596500vdc.7.2015.04.21.11.02.21 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 21 Apr 2015 11:02:21 -0700 (PDT) From: Alex Deucher X-Google-Original-From: Alex Deucher To: dri-devel@lists.freedesktop.org Subject: [PATCH] drm/radeon: adjust pll when audio is not enabled Date: Tue, 21 Apr 2015 14:02:16 -0400 Message-Id: <1429639336-5665-1-git-send-email-alexander.deucher@amd.com> X-Mailer: git-send-email 1.8.3.1 Cc: Alex Deucher , stable@vger.kernel.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, 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 Fixes display problems with some monitors when audio is not enabled. Bugs: https://bugs.freedesktop.org/show_bug.cgi?id=89505 https://bugzilla.kernel.org/show_bug.cgi?id=94171 Plus several reports on IRC. Signed-off-by: Alex Deucher Cc: stable@vger.kernel.org --- drivers/gpu/drm/radeon/atombios_crtc.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/gpu/drm/radeon/atombios_crtc.c b/drivers/gpu/drm/radeon/atombios_crtc.c index dac78ad..42b2ea3 100644 --- a/drivers/gpu/drm/radeon/atombios_crtc.c +++ b/drivers/gpu/drm/radeon/atombios_crtc.c @@ -580,6 +580,9 @@ static u32 atombios_adjust_pll(struct drm_crtc *crtc, else radeon_crtc->pll_flags |= RADEON_PLL_PREFER_LOW_REF_DIV; + /* if there is no audio, set MINM_OVER_MAXP */ + if (!drm_detect_monitor_audio(radeon_connector_edid(connector))) + radeon_crtc->pll_flags |= RADEON_PLL_PREFER_MINM_OVER_MAXP; if (rdev->family < CHIP_RV770) radeon_crtc->pll_flags |= RADEON_PLL_PREFER_MINM_OVER_MAXP; /* use frac fb div on APUs */