From patchwork Tue Jan 8 23:41:01 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Glisse X-Patchwork-Id: 1949071 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 EA737DF23A for ; Tue, 8 Jan 2013 23:44:28 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D2AD5E62AD for ; Tue, 8 Jan 2013 15:44:28 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qa0-f50.google.com (mail-qa0-f50.google.com [209.85.216.50]) by gabe.freedesktop.org (Postfix) with ESMTP id 543E5E5C70 for ; Tue, 8 Jan 2013 15:44:16 -0800 (PST) Received: by mail-qa0-f50.google.com with SMTP id cr7so229237qab.9 for ; Tue, 08 Jan 2013 15:44:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer; bh=zhD7IvhJdCy295+O5vj1BZGH9gnfcN7ehNgyWr0boZQ=; b=FG1Ru1wDbrTNw2eCEthp6RUxbcLU2gkqdRIPrSjpM9Zj2gwJs4CcIxSF1ng5S1tcRf NinnTyxwh4d+KaY+XWEGZ/+3BtUwbydmvSLjopwfLlfMmk6qxNDttdBVi2nYj6HAulRF N+NqR28AWn6LuFyQohv+BJj3a2utRIVb14GIkfwR8y9DTpZxUHgUV9owjcLb2QQKF9aM V8ytfC2BNlzd+rb8gLEAinOfRin3NuBNdFdoaexA93INdw87+H1AgkD3Hq4KncKno1BZ g9fKwXmX3P470RyNLYx63bOMSfg+Lj2eAJXbQ8XXWiy9a+8OYBzTVhTl+xXTLbAkF4RU RYiQ== X-Received: by 10.49.73.232 with SMTP id o8mr57587131qev.0.1357688655603; Tue, 08 Jan 2013 15:44:15 -0800 (PST) Received: from localhost.boston.devel.redhat.com ([66.187.233.206]) by mx.google.com with ESMTPS id x4sm17872245qeu.7.2013.01.08.15.44.14 (version=SSLv3 cipher=OTHER); Tue, 08 Jan 2013 15:44:15 -0800 (PST) From: j.glisse@gmail.com To: dri-devel@lists.freedesktop.org Subject: [PATCH] radeon/kms: force rn50 chip to always report connected on analog output Date: Tue, 8 Jan 2013 18:41:01 -0500 Message-Id: <1357688461-5261-1-git-send-email-j.glisse@gmail.com> X-Mailer: git-send-email 1.7.11.7 Cc: Jerome Glisse 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: Jerome Glisse Those rn50 chip are often connected to console remoting hw and load detection often fails with those. Just don't try to load detect and report connect. Signed-off-by: Jerome Glisse --- drivers/gpu/drm/radeon/radeon_legacy_encoders.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/gpu/drm/radeon/radeon_legacy_encoders.c b/drivers/gpu/drm/radeon/radeon_legacy_encoders.c index f5ba224..62cd512 100644 --- a/drivers/gpu/drm/radeon/radeon_legacy_encoders.c +++ b/drivers/gpu/drm/radeon/radeon_legacy_encoders.c @@ -640,6 +640,14 @@ static enum drm_connector_status radeon_legacy_primary_dac_detect(struct drm_enc enum drm_connector_status found = connector_status_disconnected; bool color = true; + /* just don't bother on RN50 those chip are often connected to remoting + * console hw and often we get failure to load detect those. So to make + * everyone happy report the encoder as always connected. + */ + if (ASIC_IS_RN50(rdev)) { + return connector_status_connected; + } + /* save the regs we need */ vclk_ecp_cntl = RREG32_PLL(RADEON_VCLK_ECP_CNTL); crtc_ext_cntl = RREG32(RADEON_CRTC_EXT_CNTL);