Messages in this thread | | | Date | Mon, 10 Feb 2014 12:59:28 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the drm-intel tree with the tree |
| |
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 a send") from the drm-intel tree.
I fixed it up (see below) and can carry the fix as necessary (no action is required).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/gpu/drm/i915/intel_dp.c index 2f517b85b3f4,0ef269053751..000000000000 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c @@@ -403,9 -458,8 +458,8 @@@ intel_dp_aux_ch(struct intel_dp *intel_ uint32_t aux_clock_divider; int i, ret, recv_bytes; uint32_t status; - int try, precharge, clock = 0; + int try, clock = 0; - bool has_aux_irq = true; + bool has_aux_irq = HAS_AUX_IRQ(dev); - uint32_t timeout; /* dp aux is extremely sensitive to irq latency, hence request the * lowest possible wakeup latency and so prevent the cpu from going into [unhandled content-type:application/pgp-signature] | |