Hi all,
Today's linux-next merge of the drm-intel tree got a conflict which I'm not
really sure of and commit b47d1189da119e ("drm/i915: Use dev_priv as first
argument of for_each_pipe()") from the drm-intel tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
@@ -3923,7 +3942,9 @@ static void valleyview_irq_uninstall(struct drm_device
*dev)
I915_WRITE(VLV_MASTER_IER, 0);
- for_each_pipe(pipe)
+ intel_hpd_irq_uninstall(dev_priv);
+
+ for_each_pipe(dev_priv, pipe)
I915_WRITE(PIPESTAT(pipe), 0xffff);
I915_WRITE(HWSTAM, 0xffffffff);
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL:
<http://lists.freedesktop.org/archives/dri-devel/attachments/20140903/5a887253/attachment.sig>
