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@xxxxxxxxxx>
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@xxxxxxxxxx>
---
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:
signature.asc
Description: Digital signature
_______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/dri-devel
