linux-next: manual merge of the drm-intel tree with the tree

2014-09-03 Thread Mark Brown
On Wed, Sep 03, 2014 at 02:31:46PM +0100, Mark Brown wrote: > @@ -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_pr

linux-next: manual merge of the drm-intel tree with the tree

2014-09-03 Thread Mark Brown
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 requir

linux-next: manual merge of the drm-intel tree with the tree

2014-04-15 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the drm-intel tree got a conflict in drivers/gpu/drm/i915/i915_gem_context.c between commit 691e6415c891 ("drm/i915: Always use kref tracking for all contexts") from the drm-intel-fixes tree and commit ad2ac08bf34b ("drm/i915: Make contexts non-snooped on non-LL

linux-next: manual merge of the drm-intel tree with the tree

2014-03-09 Thread Mark Brown
Hi all, Today's linux-next merge of the drm-intel tree got a conflict in between commit 27d50c82714f6 ("ACPI / i915: Fix incorrect inclusions via ") from tree and commit 2fae6a860ca9 ("drm/i915: Go OCD on the Makefile") from the drm-intel tree. I fixed it up (see below) and can carry the fi

linux-next: manual merge of the drm-intel tree with the tree

2014-02-10 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the drm-intel tree got a conflict in drivers/gpu/drm/i915/intel_dp.c between commit 4e6b788c3f23 ("drm/i915: Disable dp aux irq on g4x") from the drm-intel-fixes tree and commit 5ed12a19078b ("drm/i915: Factor out a function returning the AUX_CTL value to start