From patchwork Fri Dec 17 15:33:14 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 416221 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 oBHFXWtG015363 for ; Fri, 17 Dec 2010 15:33:52 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7FB439E9D3 for ; Fri, 17 Dec 2010 07:33:32 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-vw0-f49.google.com (mail-vw0-f49.google.com [209.85.212.49]) by gabe.freedesktop.org (Postfix) with ESMTP id 52E629E75F for ; Fri, 17 Dec 2010 07:33:23 -0800 (PST) Received: by vws5 with SMTP id 5so204936vws.36 for ; Fri, 17 Dec 2010 07:33:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer; bh=EQIs0Cx4egA4SeRBa3g6aH4ldaugMjeYkZevZ5vRrj0=; b=ZgBnLPt/RsMJcd0SKIwFRriTUV9cgY40ldhEX2vOSiye8o/ib/aADzh/afu7JkoIIx 3nAy/7GZzShjaa/0FXcN4d8GTNFyOU1p0+WDhfgJ+46csVLCn4eNLn1g4RDVs4tR+ejZ Q6NoZgH9zfw/yaTtOWTkCyGLV3F/tBJZdAsoo= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=onvLk3PHa1m9YJ1Ze7TjpWOP2OzN9736pbGeL1caalhw7kNR94bnkSlpgmLpQNSN44 0Zus+M9PNgp1sQYakR19rpgd/Kgv9GaNq9t0s43QFK5nbIMrZPAP1ZQ+5w4oGGnpq/Ag /vgBJjoi/c2u3tptgihH6veCjuWzcKGKweqGU= Received: by 10.229.233.84 with SMTP id jx20mr870814qcb.238.1292600002574; Fri, 17 Dec 2010 07:33:22 -0800 (PST) Received: from localhost.localdomain (static-74-96-105-7.washdc.fios.verizon.net [74.96.105.7]) by mx.google.com with ESMTPS id t17sm214321qcp.38.2010.12.17.07.33.21 (version=SSLv3 cipher=RC4-MD5); Fri, 17 Dec 2010 07:33:21 -0800 (PST) From: Alex Deucher To: airlied@gmail.com, dri-devel@lists.freedesktop.org Subject: [PATCH] drm/radeon/kms: only enable underscan by default if the monitor supports audio Date: Fri, 17 Dec 2010 10:33:14 -0500 Message-Id: <1292599994-12971-1-git-send-email-alexdeucher@gmail.com> X-Mailer: git-send-email 1.7.1.1 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.3 (demeter1.kernel.org [140.211.167.41]); Fri, 17 Dec 2010 15:33:52 +0000 (UTC) diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c index a26c1c3..3bca929 100644 --- a/drivers/gpu/drm/radeon/radeon_display.c +++ b/drivers/gpu/drm/radeon/radeon_display.c @@ -1307,7 +1307,7 @@ bool radeon_crtc_scaling_mode_fixup(struct drm_crtc *crtc, (!(mode->flags & DRM_MODE_FLAG_INTERLACE)) && ((radeon_encoder->underscan_type == UNDERSCAN_ON) || ((radeon_encoder->underscan_type == UNDERSCAN_AUTO) && - drm_detect_hdmi_monitor(radeon_connector->edid) && + drm_detect_monitor_audio(radeon_connector->edid) && is_hdtv_mode(mode)))) { if (radeon_encoder->underscan_hborder != 0) radeon_crtc->h_border = radeon_encoder->underscan_hborder;