From patchwork Fri Mar 21 14:34:08 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 3874751 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.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 8F8139F382 for ; Fri, 21 Mar 2014 14:34:22 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B028A2028D for ; Fri, 21 Mar 2014 14:34:21 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id ADC972026C for ; Fri, 21 Mar 2014 14:34:20 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D3AD16E372; Fri, 21 Mar 2014 07:34:19 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qc0-f177.google.com (mail-qc0-f177.google.com [209.85.216.177]) by gabe.freedesktop.org (Postfix) with ESMTP id C2FB16E372 for ; Fri, 21 Mar 2014 07:34:17 -0700 (PDT) Received: by mail-qc0-f177.google.com with SMTP id w7so2771822qcr.8 for ; Fri, 21 Mar 2014 07:34:16 -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=bVuGMTHLdisveCWF8z0ElqLDGbGtMmrq7QjoHEcvQ/Y=; b=ssqcv9ZkYlihG+6und/BEKAJB3BcZP//K5oTVuNsZ65rw2nXBjPXf4a5F/Z3xtQ8mh s+Je6kgtZpNaCS4rheCSbsgRRgzd1BiEWz8D2ZILVmvgCbuuvjjJhCRhkM6sJOl3LduP 2LrZm48nLK2/hMey0RYkLwGmx8e81Utb14OEJGHRf7QutuiSYbCxJphgKCusVqy6TGhS fF3bUgDQQfyJBXQs2Llk8HBowZjF0uJt34akyLrBpmr4poIkYg7EOmFONFF4IXsNzQWb X6ltAuKZjJsL53jB27bmc1O9+GYJLNQCaDNu3BwM9WrZDvkbBD7Yx7+9p60NpAMjR/61 wMIQ== X-Received: by 10.140.101.74 with SMTP id t68mr2412959qge.106.1395412456301; Fri, 21 Mar 2014 07:34:16 -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 f48sm2768212qge.5.2014.03.21.07.34.15 for (version=TLSv1.2 cipher=AES128-GCM-SHA256 bits=128/128); Fri, 21 Mar 2014 07:34:16 -0700 (PDT) From: Alex Deucher To: dri-devel@lists.freedesktop.org, christian.koenig@amd.com Subject: [PATCH 3/3] drm/radeon: use drm_dp_dpcd_read_link_status() Date: Fri, 21 Mar 2014 10:34:08 -0400 Message-Id: <1395412448-28048-3-git-send-email-alexander.deucher@amd.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1395412448-28048-1-git-send-email-alexander.deucher@amd.com> References: <1395412448-28048-1-git-send-email-alexander.deucher@amd.com> Cc: Alex Deucher X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.15 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 Replace the radeon specific version with the generic version. Signed-off-by: Alex Deucher --- drivers/gpu/drm/radeon/atombios_dp.c | 30 +++++------------------------- 1 file changed, 5 insertions(+), 25 deletions(-) diff --git a/drivers/gpu/drm/radeon/atombios_dp.c b/drivers/gpu/drm/radeon/atombios_dp.c index 8d8f846..8b0ab17 100644 --- a/drivers/gpu/drm/radeon/atombios_dp.c +++ b/drivers/gpu/drm/radeon/atombios_dp.c @@ -549,32 +549,12 @@ int radeon_dp_mode_valid_helper(struct drm_connector *connector, return MODE_OK; } -static bool radeon_dp_get_link_status(struct radeon_connector *radeon_connector, - u8 link_status[DP_LINK_STATUS_SIZE]) -{ - struct radeon_connector_atom_dig *dig_connector; - int ret; - - if (!radeon_connector->con_priv) - return false; - dig_connector = radeon_connector->con_priv; - - ret = drm_dp_dpcd_read(&dig_connector->dp_i2c_bus->aux, DP_LANE0_1_STATUS, - link_status, DP_LINK_STATUS_SIZE); - if (ret <= 0) { - return false; - } - - DRM_DEBUG_KMS("link status %6ph\n", link_status); - return true; -} - bool radeon_dp_needs_link_train(struct radeon_connector *radeon_connector) { u8 link_status[DP_LINK_STATUS_SIZE]; struct radeon_connector_atom_dig *dig = radeon_connector->con_priv; - if (!radeon_dp_get_link_status(radeon_connector, link_status)) + if (drm_dp_dpcd_read_link_status(&dig->dp_i2c_bus->aux, link_status) <= 0) return false; if (drm_dp_channel_eq_ok(link_status, dig->dp_lane_count)) return false; @@ -605,7 +585,6 @@ struct radeon_dp_link_train_info { struct radeon_device *rdev; struct drm_encoder *encoder; struct drm_connector *connector; - struct radeon_connector *radeon_connector; int enc_id; int dp_clock; int dp_lane_count; @@ -752,7 +731,8 @@ static int radeon_dp_link_train_cr(struct radeon_dp_link_train_info *dp_info) while (1) { drm_dp_link_train_clock_recovery_delay(dp_info->dpcd); - if (!radeon_dp_get_link_status(dp_info->radeon_connector, dp_info->link_status)) { + if (drm_dp_dpcd_read_link_status(dp_info->aux, + dp_info->link_status) <= 0) { DRM_ERROR("displayport link status failed\n"); break; } @@ -814,7 +794,8 @@ static int radeon_dp_link_train_ce(struct radeon_dp_link_train_info *dp_info) while (1) { drm_dp_link_train_channel_eq_delay(dp_info->dpcd); - if (!radeon_dp_get_link_status(dp_info->radeon_connector, dp_info->link_status)) { + if (drm_dp_dpcd_read_link_status(dp_info->aux, + dp_info->link_status) <= 0) { DRM_ERROR("displayport link status failed\n"); break; } @@ -907,7 +888,6 @@ void radeon_dp_link_train(struct drm_encoder *encoder, dp_info.rdev = rdev; dp_info.encoder = encoder; dp_info.connector = connector; - dp_info.radeon_connector = radeon_connector; dp_info.dp_lane_count = dig_connector->dp_lane_count; dp_info.dp_clock = dig_connector->dp_clock; dp_info.aux = &dig_connector->dp_i2c_bus->aux;