From patchwork Thu Oct 3 17:14:40 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 2987251 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 1C007BFF0B for ; Fri, 4 Oct 2013 07:00:07 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id F16552045A for ; Fri, 4 Oct 2013 07:00:05 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 4EE03203A8 for ; Fri, 4 Oct 2013 07:00:01 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 30C04E5CC1 for ; Fri, 4 Oct 2013 00:00:01 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from cassiel.sirena.org.uk (cassiel.sirena.org.uk [80.68.93.111]) by gabe.freedesktop.org (Postfix) with ESMTP id 48E9FE6399 for ; Thu, 3 Oct 2013 10:14:57 -0700 (PDT) Received: from cpc11-sgyl31-2-0-cust68.sgyl.cable.virginmedia.com ([94.175.92.69] helo=debutante.sirena.org.uk) by cassiel.sirena.org.uk with esmtpsa (TLS1.2:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from ) id 1VRmU7-0007jm-5T; Thu, 03 Oct 2013 18:14:44 +0100 Received: from broonie by debutante.sirena.org.uk with local (Exim 4.80) (envelope-from ) id 1VRmU4-0001qt-Jj; Thu, 03 Oct 2013 18:14:40 +0100 Date: Thu, 3 Oct 2013 18:14:40 +0100 From: Mark Brown To: Daniel Vetter , David Airlie , Imre Deak , Chris Wilson Message-ID: <20131003171440.GD27287@sirena.org.uk> MIME-Version: 1.0 User-Agent: Mutt/1.5.21 (2010-09-15) X-SA-Exim-Connect-IP: 94.175.92.69 X-SA-Exim-Mail-From: broonie@sirena.org.uk X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-4.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Subject: Build failure after merge of the drm-intel tree X-SA-Exim-Version: 4.2.1 (built Mon, 26 Dec 2011 16:57:07 +0000) X-SA-Exim-Scanned: Yes (on cassiel.sirena.org.uk) X-Mailman-Approved-At: Thu, 03 Oct 2013 23:58:30 -0700 Cc: intel-gfx@lists.freedesktop.org, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Errors-To: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org X-Virus-Scanned: ClamAV using ClamSMTP After merging the drm-intel tree into -next an x86 allmodconfig build fails with: In file included from include/linux/kobject.h:29:0, from include/linux/cpufreq.h:16, from drivers/gpu/drm/i915/intel_pm.c:28: drivers/gpu/drm/i915/intel_pm.c: In function ‘intel_pm_init’: drivers/gpu/drm/i915/intel_pm.c:5883:34: error: ‘struct intel_gen6_power_mgmt’ has no member named ‘vlv_work’ INIT_DELAYED_WORK(&dev_priv->rps.vlv_work, vlv_rps_timer_work); ^ include/linux/workqueue.h:216:16: note: in definition of macro ‘__INIT_WORK’ __init_work((_work), _onstack); \ ^ include/linux/workqueue.h:244:3: note: in expansion of macro ‘INIT_WORK’ INIT_WORK(&(_work)->work, (_func)); \ ^ include/linux/workqueue.h:260:2: note: in expansion of macro ‘__INIT_DELAYED_WORK’ __INIT_DELAYED_WORK(_work, _func, 0) ^ drivers/gpu/drm/i915/intel_pm.c:5883:2: note: in expansion of macro ‘INIT_DELAYED_WORK’ INIT_DELAYED_WORK(&dev_priv->rps.vlv_work, vlv_rps_timer_work); ^ drivers/gpu/drm/i915/intel_pm.c:5883:34: error: ‘struct intel_gen6_power_mgmt’ has no member named ‘vlv_work’ INIT_DELAYED_WORK(&dev_priv->rps.vlv_work, vlv_rps_timer_work); ^ and so on caused by 671952a2a290a (drm/i915: fix rps.vlv_work initialization) in the drm-intel-fixes tree interacting with ac3a48b3036 (drm/i915: Boost RPS frequency for CPU stalls) from the drm-intel tree. I have used the fix below for today: From 4f4dccef92d64393e2a7e867f7c2755c09178c48 Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Thu, 3 Oct 2013 18:10:55 +0100 Subject: [PATCH] drm/i915: Resolve interaction with drm-fixes tree Signed-off-by: Mark Brown --- drivers/gpu/drm/i915/intel_pm.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index 7cdac0b..0b4de57 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c @@ -5879,7 +5879,5 @@ void intel_pm_init(struct drm_device *dev) INIT_DELAYED_WORK(&dev_priv->rps.delayed_resume_work, intel_gen6_powersave_work); - - INIT_DELAYED_WORK(&dev_priv->rps.vlv_work, vlv_rps_timer_work); }