From patchwork Wed Oct 31 18:26:13 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 1681101 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 54CA5DFB80 for ; Wed, 31 Oct 2012 18:37:12 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 295ADA0EAF for ; Wed, 31 Oct 2012 11:37:12 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-ea0-f177.google.com (mail-ea0-f177.google.com [209.85.215.177]) by gabe.freedesktop.org (Postfix) with ESMTP id B2489A0A19 for ; Wed, 31 Oct 2012 11:34:45 -0700 (PDT) Received: by mail-ea0-f177.google.com with SMTP id n13so691322eaa.36 for ; Wed, 31 Oct 2012 11:34:45 -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=x1UA4kn2K/RJ+bIAC/u4Veq8BkS1nOh7r/Kuz8Us0IE=; b=fgSFLYgRHkTRDnK0aIXor6zbQuk7c+zxKD5+KXY/DSSEhaGPoUFrq04mpvEM/FfqgE n+SQOpj6ZpayMzXccHQOhkqcu6cCC/2xQUzbspoToJDAliU/096qHgK5AzGvZqtw/Aca 31dAEYx1UkBocWaA2I1JjCNpFbsDDm/hfyu3Q= 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=x1UA4kn2K/RJ+bIAC/u4Veq8BkS1nOh7r/Kuz8Us0IE=; b=IBxB819MCqu5eDkq7x73c8hb9UH08YdiPn6eBybRH6L5fxGZ3HRaH6FxxjS0cNm/PU c7929awBgYBV2XAtYcpp4vFxhYc5jzWTon+YvGgPPrdo0Rwcy/3AswROgVLttCU7rq4W bf4RF9AVzoyQxgPuPrYzBiq29w1GmAH9iibmoWIdU8JOIlJMaEuM25gexwBTjfpsXqyO spBYt2WSlnFGDGJvatcpIAqxUlMwML93JUEPSPS+/sN62Lrc6MgDM0p2pf0b62ll/VIh DKo9Ymz/QATbBjQOi8L/PUnnnsIQgdWv47iS70OBVkvamZHRDPE8sXj6+exjAHeXXMrb v6qA== Received: by 10.14.203.69 with SMTP id e45mr87904683eeo.38.1351708484704; Wed, 31 Oct 2012 11:34:44 -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 g5sm9416079eem.4.2012.10.31.11.34.43 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 31 Oct 2012 11:34:44 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Date: Wed, 31 Oct 2012 19:26:13 +0100 Message-Id: <1351707973-1049-1-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: References: X-Gm-Message-State: ALoCoQlAFExUmRSClroXMwrUMt8PGxHFfmL6Vbqda9RbPAs3ZnJxdlu7V8PkIJLQT9Iw07904k7J 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 discussiing the rather confusing set of function names with Paulo Zanoni. Unfortunately I don't have an idea to make the function names lesss confusion. v2: Use for_each_encoder_on_crtc as suggested by Chris Wilson. Signed-off-by: Daniel Vetter Reviewed-by: Chris Wilson --- drivers/gpu/drm/i915/intel_display.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index a5be346..6ca6156 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -5572,6 +5572,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 intel_encoder *encoder; struct intel_crtc *intel_crtc = to_intel_crtc(crtc); int pipe = intel_crtc->pipe; int ret; @@ -5582,7 +5584,19 @@ 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; + + for_each_encoder_on_crtc(dev, crtc, encoder) { + DRM_DEBUG_KMS("[ENCODER:%d:%s] set [MODE:%d:%s]\n", + encoder->base.base.id, + drm_get_encoder_name(&encoder->base), + mode->base.id, mode->name); + encoder_funcs = encoder->base.helper_private; + encoder_funcs->mode_set(&encoder->base, mode, adjusted_mode); + } + + return 0; } static bool intel_eld_uptodate(struct drm_connector *connector, @@ -7484,8 +7498,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; @@ -7539,18 +7551,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. */