From: Mark Brown <broonie@kernel•org>
To: Daniel Vetter <daniel.vetter@ffwll•ch>,
David Airlie <airlied@linux•ie>, Imre Deak <imre.deak@intel•com>,
Chris Wilson <chris@chris-wilson•co.uk>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Thierry Reding <thierry.reding@gmail•com>,
dri-devel@lists•freedesktop.org, intel-gfx@lists•freedesktop.org
Subject: Build failure after merge of the drm-intel tree
Date: Thu, 3 Oct 2013 18:14:40 +0100 [thread overview]
Message-ID: <20131003171440.GD27287@sirena.org.uk> (raw)
[-- Attachment #1: Type: text/plain, Size: 2375 bytes --]
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 <broonie@linaro•org>
Date: Thu, 3 Oct 2013 18:10:55 +0100
Subject: [PATCH] drm/i915: Resolve interaction with drm-fixes tree
Signed-off-by: Mark Brown <broonie@linaro•org>
---
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);
}
--
1.8.4.rc3
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2013-10-03 17:14 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-03 17:14 Mark Brown [this message]
2013-10-04 20:22 ` Build failure after merge of the drm-intel tree Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20131003171440.GD27287@sirena.org.uk \
--to=broonie@kernel$(echo .)org \
--cc=airlied@linux$(echo .)ie \
--cc=chris@chris-wilson$(echo .)co.uk \
--cc=daniel.vetter@ffwll$(echo .)ch \
--cc=dri-devel@lists$(echo .)freedesktop.org \
--cc=imre.deak@intel$(echo .)com \
--cc=intel-gfx@lists$(echo .)freedesktop.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=thierry.reding@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox