Hi Dave,
After merging the drm tree, today's linux-next build (x86_64 allmodconfig)
failed like this:
drivers/gpu/drm/i915/i915_irq.c: In function 'gen6_rps_reset_ei':
drivers/gpu/drm/i915/i915_irq.c:1115:38: error: 'struct intel_gen6_power_mgmt' has no member named 'down_ei'
vlv_c0_read(dev_priv, &dev_priv->rps.down_ei);
^
drivers/gpu/drm/i915/i915_irq.c:1116:15: error: 'struct intel_gen6_power_mgmt' has no member named 'up_ei'
dev_priv->rps.up_ei = dev_priv->rps.down_ei;
^
drivers/gpu/drm/i915/i915_irq.c:1116:37: error: 'struct intel_gen6_power_mgmt' has no member named 'down_ei'
dev_priv->rps.up_ei = dev_priv->rps.down_ei;
^
drivers/gpu/drm/i915/i915_irq.c: In function 'vlv_wa_c0_ei':
drivers/gpu/drm/i915/i915_irq.c:1133:21: error: 'struct intel_gen6_power_mgmt' has no member named 'down_ei'
&dev_priv->rps.down_ei, &now,
^
drivers/gpu/drm/i915/i915_irq.c:1136:16: error: 'struct intel_gen6_power_mgmt' has no member named 'down_ei'
dev_priv->rps.down_ei = now;
^
drivers/gpu/drm/i915/i915_irq.c:1141:20: error: 'struct intel_gen6_power_mgmt' has no member named 'up_ei'
&dev_priv->rps.up_ei, &now,
^
drivers/gpu/drm/i915/i915_irq.c:1144:16: error: 'struct intel_gen6_power_mgmt' has no member named 'up_ei'
dev_priv->rps.up_ei = now;
^
Caused by commit
8f68d591d476 ("drm/i915: Stop using RP_DOWN_EI on Baytrail")
from the drm-intel-fixes tree and a bad merge resolution on my part.
I reapplied that commit by hand. It would be nice if this conflict was
resolved in the drm tree.
This cherry picking of fixes from new development back to Linus' tree
can be a real pain when so many other changes happen in the same files.
--
Cheers,
Stephen Rothwell
_______________________________________________
dri-devel mailing list
dri-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/dri-devel
