From patchwork Thu Oct 11 17:46:07 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 1582851 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork1.kernel.org (Postfix) with ESMTP id 3BA933FD9C for ; Thu, 11 Oct 2012 18:55:16 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3BC90A029C for ; Thu, 11 Oct 2012 11:55:16 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wi0-f171.google.com (mail-wi0-f171.google.com [209.85.212.171]) by gabe.freedesktop.org (Postfix) with ESMTP id DEC3B9E83B for ; Thu, 11 Oct 2012 11:54:11 -0700 (PDT) Received: by mail-wi0-f171.google.com with SMTP id hj13so7454657wib.12 for ; Thu, 11 Oct 2012 11:54:11 -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; bh=GG+YVttKHGbiB64p1fIt9RwLRvg5GM1V5Ie8C424j74=; b=Wvbioy8uJ+q5U0Daf2DX09g6x9P3Lb2bfP/a8G5jnpu2lkJt38thjpRY+kRyGFffem fYC30KBj2b0QfF4NH4O2afSKek7tB1a45Dg7q/Y65BfRV2p0ndDNfWt+PIDwACOZpbYc VVNfe83cAlpoEyGDw450A7b/AoLW8uBJ7J9I4= 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:x-gm-message-state; bh=GG+YVttKHGbiB64p1fIt9RwLRvg5GM1V5Ie8C424j74=; b=Sl3v4nYYNbBZHK2rLcdbAQXieoc0HWsA7v+qnrwU+/rTTkn/6jdTy+onW5OhyLdsE+ COtnep+RBJmShtMrLUeRR+qmvryTu+0DXVcdGX4iOONbTSg/tRZi4rUHT6RCx+cgas77 sCknX4ffxl22QGqEGq++KFD8o5YyRlXW2MKAJIMSndag914QSvLXJ9cjub7Wr9Jz6Bes +2fgCLKf2iKYROfMEKLuI4maAUzyxyyha665jxEuzS/3tpnoKiA8qZyJ4wqHfC1a8Ong idek7xZF83L7RNmzX/4s1ukupyDrqZO/AilxdxIcYVFa+LsffImSK5bNHdwjMkNOm3jA 2axQ== Received: by 10.180.78.102 with SMTP id a6mr22667573wix.20.1349981650891; Thu, 11 Oct 2012 11:54:10 -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 eq2sm9371wib.1.2012.10.11.11.54.06 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 11 Oct 2012 11:54:07 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Date: Thu, 11 Oct 2012 19:46:07 +0200 Message-Id: <1349977567-7497-1-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.7.11.2 X-Gm-Message-State: ALoCoQkkVT8cHJc0f+qR/vip48t0uuzIOXNw7m4K/WtzAjz7pp/L0UwYC6ZG/c5SP+LGyTB/bgbf Cc: Daniel Vetter Subject: [Intel-gfx] [PATCH] drm/i915: move encoder->mode_set calls to crtc_mode_set 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 Makes more sense to group the entire mode_set stage into one function. Noticed while discussion the rather confusing set of function names with Paulo Zanoni. Unfortunately I don't have an idea to make the function names lesss confusion. Signed-off-by: Daniel Vetter --- drivers/gpu/drm/i915/intel_display.c | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 6cf0d00..f84fb2e 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -5138,6 +5138,8 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc, { struct drm_device *dev = crtc->dev; struct drm_i915_private *dev_priv = dev->dev_private; + struct drm_encoder_helper_funcs *encoder_funcs; + struct drm_encoder *encoder; struct intel_crtc *intel_crtc = to_intel_crtc(crtc); int pipe = intel_crtc->pipe; int ret; @@ -5148,7 +5150,22 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc, x, y, fb); drm_vblank_post_modeset(dev, pipe); - return ret; + if (ret != 0) + return ret; + + list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) { + + if (encoder->crtc != &intel_crtc->base) + continue; + + DRM_DEBUG_KMS("[ENCODER:%d:%s] set [MODE:%d:%s]\n", + encoder->base.id, drm_get_encoder_name(encoder), + mode->base.id, mode->name); + encoder_funcs = encoder->helper_private; + encoder_funcs->mode_set(encoder, mode, adjusted_mode); + } + + return 0; } static bool intel_eld_uptodate(struct drm_connector *connector, @@ -7072,8 +7089,6 @@ bool intel_set_mode(struct drm_crtc *crtc, struct drm_device *dev = crtc->dev; drm_i915_private_t *dev_priv = dev->dev_private; struct drm_display_mode *adjusted_mode, saved_mode, saved_hwmode; - struct drm_encoder_helper_funcs *encoder_funcs; - struct drm_encoder *encoder; struct intel_crtc *intel_crtc; unsigned disable_pipes, prepare_pipes, modeset_pipes; bool ret = true; @@ -7127,18 +7142,6 @@ bool intel_set_mode(struct drm_crtc *crtc, x, y, fb); if (!ret) goto done; - - list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) { - - if (encoder->crtc != &intel_crtc->base) - continue; - - DRM_DEBUG_KMS("[ENCODER:%d:%s] set [MODE:%d:%s]\n", - encoder->base.id, drm_get_encoder_name(encoder), - mode->base.id, mode->name); - encoder_funcs = encoder->helper_private; - encoder_funcs->mode_set(encoder, mode, adjusted_mode); - } } /* Now enable the clocks, plane, pipe, and connectors that we set up. */