From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paulo Zanoni Subject: [PATCH 2/5] drm/i915: remove leftover display.update_wm assignment Date: Thu, 6 Dec 2012 11:12:39 -0200 Message-ID: <1354799562-4060-2-git-send-email-przanoni@gmail.com> References: <1354799562-4060-1-git-send-email-przanoni@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-vb0-f53.google.com (mail-vb0-f53.google.com [209.85.212.53]) by gabe.freedesktop.org (Postfix) with ESMTP id 1993AE674E for ; Thu, 6 Dec 2012 05:13:09 -0800 (PST) Received: by mail-vb0-f53.google.com with SMTP id b23so6383442vbz.26 for ; Thu, 06 Dec 2012 05:13:09 -0800 (PST) In-Reply-To: <1354799562-4060-1-git-send-email-przanoni@gmail.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org To: intel-gfx@lists.freedesktop.org Cc: Paulo Zanoni List-Id: intel-gfx@lists.freedesktop.org From: Paulo Zanoni This was moved to intel_init_pm. Signed-off-by: Paulo Zanoni --- drivers/gpu/drm/i915/intel_display.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 8626abd..0517fc2 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -8422,8 +8422,7 @@ static void intel_init_display(struct drm_device *dev) } else if (IS_HASWELL(dev)) { dev_priv->display.fdi_link_train = hsw_fdi_link_train; dev_priv->display.write_eld = haswell_write_eld; - } else - dev_priv->display.update_wm = NULL; + } } else if (IS_G4X(dev)) { dev_priv->display.write_eld = g4x_write_eld; } -- 1.7.11.7