From patchwork Thu Jul 26 18:48:53 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 1244961 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 F1BC33FC33 for ; Thu, 26 Jul 2012 20:22:22 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B6F179E9FE for ; Thu, 26 Jul 2012 13:22:22 -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 2F4DA9E9D9 for ; Thu, 26 Jul 2012 12:56:45 -0700 (PDT) Received: by mail-wg0-f41.google.com with SMTP id ds1so69885wgb.0 for ; Thu, 26 Jul 2012 12:56: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=GeLvI4pPhCRbaFwrvz9iLTDifCEazZx+EKlG1laR+q4=; b=jXP7VPJlc6YhgPpO7oPQGiBWPy2/ATNVT1NgI2SOKtNRu/nZTu8YWgO/jbqD+L3R8t AOpzeuAcGaYbyBL3BjuOWB/l0FJDq0yWMfBK/xBxaFDulcgBJqXV6fs/JjM9sIuz1BSI P2pr0pPaVKikuEslpv2iQub0iiQ4hlZQWM4kc= 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=GeLvI4pPhCRbaFwrvz9iLTDifCEazZx+EKlG1laR+q4=; b=dDbjTrQjKw2TOu29yhVjz6ym7yP4l4A1a2bBsH/QhSOOC9eE7SfNrFkCipCcrHhG7b Xb5WjDv5fH2yYcjncBWrSiWwHe3gnNZerSG3n79h+FOEz2NYneof3TE33YoD77oyh3fg i+LPpuxPU0zal6ysKP7wWOIqE//UWxaiFxxGF3ypmTGkGEM4hJhTlQDXpIRP2P4jSw/Z PMGETk57edwv1jZjtnzV3mjacHaNL37BqUQ2pANb9MV+us1kX5G3+eBVNT1qHmBCwMEe gRyQtMqOzELN0beiLl+8qa46XFhhMYt8fQ9aDD9FSeNhJgfYjwgE+6+mDjbRZYyhG36E wbtg== Received: by 10.216.101.68 with SMTP id a46mr14126620weg.120.1343332604815; Thu, 26 Jul 2012 12:56: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 fr4sm391403wib.8.2012.07.26.12.56.42 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 26 Jul 2012 12:56:43 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Date: Thu, 26 Jul 2012 20:48:53 +0200 Message-Id: <1343328581-2324-29-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: ALoCoQn14Z6EeJA4r5hk5jg/KpgQvGY+xuYNdV8eXD8Bup8rd1TnM8NyOgt5TvV/RRM0gmHEsl8H Cc: Daniel Vetter Subject: [Intel-gfx] [PATCH 28/76] 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 file changed, 5 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index a6b6f44..177795a 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -6505,8 +6505,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, @@ -6575,8 +6573,8 @@ bool intel_set_mode(struct drm_crtc *crtc, int x, int y, 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; @@ -6618,7 +6616,7 @@ bool intel_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; } @@ -6626,12 +6624,12 @@ bool intel_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; @@ -6648,7 +6646,7 @@ bool intel_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; @@ -6982,9 +6980,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); }