Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753260AbaBGOGB (ORCPT ); Fri, 7 Feb 2014 09:06:01 -0500 Received: from mail-ig0-f182.google.com ([209.85.213.182]:50475 "EHLO mail-ig0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752084AbaBGOGA (ORCPT ); Fri, 7 Feb 2014 09:06:00 -0500 MIME-Version: 1.0 X-Originating-IP: [84.73.67.144] In-Reply-To: References: <87a9e318m6.fsf@intel.com> Date: Fri, 7 Feb 2014 15:05:59 +0100 Message-ID: Subject: Re: [git pull] drm next tree From: Daniel Vetter To: Jiri Kosina Cc: Jani Nikula , Dave Airlie , Linus Torvalds , Linux Kernel Mailing List , DRI mailing list Content-Type: text/plain; charset=ISO-8859-1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Feb 7, 2014 at 2:40 PM, Jiri Kosina wrote: > 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. Sorry for missing your report here. Before we disable this again for gen4 I want to make sure that it's the same irq misrouting issue which was already the cause for the gmbus irq mess. Can you please boot with pci=nomsi (so that i915 uses irq16)? If that's confirmed then I think we should add the same comment we've added in intel_i2c.c to this code so that no one dares to wake this dragon again. I'll do that when I commit the fix. Thanks, Daniel -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch -- 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/