From patchwork Fri Oct 18 06:36:36 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 3065021 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 21F2D9F243 for ; Fri, 18 Oct 2013 06:45:56 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5871A204E1 for ; Fri, 18 Oct 2013 06:45:55 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 5441E204E0 for ; Fri, 18 Oct 2013 06:45:54 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 40E6EE7344 for ; Thu, 17 Oct 2013 23:45:54 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-ee0-f48.google.com (mail-ee0-f48.google.com [74.125.83.48]) by gabe.freedesktop.org (Postfix) with ESMTP id 064EEE72C0 for ; Thu, 17 Oct 2013 23:36:23 -0700 (PDT) Received: by mail-ee0-f48.google.com with SMTP id e50so640150eek.35 for ; Thu, 17 Oct 2013 23:36:21 -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; bh=iOIXEnqqMzPiWeUytRTjhEXK43stVEaFLpONrWGm7Qg=; b=MNdbVp3Beaga7SiyVbZX/2WC/0U2/kFMbENzePxriRB5TzByJnXes92rKASs5Q12JF 3S2uL8ycQkjEPZTq53XmuN/LOCJFpk7RQrcqNoxlD73VD8+eCusIWEvZzIeTwlMqMFdE CHC01diV8iWYpvsWNBeDM0D3KGoiyEBLWH8ks= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=iOIXEnqqMzPiWeUytRTjhEXK43stVEaFLpONrWGm7Qg=; b=C4LjYGEgSQDH9Z/HVxRCbdPxvqL2qp5lgMjeEHigznKDKjp8o8J911tqpLwsPWD0Yd a6Jd0ytCIkCCUYGUrVcDh5dlLykC14iFL3SOCz2GTUddo00dZsMYZNlKVUxBAYX0IQji 3lge7CizCh/l5rzCePcsiLyRm2d5Ne9bGPLtr1iD+1cWVLkq20t+OuLQ0yt1luGCogh1 W6IzDZ7KokIsApSqGbMRZO3caH55WdiTj5xiLSJiYi98/KUbB5GCrRKJ9z2xYeE2zNUl lKnVP7NEXboDqbk6+6fnGQPv/pzPjaofbIg3iCAHPYi+i672J40lsiwgEnHyZqdM7iAT 1pUw== X-Gm-Message-State: ALoCoQmXk+i1sZa5lmx0Z0SAguPRzrMPhiVTVrzxOPoURbVgq63U113u/nrPQLkXWja1h3dQDBLw X-Received: by 10.15.22.2 with SMTP id e2mr482543eeu.89.1382078181336; Thu, 17 Oct 2013 23:36:21 -0700 (PDT) Received: from phenom.ffwll.local (178-83-130-250.dynamic.hispeed.ch. [178.83.130.250]) by mx.google.com with ESMTPSA id e47sm204710eeo.8.2013.10.17.23.36.19 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 17 Oct 2013 23:36:20 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Date: Fri, 18 Oct 2013 08:36:36 +0200 Message-Id: <1382078196-4234-1-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.8.4.rc3 Cc: Daniel Vetter Subject: [Intel-gfx] [PATCH] drm/i915: remove dead code in ironlake_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 X-Spam-Status: No, score=-4.5 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP In Author: Daniel Vetter Date: Wed Jun 5 13:34:23 2013 +0200 drm/i915: consolidate pch pll enable sequence I've removed all the code from this if block, but somehow forgotten to kill the block itself. Signed-off-by: Daniel Vetter Reviewed-by: Ville Syrjälä --- drivers/gpu/drm/i915/intel_display.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 04c3e1b..38892db 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -6072,11 +6072,6 @@ static int ironlake_crtc_mode_set(struct drm_crtc *crtc, else intel_crtc->lowfreq_avail = false; - if (intel_crtc->config.has_pch_encoder) { - pll = intel_crtc_to_shared_dpll(intel_crtc); - - } - intel_set_pipe_timings(intel_crtc); if (intel_crtc->config.has_pch_encoder) {