From patchwork Wed Jul 11 14:28:15 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 1183791 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 0C048DF25A for ; Wed, 11 Jul 2012 16:02:16 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C3AC5A0E92 for ; Wed, 11 Jul 2012 09:02:15 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wg0-f41.google.com (mail-wg0-f41.google.com [74.125.82.41]) by gabe.freedesktop.org (Postfix) with ESMTP id 096B19E94F for ; Wed, 11 Jul 2012 08:35:51 -0700 (PDT) Received: by wgbds1 with SMTP id ds1so335824wgb.0 for ; Wed, 11 Jul 2012 08:35: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=r+aAVw/JBp90Bbj7QKcnDN+vribgYEUV3QFBSpgwsv0=; b=FgIp9qTyrmT2LAROVOSzoJ5+L4Wf5g9AfzcCikHwZtdmL+qZApw6HEsRCc3gCE7hM7 xoAfaC6FJ8rskSaWLL0pIbhsX6Zr6tq7RCVFFlIqaAFF8V4nsY7sLQ9nH5dVmekcGTnH IlWBV+7NU6PCEI8r/qcDKXm9K6MU3XfClvszg= 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=r+aAVw/JBp90Bbj7QKcnDN+vribgYEUV3QFBSpgwsv0=; b=A420MoPp6BEr3H0y3ARvxelLyyEIElHh7sw0w6NjL5qOBbiniuJWuZV+t3qLFnWXK0 8IQUsPkO38G/Clitl9eV2ElePSoONz0ApyH69OCc3siumcHx2kfyJe0a8M3fRRquOrPR WF8Eo31vXw4oZnrhuP9c1hw8f6A5Rbgfziu1LAiXRE3JpdXV5I9RPjaIHYVY8NSWJHZL C8EN7f/onyLQmNR+xtAkakRgLeoeIgISsTLuCLoAugcBqMc0vcPhsVxKmmQivkbEnR8R gTZx5QcClJRaqTMT4i6LAuRw6dwkfIpwxNIidcFjKQhs+2mJ65t8DVgEsIAsZ13RrTvO oFqw== Received: by 10.216.144.69 with SMTP id m47mr22422544wej.86.1342020951198; Wed, 11 Jul 2012 08:35: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 bc2sm5777080wib.0.2012.07.11.08.35.49 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 11 Jul 2012 08:35:50 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Date: Wed, 11 Jul 2012 16:28:15 +0200 Message-Id: <1342016944-23395-33-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.7.7.6 In-Reply-To: <1342016944-23395-1-git-send-email-daniel.vetter@ffwll.ch> References: <1342016944-23395-1-git-send-email-daniel.vetter@ffwll.ch> X-Gm-Message-State: ALoCoQlMHYgclOwny6c6TeK2QNOF7yOROV5oQm89kfy3rFOERkVRAO2/rAejbr1nY+ucbCRzatNS Cc: Daniel Vetter Subject: [Intel-gfx] [PATCH 32/81] drm/i915: call crtc functions directly 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 Instead of going through the crtc helper function tables. Signed-off-by: Daniel Vetter --- drivers/gpu/drm/i915/intel_display.c | 15 +++++---------- 1 files changed, 5 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 3534e67..b91e7ea 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -6578,8 +6578,6 @@ static void intel_crtc_reset(struct drm_crtc *crtc) } static struct drm_crtc_helper_funcs intel_helper_funcs = { - .mode_fixup = intel_crtc_mode_fixup, - .mode_set = intel_crtc_mode_set, .mode_set_base_atomic = intel_pipe_set_base_atomic, .load_lut = intel_crtc_load_lut, .disable = intel_crtc_disable, @@ -6649,8 +6647,8 @@ bool intel_crtc_set_mode(struct drm_crtc *crtc, struct drm_framebuffer *old_fb) { 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_crtc_helper_funcs *crtc_funcs = crtc->helper_private; struct drm_encoder_helper_funcs *encoder_funcs; int saved_x, saved_y; struct drm_encoder *encoder; @@ -6692,7 +6690,7 @@ bool intel_crtc_set_mode(struct drm_crtc *crtc, } } - if (!(ret = crtc_funcs->mode_fixup(crtc, mode, adjusted_mode))) { + if (!(ret = intel_crtc_mode_fixup(crtc, mode, adjusted_mode))) { DRM_DEBUG_KMS("CRTC fixup failed\n"); goto done; } @@ -6700,12 +6698,12 @@ bool intel_crtc_set_mode(struct drm_crtc *crtc, intel_crtc_prepare_encoders(dev); - crtc_funcs->prepare(crtc); + dev_priv->display.crtc_disable(crtc); /* Set up the DPLL and any encoders state that needs to adjust or depend * on the DPLL. */ - ret = !crtc_funcs->mode_set(crtc, mode, adjusted_mode, x, y, old_fb); + ret = !intel_crtc_mode_set(crtc, mode, adjusted_mode, x, y, old_fb); if (!ret) goto done; @@ -6722,7 +6720,7 @@ bool intel_crtc_set_mode(struct drm_crtc *crtc, } /* Now enable the clocks, plane, pipe, and connectors that we set up. */ - crtc_funcs->commit(crtc); + dev_priv->display.crtc_enable(crtc); /* Store real post-adjustment hardware mode. */ crtc->hwmode = *adjusted_mode; @@ -7057,9 +7055,6 @@ static void intel_crtc_init(struct drm_device *dev, int pipe) intel_crtc->active = true; /* force the pipe off on setup_init_config */ intel_crtc->bpp = 24; /* default for pre-Ironlake */ - intel_helper_funcs.prepare = dev_priv->display.crtc_disable; - intel_helper_funcs.commit = dev_priv->display.crtc_enable; - drm_crtc_helper_add(&intel_crtc->base, &intel_helper_funcs); intel_crtc->busy = false;