From patchwork Thu Jul 26 18:49:41 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 1245571 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 500863FC33 for ; Thu, 26 Jul 2012 20:59:06 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 101DD9E841 for ; Thu, 26 Jul 2012 13:59:06 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wg0-f43.google.com (mail-wg0-f43.google.com [74.125.82.43]) by gabe.freedesktop.org (Postfix) with ESMTP id 34E439EB84 for ; Thu, 26 Jul 2012 12:57:51 -0700 (PDT) Received: by mail-wg0-f43.google.com with SMTP id dr1so1724773wgb.12 for ; Thu, 26 Jul 2012 12:57:51 -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=cLWaOYvn4BpXNzmtfZeWuVzrKzRsQ7de55NAckqfAAM=; b=TqDBq2M85WtIyaNisBS5PMuEnFbHW4p/57DpZxhLBFWGgQGAD24G3HuKXm+Que2xXg bkhi6ROIURdFeF5Y5fEHQA2BceI14IfDreu2lCo1+LjLxsW1Kp5OgSiH2kq1U61Y45qT y//tvNZOIN6QHza488M80BguY+EfKCCfSTpKc= 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=cLWaOYvn4BpXNzmtfZeWuVzrKzRsQ7de55NAckqfAAM=; b=RYPF/urVmMP21oIaLcmxbvkgzut4YOZkGVOo+DDbFtt9VK1qII+LXmLvnpv2OBfeJs 4ZeSyHkpAwIYtS1UG8FdvRCCv/fm0t6n6wht0xiIEv5H6jLYkM2QSk7PopOmgOSA44re RfwkCxb32e8FgEg7dQtY4fr9+6bxhaNBYPqpcKAJsXcTjhnZ12/OgkaK6q7R8h56mGWI 3cn1I7OHABw1/yoDcKrUH5Pz/lSh1aOCYFaTkiyI9rmt5qXGtiFclUvMw/S3Usmq07K9 2BjA2AVlbm4xv68DSUwX71eMO3hi9ML1YMDj5ueoWtmEACxERZ80PfHoSkDuZBu8UNKw SDLg== Received: by 10.216.137.213 with SMTP id y63mr28336wei.33.1343332671627; Thu, 26 Jul 2012 12:57:51 -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 fr4sm391403wib.8.2012.07.26.12.57.50 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 26 Jul 2012 12:57:50 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Date: Thu, 26 Jul 2012 20:49:41 +0200 Message-Id: <1343328581-2324-77-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1343328581-2324-1-git-send-email-daniel.vetter@ffwll.ch> References: <1343328581-2324-1-git-send-email-daniel.vetter@ffwll.ch> X-Gm-Message-State: ALoCoQlV2R1Taa8Ep2p9u7RrFDDiN5vpIVh4YrDQ/6qcxHRvomiP7JI7FLkKYmajfJb0/7xI56Ll Cc: Daniel Vetter Subject: [Intel-gfx] [PATCH 76/76] 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 2cf2cc9..7919058 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -5009,6 +5009,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; @@ -5019,7 +5021,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, @@ -6776,8 +6793,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; struct drm_connector *connector; unsigned disable_pipes, prepare_pipes, modeset_pipes; @@ -6857,18 +6872,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. */