linux-next: manual merge of the drm-intel tree with the tree (original) (raw)
Stephen Rothwell sfr at canb.auug.org.au
Sun Feb 9 17:59:28 PST 2014
- Previous message: [PATCH] drm/radeon: fix VGT_GS_INSTANCE_CNT register
- Next message: [PATCH] drm/nouveau: support for platform devices
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
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 at 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
-------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 836 bytes Desc: not available URL: <http://lists.freedesktop.org/archives/dri-devel/attachments/20140210/ddfc4ab3/attachment.pgp>
- Previous message: [PATCH] drm/radeon: fix VGT_GS_INSTANCE_CNT register
- Next message: [PATCH] drm/nouveau: support for platform devices
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]