Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753031AbaBGNky (ORCPT ); Fri, 7 Feb 2014 08:40:54 -0500 Received: from cantor2.suse.de ([195.135.220.15]:38775 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752180AbaBGNkx (ORCPT ); Fri, 7 Feb 2014 08:40:53 -0500 Date: Fri, 7 Feb 2014 14:40:48 +0100 (CET) From: Jiri Kosina To: Jani Nikula cc: Dave Airlie , Daniel Vetter , Linus Torvalds , linux-kernel@vger.kernel.org, DRI mailing list Subject: Re: [git pull] drm next tree In-Reply-To: <87a9e318m6.fsf@intel.com> Message-ID: References: <87a9e318m6.fsf@intel.com> User-Agent: Alpine 2.00 (LNX 1167 2008-08-23) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 if you are going with this instead of the revert. -- Jiri Kosina SUSE Labs -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/