From patchwork Tue May 19 16:08:37 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 6439321 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 06CB59F399 for ; Tue, 19 May 2015 16:08:57 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6A3E2203E5 for ; Tue, 19 May 2015 16:08:53 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 3AC4D203FB for ; Tue, 19 May 2015 16:08:51 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 74C116E690; Tue, 19 May 2015 09:08:50 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-vn0-f50.google.com (mail-vn0-f50.google.com [209.85.216.50]) by gabe.freedesktop.org (Postfix) with ESMTP id C5DBB6E68F for ; Tue, 19 May 2015 09:08:46 -0700 (PDT) Received: by vnbg7 with SMTP id g7so1458033vnb.12 for ; Tue, 19 May 2015 09:08:46 -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:in-reply-to:references; bh=l40x8b3Ckj66Qz6bqsKtUrc16D9VLdrgS+oNYEeZTBE=; b=BWbcviWF8Ym+SsMFCfJyZqiW3aCOZFXAwU2FSV39uKThHih6+wmdJ/TJXyc7022AoY QDkSz+crdZge7McZLlALW3nfilkPqiaN7sD+ufj0KcsqtUAU2t7guCLX8f7+rnhPbUla 2QS0EqnZha1Vu65gr9cktQ1IewIpZlIw4eP2ktJBd7vTus/z59ZzndPc6R+tjB/r7fsA dbBD6CZL9Jd2vCYXoA9nTisZXX1NZ/H7DiP5wFTRUjuE+MwozpRwgqHg+5HQ0cj+Jr6c xPt7JJsfWt5dVBUe698eTa+q0TWsPDOftqJqXHby5JCwQYGkz5CRA1RB6n8ohfEfondA rAYQ== X-Received: by 10.52.3.166 with SMTP id d6mr28520984vdd.69.1432051726370; Tue, 19 May 2015 09:08:46 -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 jk10sm3103687vdb.13.2015.05.19.09.08.45 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 19 May 2015 09:08:45 -0700 (PDT) From: Alex Deucher X-Google-Original-From: Alex Deucher To: dri-devel@lists.freedesktop.org Subject: [PATCH] drm/radeon: properly select encoder in radeon_audio_detect (v2) Date: Tue, 19 May 2015 12:08:37 -0400 Message-Id: <1432051717-2487-2-git-send-email-alexander.deucher@amd.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1432051717-2487-1-git-send-email-alexander.deucher@amd.com> References: <1432051717-2487-1-git-send-email-alexander.deucher@amd.com> 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 Need to handle DVI where we way end up with an analog encoder in some cases. v2: rework checks. always set use_digital for DVI-D, HDMI-A Reported-by: Julian Margetson Signed-off-by: Alex Deucher Cc: stable@vger.kernel.org --- drivers/gpu/drm/radeon/radeon_audio.c | 20 +++++++++++--------- drivers/gpu/drm/radeon/radeon_connectors.c | 6 ++++-- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/drivers/gpu/drm/radeon/radeon_audio.c b/drivers/gpu/drm/radeon/radeon_audio.c index dcb7796..ace2b4b 100644 --- a/drivers/gpu/drm/radeon/radeon_audio.c +++ b/drivers/gpu/drm/radeon/radeon_audio.c @@ -453,22 +453,24 @@ void radeon_audio_enable(struct radeon_device *rdev, void radeon_audio_detect(struct drm_connector *connector, enum drm_connector_status status) { - struct radeon_device *rdev; - struct radeon_encoder *radeon_encoder; + struct drm_device *dev = connector->dev; + struct radeon_device *rdev = dev->dev_private; struct radeon_encoder_atom_dig *dig; + const struct drm_connector_helper_funcs *connector_funcs = + connector->helper_private; + struct drm_encoder *encoder = connector_funcs->best_encoder(connector); + struct radeon_encoder *radeon_encoder; - if (!connector || !connector->encoder) + if (!radeon_audio_chipset_supported(rdev)) return; - if (!radeon_encoder_is_digital(connector->encoder)) + if (!encoder) return; - rdev = connector->encoder->dev->dev_private; - - if (!radeon_audio_chipset_supported(rdev)) + if (!radeon_encoder_is_digital(encoder)) return; - radeon_encoder = to_radeon_encoder(connector->encoder); + radeon_encoder = to_radeon_encoder(encoder); dig = radeon_encoder->enc_priv; if (!dig->afmt) @@ -484,7 +486,7 @@ void radeon_audio_detect(struct drm_connector *connector, else radeon_encoder->audio = rdev->audio.hdmi_funcs; - dig->afmt->pin = radeon_audio_get_pin(connector->encoder); + dig->afmt->pin = radeon_audio_get_pin(encoder); if (drm_detect_monitor_audio(radeon_connector_edid(connector))) { radeon_audio_enable(rdev, dig->afmt->pin, 0xf); } else { diff --git a/drivers/gpu/drm/radeon/radeon_connectors.c b/drivers/gpu/drm/radeon/radeon_connectors.c index d17d251..8052759 100644 --- a/drivers/gpu/drm/radeon/radeon_connectors.c +++ b/drivers/gpu/drm/radeon/radeon_connectors.c @@ -1303,8 +1303,10 @@ radeon_dvi_detect(struct drm_connector *connector, bool force) /* DVI-D and HDMI-A are digital only */ if ((connector->connector_type == DRM_MODE_CONNECTOR_DVID) || - (connector->connector_type == DRM_MODE_CONNECTOR_HDMIA)) + (connector->connector_type == DRM_MODE_CONNECTOR_HDMIA)) { + radeon_connector->use_digital = true; goto out; + } /* if we aren't forcing don't do destructive polling */ if (!force) { @@ -1379,7 +1381,7 @@ out: /* updated in get modes as well since we need to know if it's analog or digital */ radeon_connector_update_scratch_regs(connector, ret); - if (radeon_audio != 0) { + if ((radeon_audio != 0) && (radeon_connector->use_digital)) { radeon_connector_get_edid(connector); radeon_audio_detect(connector, ret); }