From patchwork Sun Aug 19 19:12:29 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 1344851 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 DC6CEDF264 for ; Sun, 19 Aug 2012 20:29:23 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D47B3A102D for ; Sun, 19 Aug 2012 13:29:23 -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 01CFFA103C for ; Sun, 19 Aug 2012 13:20:29 -0700 (PDT) Received: by mail-wg0-f43.google.com with SMTP id dr1so4210645wgb.12 for ; Sun, 19 Aug 2012 13:20:29 -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=9fZD1fjFC57bAM/bZWrKAUsezj6BT730HpTyk+2JMBU=; b=cKaGawUI8tc0zmYNJqMSwtTMII9hqaL7C6jW4KILZUvevvMNqN1dOOtmatn8fwqZH6 1eOLrRIrv6NyzDLP9GRfrTZQ5p9qdezZHoFX3Vu56dDJKOPC6TIKsWyhuht6SZzjGfKI ae8kbdruic1kJm4qWrm5+q6bs7Hn8pI7k9ET4= 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=9fZD1fjFC57bAM/bZWrKAUsezj6BT730HpTyk+2JMBU=; b=AsAZ+FBZJJajaF/wc8ppZVZ3w4CwoEVTP8kp0QOaVcsW94ydmXxhXS6mxJcP3vr7oC ZA9bdJPWw3LpnB9jTGa1gHOUhi4jgQJyn2sy8TBhiVhyOcQBYHEMdDr51a1T81X1E/SZ ouiNGx9NEcH7c484udEQ1G7UOkc7TE8ICkcKlpAuGigI1DtJH0gV4y5inPXgbps20Xwz 4xJTHA/aHF8qu1ndSbRGbKkSYWjkXOeQ3slcal+uQEJ1f1FVjA1pQukrVYLm/mO/5mo/ R8EODawStmRXGqsEreE/pdFJ6BHJ6pmxN+mteXF7m5HXKAb8P5WgUWI7l7tfFbdjcml7 MYug== Received: by 10.216.241.198 with SMTP id g48mr5431352wer.161.1345407629473; Sun, 19 Aug 2012 13:20:29 -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 fu8sm24194367wib.5.2012.08.19.13.20.28 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 19 Aug 2012 13:20:28 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Date: Sun, 19 Aug 2012 21:12:29 +0200 Message-Id: <1345403595-9678-13-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.7.11.2 In-Reply-To: <1345403595-9678-1-git-send-email-daniel.vetter@ffwll.ch> References: <1345403595-9678-1-git-send-email-daniel.vetter@ffwll.ch> X-Gm-Message-State: ALoCoQnLknYu9T4aH3Frr36+VEXlzqC6ZlJDvyMy7aOWeiIN3KP9O2aVKzyFc/ORK459QiCK9jor Cc: Daniel Vetter Subject: [Intel-gfx] [PATCH 12/58] drm/i915: rip out encoder->disable/enable checks 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 All encoders are now converted so there's no need for these checks any more. Signed-Off-by: Daniel Vetter Reviewed-by: Jesse Barnes --- drivers/gpu/drm/i915/intel_display.c | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 0d48ebe..4805385 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -3267,10 +3267,8 @@ static void ironlake_crtc_enable(struct drm_crtc *crtc) intel_crtc_update_cursor(crtc, true); encoders: - for_each_encoder_on_crtc(dev, crtc, encoder) { - if (encoder->enable) - encoder->enable(encoder); - } + for_each_encoder_on_crtc(dev, crtc, encoder) + encoder->enable(encoder); } static void ironlake_crtc_disable(struct drm_crtc *crtc) @@ -3285,10 +3283,8 @@ static void ironlake_crtc_disable(struct drm_crtc *crtc) /* XXX: For compatability with the crtc helper code, call the encoder's * disable function unconditionally for now. */ - for_each_encoder_on_crtc(dev, crtc, encoder) { - if (encoder->disable) - encoder->disable(encoder); - } + for_each_encoder_on_crtc(dev, crtc, encoder) + encoder->disable(encoder); if (!intel_crtc->active) return; @@ -3412,10 +3408,8 @@ static void i9xx_crtc_enable(struct drm_crtc *crtc) intel_crtc_update_cursor(crtc, true); encoders: - for_each_encoder_on_crtc(dev, crtc, encoder) { - if (encoder->enable) - encoder->enable(encoder); - } + for_each_encoder_on_crtc(dev, crtc, encoder) + encoder->enable(encoder); } static void i9xx_crtc_disable(struct drm_crtc *crtc) @@ -3429,10 +3423,8 @@ static void i9xx_crtc_disable(struct drm_crtc *crtc) /* XXX: For compatability with the crtc helper code, call the encoder's * disable function unconditionally for now. */ - for_each_encoder_on_crtc(dev, crtc, encoder) { - if (encoder->disable) - encoder->disable(encoder); - } + for_each_encoder_on_crtc(dev, crtc, encoder) + encoder->disable(encoder); if (!intel_crtc->active) return;