Message ID | 20150730155457.GB16722@phenom.ffwll.local (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <dri-devel-bounces@lists.freedesktop.org> X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 0F03B9F39D for <patchwork-dri-devel@patchwork.kernel.org>; Thu, 30 Jul 2015 15:55:08 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0A029205EF for <patchwork-dri-devel@patchwork.kernel.org>; Thu, 30 Jul 2015 15:55:07 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id A92DE205DD for <patchwork-dri-devel@patchwork.kernel.org>; Thu, 30 Jul 2015 15:55:05 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E35216ECCC; Thu, 30 Jul 2015 08:55:03 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wi0-f179.google.com (mail-wi0-f179.google.com [209.85.212.179]) by gabe.freedesktop.org (Postfix) with ESMTPS id A58736ECD0 for <dri-devel@lists.freedesktop.org>; Thu, 30 Jul 2015 08:55:02 -0700 (PDT) Received: by wibxm9 with SMTP id xm9so250822707wib.0 for <dri-devel@lists.freedesktop.org>; Thu, 30 Jul 2015 08:55:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=sender:date:from:to:subject:message-id:mail-followup-to:references :mime-version:content-type:content-disposition:in-reply-to :user-agent; bh=N9ZqRoQal+CkXIuKd9RAo/9mpLDWADdYqjzeOFQHX7c=; b=VzAXW9xBB6NgtKP6VDf5BUo657YFwLDUf+VYie8y9NL18BihNDLI87g/slp1LPTL1N X/xJ3kaq81UBDpCq7IjnIYwl0PXvdZYP53I9SRZNAtlTq5OKiz60xN2MZIfMC6v+nKvi JmyEsQL8kVkRYwOTXzJtAAP8L47Bk9TVEeCuk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:date:from:to:subject:message-id :mail-followup-to:references:mime-version:content-type :content-disposition:in-reply-to:user-agent; bh=N9ZqRoQal+CkXIuKd9RAo/9mpLDWADdYqjzeOFQHX7c=; b=h9Kwz8DmVRrtNDD59VFrRYx1FzGfw+8dHWLhFk40FLKTzMvoSkLBfOsoiqAy7mclod P4D60uHYY4/EgiVp+vH9J16tsEP+ogTnbaugXKNQ5fkbV9D8CPkBa/gFz6k13T7tQZ/M 5jegtT0i4T8xocQZUzo/DrUo7siedYjsdk1c/FtHJgCTvGTn0GpmU/l8NAC+MlSMerYH LI/lsudjrAD9Hp5ELhXXeMuUqTaScsLKSy/ed6wlRYxi8SX1Le4v8wdkSXpci48+Y5Md 0A0B06+ad3Z88bx13zgA3Mq2VN0GgeI09VFCc6VlWSTq7qkqlMBmkk4qsDxJnqTi24D1 G4vA== X-Gm-Message-State: ALoCoQkXxVDYrv72JGH4QvvGWRBQQYyXvLgjptclvIe4PBMUQP8cJV474X1K7h+YnjxXvTqiLGfJ X-Received: by 10.180.105.36 with SMTP id gj4mr7680977wib.64.1438271701034; Thu, 30 Jul 2015 08:55:01 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:56b5:0:22cf:30ff:fe4c:37d6]) by smtp.gmail.com with ESMTPSA id d17sm2499027wjs.32.2015.07.30.08.54.59 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 30 Jul 2015 08:55:00 -0700 (PDT) X-Google-Original-Sender: daniel.vetter@ffwll.ch Date: Thu, 30 Jul 2015 17:54:57 +0200 From: Daniel Vetter <daniel@ffwll.ch> To: Theodore Ts'o <tytso@mit.edu>, Linus Torvalds <torvalds@linux-foundation.org>, intel-gfx <intel-gfx@lists.freedesktop.org>, DRI <dri-devel@lists.freedesktop.org>, Daniel Vetter <daniel.vetter@intel.com>, Mani Nikula <jani.nikula@linux.intel.com>, Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org> Subject: Re: [Intel-gfx] [REGRESSION] Re: i915 driver crashes on T540p if docking station attached Message-ID: <20150730155457.GB16722@phenom.ffwll.local> Mail-Followup-To: Theodore Ts'o <tytso@mit.edu>, Linus Torvalds <torvalds@linux-foundation.org>, intel-gfx <intel-gfx@lists.freedesktop.org>, DRI <dri-devel@lists.freedesktop.org>, Daniel Vetter <daniel.vetter@intel.com>, Mani Nikula <jani.nikula@linux.intel.com>, Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org> References: <20150730004937.GA3133@thunk.org> <20150730013912.GA4068@thunk.org> <CA+55aFzsVMMpSeF3fG0FJ4Lhj1Tb6MY9LMfnmj7u1JyzM9aQuA@mail.gmail.com> <20150730144002.GY16722@phenom.ffwll.local> <20150730153228.GA15113@thunk.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20150730153228.GA15113@thunk.org> Received: by 10.182.43.99 with HTTP; Thu, 30 Jul 2015 08:47:43 -0700 (PDT) X-Originating-IP: [2a02:168:56b5:0:22cf:30ff:fe4c:37d6] User-Agent: Mutt/1.5.23 (2014-03-12) X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development <dri-devel.lists.freedesktop.org> List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/dri-devel>, <mailto:dri-devel-request@lists.freedesktop.org?subject=unsubscribe> List-Archive: <http://lists.freedesktop.org/archives/dri-devel> List-Post: <mailto:dri-devel@lists.freedesktop.org> List-Help: <mailto:dri-devel-request@lists.freedesktop.org?subject=help> List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/dri-devel>, <mailto:dri-devel-request@lists.freedesktop.org?subject=subscribe> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" <dri-devel-bounces@lists.freedesktop.org> X-Spam-Status: No, score=-5.5 required=5.0 tests=BAYES_00,DKIM_SIGNED, MSGID_FROM_MTA_HEADER, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP |
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 884b4f9b81c4..c0677c83a0e9 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -775,6 +775,9 @@ static int i915_drm_resume(struct drm_device *dev) /* Config may have changed between suspend and resume */ drm_helper_hpd_irq_event(dev); + dev_priv->short_hpd_port_mask = ~0; + queue_work(dev_priv->dp_wq, &dev_priv->dig_port_work); + intel_opregion_init(dev); intel_fbdev_set_suspend(dev, FBINFO_STATE_RUNNING, false);