From patchwork Sun Aug 12 19:20:10 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 1310131 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 99257DF280 for ; Sun, 12 Aug 2012 20:27:46 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 950F09F64E for ; Sun, 12 Aug 2012 13:27:46 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-we0-f177.google.com (mail-we0-f177.google.com [74.125.82.177]) by gabe.freedesktop.org (Postfix) with ESMTP id 677A79E97B for ; Sun, 12 Aug 2012 13:26:55 -0700 (PDT) Received: by weyr3 with SMTP id r3so2263974wey.36 for ; Sun, 12 Aug 2012 13:26:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=cJIWu3ZwnFazRokXrm15y9j/DeT7WVUM0MvtFRoJo6Y=; b=LucuoYV2hFueNB5bVouKMcotZ4QD7PHyPZFzuN+WD+iDGag2+DtFgV7dd2J81yTB0J w7c29B/dqC056LjucgARfYOGQe3VFOUlOZWd3qqrOstE00mxChpLJogws2Hxfv1CTT49 aUDs8YMl3X41TvBrCgr2q5LRXF+u8b+9H35lI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=cJIWu3ZwnFazRokXrm15y9j/DeT7WVUM0MvtFRoJo6Y=; b=Boed8VymrCL+tbwJaZ0fBEMO77GrEX5uw0CnmjbGi1e0k7ZgF1gb8zkeLlleDmvNTP MfEbca24gUYNE+2vChwqRJrW7+hndoXkon4gqz0EWz4Tvzus6LFmCc4o7xfx8Y0xFXSc T7LWUPUav98ioHsv3otq/9pHIxNx+xFZn8qZNuwGEZqXh7/vJpVjRg4qgaSgijB7vFGZ efI71Jok21WJmEpq1EMu9KiHZ6qQ45WSEkPeJ3pS8LTE9cQG98pI2M2FJdjlVDcvacV1 GSxxs3SxCwudoRUVzopFxlYbVNb6shAUAjxUKBLuNcpcZoYhfTb/jDSosKPss4SRFULO 3iSg== Received: by 10.216.237.193 with SMTP id y43mr5443579weq.75.1344803214417; Sun, 12 Aug 2012 13:26:54 -0700 (PDT) Received: from wespe.ffwll.local (178-83-130-250.dynamic.hispeed.ch. [178.83.130.250]) by mx.google.com with ESMTPS id k2sm17946268wiz.7.2012.08.12.13.26.53 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 12 Aug 2012 13:26:53 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Date: Sun, 12 Aug 2012 21:20:10 +0200 Message-Id: <1344799210-12122-1-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.7.11.2 In-Reply-To: <1344792434-1316-5-git-send-email-daniel.vetter@ffwll.ch> References: <1344792434-1316-5-git-send-email-daniel.vetter@ffwll.ch> X-Gm-Message-State: ALoCoQmlHjHEcRQsAphpioO1IjRXDBBYyu26ypR2P0VTzAnY/Uks1wSrqSbsMRHWZ3tITpxJt5kR Cc: Daniel Vetter Subject: [Intel-gfx] [PATCH] drm/i915: drop intel_encoder argument to load_detect_pipe 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 Since it's redundant - we can get the attached encoder in the functions themselves. Signed-off-by: Daniel Vetter --- drivers/gpu/drm/i915/intel_crt.c | 6 ++---- drivers/gpu/drm/i915/intel_display.c | 16 ++++++++-------- drivers/gpu/drm/i915/intel_drv.h | 6 ++---- drivers/gpu/drm/i915/intel_tv.c | 7 ++----- 4 files changed, 14 insertions(+), 21 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c index d19f72c..85645d3 100644 --- a/drivers/gpu/drm/i915/intel_crt.c +++ b/drivers/gpu/drm/i915/intel_crt.c @@ -582,14 +582,12 @@ intel_crt_detect(struct drm_connector *connector, bool force) return connector->status; /* for pre-945g platforms use load detect */ - if (intel_get_load_detect_pipe(&crt->base, connector, NULL, - &tmp)) { + if (intel_get_load_detect_pipe(connector, NULL, &tmp)) { if (intel_crt_detect_ddc(connector)) status = connector_status_connected; else status = intel_crt_load_detect(crt); - intel_release_load_detect_pipe(&crt->base, connector, - &tmp); + intel_release_load_detect_pipe(connector, &tmp); } else status = connector_status_unknown; diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 0542b37..0d22105 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -5633,12 +5633,13 @@ mode_fits_in_fbdev(struct drm_device *dev, return fb; } -bool intel_get_load_detect_pipe(struct intel_encoder *intel_encoder, - struct drm_connector *connector, +bool intel_get_load_detect_pipe(struct drm_connector *connector, struct drm_display_mode *mode, struct intel_load_detect_pipe *old) { struct intel_crtc *intel_crtc; + struct intel_encoder *intel_encoder = + intel_attached_encoder(connector); struct drm_crtc *possible_crtc; struct drm_encoder *encoder = &intel_encoder->base; struct drm_crtc *crtc = NULL; @@ -5740,10 +5741,11 @@ fail: return false; } -void intel_release_load_detect_pipe(struct intel_encoder *intel_encoder, - struct drm_connector *connector, +void intel_release_load_detect_pipe(struct drm_connector *connector, struct intel_load_detect_pipe *old) { + struct intel_encoder *intel_encoder = + intel_attached_encoder(connector); struct drm_encoder *encoder = &intel_encoder->base; DRM_DEBUG_KMS("[CONNECTOR:%d:%s], [ENCODER:%d:%s]\n", @@ -7889,10 +7891,8 @@ static void intel_enable_pipe_a(struct drm_device *dev) if (!crt) return; - if (intel_get_load_detect_pipe(intel_attached_encoder(crt), - crt, NULL, &load_detect_temp)) - intel_release_load_detect_pipe(intel_attached_encoder(crt), - crt, &load_detect_temp); + if (intel_get_load_detect_pipe(crt, NULL, &load_detect_temp)) + intel_release_load_detect_pipe(crt, &load_detect_temp); } diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index 0f780ee..4a9cdd1 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h @@ -484,12 +484,10 @@ struct intel_load_detect_pipe { bool load_detect_temp; int dpms_mode; }; -extern bool intel_get_load_detect_pipe(struct intel_encoder *intel_encoder, - struct drm_connector *connector, +extern bool intel_get_load_detect_pipe(struct drm_connector *connector, struct drm_display_mode *mode, struct intel_load_detect_pipe *old); -extern void intel_release_load_detect_pipe(struct intel_encoder *intel_encoder, - struct drm_connector *connector, +extern void intel_release_load_detect_pipe(struct drm_connector *connector, struct intel_load_detect_pipe *old); extern void intelfb_restore(void); diff --git a/drivers/gpu/drm/i915/intel_tv.c b/drivers/gpu/drm/i915/intel_tv.c index ede0e44..c9b2fb0 100644 --- a/drivers/gpu/drm/i915/intel_tv.c +++ b/drivers/gpu/drm/i915/intel_tv.c @@ -1315,12 +1315,9 @@ intel_tv_detect(struct drm_connector *connector, bool force) if (force) { struct intel_load_detect_pipe tmp; - if (intel_get_load_detect_pipe(&intel_tv->base, connector, - &mode, &tmp)) { + if (intel_get_load_detect_pipe(connector, &mode, &tmp)) { type = intel_tv_detect_type(intel_tv, connector); - intel_release_load_detect_pipe(&intel_tv->base, - connector, - &tmp); + intel_release_load_detect_pipe(connector, &tmp); } else return connector_status_unknown; } else