From patchwork Wed Mar 2 15:21:05 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 603081 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 p22FLN86022861 for ; Wed, 2 Mar 2011 15:21:44 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D63D09E7D1 for ; Wed, 2 Mar 2011 07:21:22 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-vx0-f177.google.com (mail-vx0-f177.google.com [209.85.220.177]) by gabe.freedesktop.org (Postfix) with ESMTP id 595AE9E79D for ; Wed, 2 Mar 2011 07:21:15 -0800 (PST) Received: by vxd2 with SMTP id 2so32583vxd.36 for ; Wed, 02 Mar 2011 07:21:14 -0800 (PST) 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=luG37la5xCZR7ihY9auMoo3pC85lb40AEO07q95NGb8=; b=ptU+vgvw2JgN3QFy3Eod90GSZClWkrvSk4oRLDSVMavGyXdP8PcXW1kSOL+q+6qQzv txFNfwqfIDJDI0FQeKqZw3AS1F3QmALdzAczqMyw8e6yLFQKutS2EyImqG4Z9HiQuQVx DBRHLaw3+DeJNVefP9plER94yphwZOQiEU9Ok= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=nuTVgNi6GlbVLibMU5EUdowg8OxbpOlZrRxkBMpaoxDNxjjFlpu0bdhAuNdJzSpUqv a5z/a7UwOWEPIVEJ5dIp/Mw+ZceBA2V5AucASQvZj/8XUYhnLW9WgOgOEYQh4j9scf9m qYYef8YLXA9qJGBrmY84J3KeA+a+7393vRXMM= Received: by 10.52.67.105 with SMTP id m9mr842127vdt.30.1299079274203; Wed, 02 Mar 2011 07:21:14 -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 g2sm26712vbz.10.2011.03.02.07.21.12 (version=SSLv3 cipher=OTHER); Wed, 02 Mar 2011 07:21:13 -0800 (PST) From: Alex Deucher To: airlied@gmail.com, dri-devel@lists.freedesktop.org Subject: [PATCH] drm/radeon/kms: allow max clock of 340 Mhz on hdmi 1.3+ Date: Wed, 2 Mar 2011 10:21:05 -0500 Message-Id: <1299079265-13740-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.6 (demeter1.kernel.org [140.211.167.41]); Wed, 02 Mar 2011 15:21:44 +0000 (UTC) diff --git a/drivers/gpu/drm/radeon/radeon_connectors.c b/drivers/gpu/drm/radeon/radeon_connectors.c index 22b7e3d..3f3c9aa 100644 --- a/drivers/gpu/drm/radeon/radeon_connectors.c +++ b/drivers/gpu/drm/radeon/radeon_connectors.c @@ -972,7 +972,16 @@ static int radeon_dvi_mode_valid(struct drm_connector *connector, (radeon_connector->connector_object_id == CONNECTOR_OBJECT_ID_DUAL_LINK_DVI_D) || (radeon_connector->connector_object_id == CONNECTOR_OBJECT_ID_HDMI_TYPE_B)) return MODE_OK; - else + else if (radeon_connector->connector_object_id == CONNECTOR_OBJECT_ID_HDMI_TYPE_A) { + if (ASIC_IS_DCE3(rdev)) { + /* HDMI 1.3+ supports max clock of 340 Mhz */ + if (mode->clock > 340000) + return MODE_CLOCK_HIGH; + else + return MODE_OK; + } else + return MODE_CLOCK_HIGH; + } else return MODE_CLOCK_HIGH; } return MODE_OK;