From patchwork Tue Apr 2 21:27:41 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 2380431 Return-Path: X-Original-To: patchwork-intel-gfx@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 E24C7DF2A1 for ; Tue, 2 Apr 2013 21:27:58 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9B8E8E607D for ; Tue, 2 Apr 2013 14:27:58 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-ea0-f171.google.com (mail-ea0-f171.google.com [209.85.215.171]) by gabe.freedesktop.org (Postfix) with ESMTP id 90EF8E5CFB for ; Tue, 2 Apr 2013 14:27:50 -0700 (PDT) Received: by mail-ea0-f171.google.com with SMTP id b15so421137eae.30 for ; Tue, 02 Apr 2013 14:27:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=DNdVRuIj3KUjzAkeiRvBaPzZA8cvx9d99Cfys1Kh63s=; b=SkYXdoSXrsPJRhP+wdn/j5z4eCNAGvQbokX/6FbQL15OGbC0wx9/xp17bHndycxtsL 7S+/8GHyjSVakvHUPy2EWNUnY815kTa/KRxlPNlhZqLjtm3isBYc0pnnt53w6jSpfiz0 KDwC80UAc5JGNlyOU6/LS3ECZ9Hat1WAs5NX8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:x-gm-message-state; bh=DNdVRuIj3KUjzAkeiRvBaPzZA8cvx9d99Cfys1Kh63s=; b=jMdBFTnBxG6gW8hvfNB2yOa4Cp2W8Eu2YF2NyhumxAXUDt0mbmhAdImXKd2J5uQd8+ YfarBBbIUMJeFb9AdgRz3X8/fKMEqrNIxOFNiUyAimIb9NH3BvHr862C5XnGnQbUk0UJ GHyd6O76xdCgjf6WsdD3Cd9t8Ha0QBP89miu9ze3VYf+iAVww18KHv78MVC6kPYSLKJS CZuq1Mcf5RbKXpe9aQ8AjzPbgDlf7Asx1CCXMgJQFDtmqJ+4IbrAyv+ZapNMGzOiRylB NEjLjC5sVINlQEJ9d+5WaSVrXUxfbsFMMWn1Tk7PpKErH6wRW79AKdGx0Y+woY8+c5+c n2ww== X-Received: by 10.15.22.76 with SMTP id e52mr53628755eeu.7.1364938069688; Tue, 02 Apr 2013 14:27:49 -0700 (PDT) Received: from bremse.ffwll.local (178-83-130-250.dynamic.hispeed.ch. [178.83.130.250]) by mx.google.com with ESMTPS id s47sm5082439eeg.8.2013.04.02.14.27.47 (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 02 Apr 2013 14:27:48 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Date: Tue, 2 Apr 2013 23:27:41 +0200 Message-Id: <1364938061-32619-1-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <20130402135603.219da5d3@jbarnes-desktop> References: <20130402135603.219da5d3@jbarnes-desktop> X-Gm-Message-State: ALoCoQmozvcA+dJcaz3erIZJ1FF+zwCa5n3gITfjHtTnEbfEvniJ88eiyMntRIiyvSxQzhM2nFzr Cc: Daniel Vetter Subject: [Intel-gfx] [PATCH] drm/i915: remove leaky eDP functions X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org Jesse Barnes noticed in his review of my DP cleanup series that intel_edp_target_clock is now unused. Checking related code I've noticed that also intel_edp_link_config is long unused. Kill them both. Wrt leaky eDP functions used in the common crtc code, the only thing still left is intel_encoder_is_pch_edp. That one is just due to the massive confusion between eDP vs. DP and port A vs. port D. Crtc code should at most concern itself with the later, never with the former. But that's material for another patch series. Cc: Jesse Barnes Signed-off-by: Daniel Vetter Reviewed-by: Jesse Barnes --- drivers/gpu/drm/i915/intel_dp.c | 23 ----------------------- drivers/gpu/drm/i915/intel_drv.h | 3 --- 2 files changed, 26 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index 6bf144c..f90ce47 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c @@ -109,29 +109,6 @@ bool intel_encoder_is_pch_edp(struct drm_encoder *encoder) static void intel_dp_link_down(struct intel_dp *intel_dp); -void -intel_edp_link_config(struct intel_encoder *intel_encoder, - int *lane_num, int *link_bw) -{ - struct intel_dp *intel_dp = enc_to_intel_dp(&intel_encoder->base); - - *lane_num = intel_dp->lane_count; - *link_bw = drm_dp_bw_code_to_link_rate(intel_dp->link_bw); -} - -int -intel_edp_target_clock(struct intel_encoder *intel_encoder, - struct drm_display_mode *mode) -{ - struct intel_dp *intel_dp = enc_to_intel_dp(&intel_encoder->base); - struct intel_connector *intel_connector = intel_dp->attached_connector; - - if (intel_connector->panel.fixed_mode) - return intel_connector->panel.fixed_mode->clock; - else - return mode->clock; -} - static int intel_dp_max_link_bw(struct intel_dp *intel_dp) { diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index 094c940..2b31d7e 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h @@ -520,9 +520,6 @@ extern void ironlake_edp_panel_on(struct intel_dp *intel_dp); extern void ironlake_edp_panel_off(struct intel_dp *intel_dp); extern void ironlake_edp_panel_vdd_on(struct intel_dp *intel_dp); extern void ironlake_edp_panel_vdd_off(struct intel_dp *intel_dp, bool sync); -extern void intel_edp_link_config(struct intel_encoder *, int *, int *); -extern int intel_edp_target_clock(struct intel_encoder *, - struct drm_display_mode *mode); extern bool intel_encoder_is_pch_edp(struct drm_encoder *encoder); extern int intel_plane_init(struct drm_device *dev, enum pipe pipe); extern void intel_flush_display_plane(struct drm_i915_private *dev_priv,