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: [REGRESSION] Re: i915 driver crashes on T540p if docking station attached Date: Tue, 4 Aug 2015 18:05:11 +0200 [thread overview] Message-ID: <20150804160511.GK24689@phenom.ffwll.local> (raw) In-Reply-To: <20150803162511.GA3563@thunk.org> On Mon, Aug 03, 2015 at 12:25:11PM -0400, Theodore Ts'o wrote: > On Mon, Aug 03, 2015 at 05:27:29PM +0200, Daniel Vetter wrote: > > > > Ok I updated fixes-stuff with just 2 patches which seem to be enough to > > fix it. Plus a patch to convert Linus' hack into something we can keep > > plus a drive-by WARNING fix in mst that got in the way for me. > > > > Seems to work here in getting rid of the Oops. If this tests out for you > > too I'll send a pull to Linus. > > I've just tried pulling in your updated fixes-stuff, and it avoids the > oops and allows external the monitor to work correctly. However, I'm > still seeing a large number of drm/i915 related warning messages and > other kernel kvetching. Involved a bit of head-scratching since I'm not too familiar with the watermark code and it gained a lot of complexity for atomic. But the below patch should be able to fix this WARNING (and it looks like it was a genuine one). If it works for you I'll bake it into a proper patch. Thanks, Daniel diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 30e0f54ba19d..ae07fd0c395c 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -15121,6 +15121,11 @@ void intel_modeset_setup_hw_state(struct drm_device *dev, intel_modeset_readout_hw_state(dev); + if (IS_GEN9(dev)) + skl_wm_get_hw_state(dev); + else if (HAS_PCH_SPLIT(dev)) + ilk_wm_get_hw_state(dev); + /* * Now that we have the config, copy it to each CRTC struct * Note that this could go away if we move to using crtc_config @@ -15162,11 +15167,6 @@ void intel_modeset_setup_hw_state(struct drm_device *dev, pll->on = false; } - if (IS_GEN9(dev)) - skl_wm_get_hw_state(dev); - else if (HAS_PCH_SPLIT(dev)) - ilk_wm_get_hw_state(dev); - if (force_restore) { i915_redisable_vga(dev); -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
WARNING: multiple messages have this Message-ID (diff)
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: [REGRESSION] Re: i915 driver crashes on T540p if docking station attached Date: Tue, 4 Aug 2015 18:05:11 +0200 [thread overview] Message-ID: <20150804160511.GK24689@phenom.ffwll.local> (raw) In-Reply-To: <20150803162511.GA3563@thunk.org> On Mon, Aug 03, 2015 at 12:25:11PM -0400, Theodore Ts'o wrote: > On Mon, Aug 03, 2015 at 05:27:29PM +0200, Daniel Vetter wrote: > > > > Ok I updated fixes-stuff with just 2 patches which seem to be enough to > > fix it. Plus a patch to convert Linus' hack into something we can keep > > plus a drive-by WARNING fix in mst that got in the way for me. > > > > Seems to work here in getting rid of the Oops. If this tests out for you > > too I'll send a pull to Linus. > > I've just tried pulling in your updated fixes-stuff, and it avoids the > oops and allows external the monitor to work correctly. However, I'm > still seeing a large number of drm/i915 related warning messages and > other kernel kvetching. Involved a bit of head-scratching since I'm not too familiar with the watermark code and it gained a lot of complexity for atomic. But the below patch should be able to fix this WARNING (and it looks like it was a genuine one). If it works for you I'll bake it into a proper patch. Thanks, Daniel diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 30e0f54ba19d..ae07fd0c395c 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -15121,6 +15121,11 @@ void intel_modeset_setup_hw_state(struct drm_device *dev, intel_modeset_readout_hw_state(dev); + if (IS_GEN9(dev)) + skl_wm_get_hw_state(dev); + else if (HAS_PCH_SPLIT(dev)) + ilk_wm_get_hw_state(dev); + /* * Now that we have the config, copy it to each CRTC struct * Note that this could go away if we move to using crtc_config @@ -15162,11 +15167,6 @@ void intel_modeset_setup_hw_state(struct drm_device *dev, pll->on = false; } - if (IS_GEN9(dev)) - skl_wm_get_hw_state(dev); - else if (HAS_PCH_SPLIT(dev)) - ilk_wm_get_hw_state(dev); - if (force_restore) { i915_redisable_vga(dev); -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2015-08-04 16:05 UTC|newest] Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-07-30 0:49 i915 driver crashes on T540p if docking station attached Theodore Ts'o 2015-07-30 0:49 ` Theodore Ts'o 2015-07-30 1:39 ` [REGRESSION] " Theodore Ts'o 2015-07-30 1:39 ` Theodore Ts'o 2015-07-30 1:47 ` Richard Harman 2015-07-30 5:18 ` Linus Torvalds 2015-07-30 5:18 ` Linus Torvalds 2015-07-30 11:16 ` Dave Airlie 2015-07-30 11:16 ` Dave Airlie 2015-07-30 14:40 ` Daniel Vetter 2015-07-30 14:40 ` Daniel Vetter 2015-07-30 15:32 ` Theodore Ts'o 2015-07-30 15:32 ` Theodore Ts'o 2015-07-30 15:54 ` [Intel-gfx] " Daniel Vetter 2015-07-30 15:54 ` Daniel Vetter 2015-07-30 15:57 ` [Intel-gfx] " Takashi Iwai 2015-07-30 15:57 ` Takashi Iwai 2015-07-30 18:14 ` [Intel-gfx] " Linus Torvalds 2015-07-30 18:14 ` Linus Torvalds 2015-07-30 15:50 ` Theodore Ts'o 2015-07-30 15:50 ` Theodore Ts'o 2015-07-30 15:59 ` Theodore Ts'o 2015-07-30 15:59 ` Theodore Ts'o 2015-07-30 16:00 ` Daniel Vetter 2015-07-30 16:00 ` Daniel Vetter 2015-08-03 15:27 ` Daniel Vetter 2015-08-03 15:27 ` Daniel Vetter 2015-08-03 16:25 ` Theodore Ts'o 2015-08-03 16:25 ` Theodore Ts'o 2015-08-03 17:24 ` Linus Torvalds 2015-08-03 17:24 ` Linus Torvalds 2015-08-03 18:49 ` Theodore Ts'o 2015-08-03 18:49 ` Theodore Ts'o 2015-08-03 22:05 ` Daniel Vetter 2015-08-03 22:05 ` Daniel Vetter 2015-08-04 1:17 ` Rafael J. Wysocki 2015-08-04 1:17 ` Rafael J. Wysocki 2015-08-04 16:05 ` Daniel Vetter [this message] 2015-08-04 16:05 ` Daniel Vetter
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20150804160511.GK24689@phenom.ffwll.local \ --to=daniel@ffwll.ch \ --cc=ander.conselvan.de.oliveira@intel.com \ --cc=daniel.vetter@intel.com \ --cc=dri-devel@lists.freedesktop.org \ --cc=intel-gfx@lists.freedesktop.org \ --cc=jani.nikula@linux.intel.com \ --cc=linux-kernel@vger.kernel.org \ --cc=torvalds@linux-foundation.org \ --cc=tytso@mit.edu \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.