From patchwork Tue Jul 3 09: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: 1150331 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 2D984DFF72 for ; Tue, 3 Jul 2012 10:52:34 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 179339F69A for ; Tue, 3 Jul 2012 03:52:34 -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 9A2E69F6F7 for ; Tue, 3 Jul 2012 03:34:55 -0700 (PDT) Received: by mail-wi0-f171.google.com with SMTP id hq4so2990707wib.12 for ; Tue, 03 Jul 2012 03:34:55 -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=DF37U+P4CbPk+Bx3Za8FHC2Um6yCeFjuY/sJOf/2kws=; b=LAogTwPP5XgXF1TVllUyLBYODCuisyo/317TWRyxFE5DwH93doMZWB2n3GimvxmqDz YPJ5i3DkjcWPvXUve/S/PobvM2HY03gsrzWFJZZUOtN5Coj9nxUP7OVm/O+LJy4JazD2 p2ZBvxKUCgOcgNbD7oicZsfchX6b4FNnysmMM= 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=DF37U+P4CbPk+Bx3Za8FHC2Um6yCeFjuY/sJOf/2kws=; b=OH7hdE4K4vtoCwMGG58/1qPBAGnWCmL1+dbPwU7MvSMaNEp/IQbtK42iDM2guq3Hu3 N0wVRzilBslHQAsdjpX2WDG6kFz8pFLAxVO5tLZEvtwgJXvHDqI2LMO/owYIoejm5Ve9 g1i8JUfaStNoAiDGiy64cijWpfQCmPJT6nqAIENjo6DOVhwSoazIwNdaVuu9xKa0LKy3 0L0O4yRKIqidnmyGiHb/LaSAjEWhWJDyb5EKDyi5ZHPEIAikZKXxsykWx276mrJwH8Vz Kvksq/SrVy0gOI/swA0PbTh+fexYcVS3bKzR0ZECQwfaUXCKOY8EEB8ukVBOpdrXyl0y WwWQ== Received: by 10.180.82.164 with SMTP id j4mr24043539wiy.18.1341311695278; Tue, 03 Jul 2012 03:34:55 -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 e9sm14845138wiw.10.2012.07.03.03.34.54 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 03 Jul 2012 03:34:54 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Date: Tue, 3 Jul 2012 11:28:15 +0200 Message-Id: <1341307715-3886-24-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.7.7.6 In-Reply-To: <1341307715-3886-1-git-send-email-daniel.vetter@ffwll.ch> References: <1341307715-3886-1-git-send-email-daniel.vetter@ffwll.ch> X-Gm-Message-State: ALoCoQkr2bPSCKzrWB8qL9XoUF8wVua1eXBv5DM2ljkUUtQWasD5Pq69myPXqig8DOQ6/LG2nNc1 Cc: Daniel Vetter Subject: [Intel-gfx] [PATCH 23/43] drm/i915: clean up encoder_prepare/commit 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 We no longer need them. And now that all encoders are converted, we can finally move the cpt modeset check to the right place - at the end of the crtc_enable function. Signed-Off-by: Daniel Vetter --- drivers/gpu/drm/i915/intel_display.c | 23 +++-------------------- drivers/gpu/drm/i915/intel_drv.h | 2 -- 2 files changed, 3 insertions(+), 22 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index d30306a..d716634 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -3207,6 +3207,9 @@ static void ironlake_crtc_enable(struct drm_crtc *crtc) encoders: for_each_encoder_on_crtc(dev, crtc, encoder) encoder->enable(encoder); + + if (HAS_PCH_CPT(dev)) + intel_cpt_verify_modeset(dev, intel_crtc->pipe); } static void ironlake_crtc_disable(struct drm_crtc *crtc) @@ -3481,26 +3484,6 @@ static void intel_crtc_disable(struct drm_crtc *crtc) } } -void intel_encoder_prepare(struct drm_encoder *encoder) -{ - struct drm_encoder_helper_funcs *encoder_funcs = encoder->helper_private; - /* lvds has its own version of prepare see intel_lvds_prepare */ - encoder_funcs->dpms(encoder, DRM_MODE_DPMS_OFF); -} - -void intel_encoder_commit(struct drm_encoder *encoder) -{ - struct drm_encoder_helper_funcs *encoder_funcs = encoder->helper_private; - struct drm_device *dev = encoder->dev; - struct intel_crtc *intel_crtc = to_intel_crtc(encoder->crtc); - - /* lvds has its own version of commit see intel_lvds_commit */ - encoder_funcs->dpms(encoder, DRM_MODE_DPMS_ON); - - if (HAS_PCH_CPT(dev)) - intel_cpt_verify_modeset(dev, intel_crtc->pipe); -} - void intel_encoder_noop(struct drm_encoder *encoder) { } diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index d081158..5099440 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h @@ -375,8 +375,6 @@ extern enum drm_connector_status intel_panel_detect(struct drm_device *dev); extern void intel_crtc_load_lut(struct drm_crtc *crtc); extern void intel_crtc_update_dpms(struct drm_crtc *crtc); -extern void intel_encoder_prepare(struct drm_encoder *encoder); -extern void intel_encoder_commit(struct drm_encoder *encoder); extern void intel_encoder_noop(struct drm_encoder *encoder); extern void intel_encoder_disable(struct drm_encoder *encoder); extern void intel_encoder_destroy(struct drm_encoder *encoder);