[git pull] drm next tree

[Jiri Kosina]

On Fri, 7 Feb 2014, Jani Nikula wrote:

> >> >   git://people.freedesktop.org/~airlied/linux drm-next
> >> [ ... snip ... ]
> >> > Daniel Vetter (59):
> >> [ ... snip ... ]
> >> >       drm/i915: dp aux irq support for g4x/vlv
> >> 
> >> This commit causes all kinds of havoc on my ThinkPad x200s. It results in
> > [ ... snip ... ]
> >
> > Not having received any response, I suggest the following for 3.14
> 
> Daniel, it's your commit this bisects to...
> 
> If we end up having to revert, I'd just touch the has_aux_irq part, for
> example:
> 
> diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
> index 5ede4e8..464c047 100644
> --- a/drivers/gpu/drm/i915/intel_dp.c
> +++ b/drivers/gpu/drm/i915/intel_dp.c
> @@ -404,7 +404,7 @@ intel_dp_aux_ch(struct intel_dp *intel_dp,
>  	int i, ret, recv_bytes;
>  	uint32_t status;
>  	int try, precharge, clock = 0;
> -	bool has_aux_irq = true;
> +	bool has_aux_irq = INTEL_INFO(dev)->gen >= 5;
>  	uint32_t timeout;
> 
>  	/* dp aux is extremely sensitive to irq latency, hence request the

That, obviously, works for my system as well. Feel free to add

	Reported-and-tested-by: Jiri Kosina <jkosina at suse.cz>

if you are going with this instead of the revert.

-- 
Jiri Kosina
SUSE Labs