Re: [Intel-gfx] [PATCH] drm/i915: fixup assert_pipe to take the pipe A quirk into account
On Tue, Jan 24, 2012 at 10:24:21AM -0800, Jesse Barnes wrote: > On Mon, 23 Jan 2012 20:40:27 +0100 > Daniel Vetter wrote: > > > On Sat, Jan 21, 2012 at 08:36:38PM -0800, Keith Packard wrote: > > > On Sun, 22 Jan 2012 01:36:48 +0100, Daniel Vetter > > > wrote: > > > > This was completely spamming dmesg on my i855gm. > > > > > > This comes from intel_disable_pll, which wants to turn the pll off, but > > > if the pipe is still active, it won't be able to. This seems bad to me. > > > > I honestly can't reconcile your comment with the code&patch. Afaics > > - the pll disable code checks for the pipe a quirk and does an early exit > > before mucking around with the hw and calling assert_pipe. > > - assert_pipe only does a WARN and the patch only changes whether we hit > > that WARN. All reg reads/writes should be unchanged. > > - the backtrace I'm seeing goes through crtc_disable. > > Ah ok so it's coming from the new pipe disabled check Chris added. > Patch looks fine... and reminds me to be puzzled about the pipe a force > quirk on 855. :) Ok, I've queued this for next with an improved commit msg stating that this was only shortly introduced in -next (plus citing the offending commit). Thanks, Daniel -- Daniel Vetter Mail: dan...@ffwll.ch Mobile: +41 (0)79 365 57 48 ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH] drm/i915: fixup assert_pipe to take the pipe A quirk into account
On Mon, 23 Jan 2012 20:40:27 +0100 Daniel Vetter wrote: > On Sat, Jan 21, 2012 at 08:36:38PM -0800, Keith Packard wrote: > > On Sun, 22 Jan 2012 01:36:48 +0100, Daniel Vetter > > wrote: > > > This was completely spamming dmesg on my i855gm. > > > > This comes from intel_disable_pll, which wants to turn the pll off, but > > if the pipe is still active, it won't be able to. This seems bad to me. > > I honestly can't reconcile your comment with the code&patch. Afaics > - the pll disable code checks for the pipe a quirk and does an early exit > before mucking around with the hw and calling assert_pipe. > - assert_pipe only does a WARN and the patch only changes whether we hit > that WARN. All reg reads/writes should be unchanged. > - the backtrace I'm seeing goes through crtc_disable. Ah ok so it's coming from the new pipe disabled check Chris added. Patch looks fine... and reminds me to be puzzled about the pipe a force quirk on 855. :) -- Jesse Barnes, Intel Open Source Technology Center signature.asc Description: PGP signature ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH] drm/i915: fixup assert_pipe to take the pipe A quirk into account
On Sat, Jan 21, 2012 at 08:36:38PM -0800, Keith Packard wrote: > On Sun, 22 Jan 2012 01:36:48 +0100, Daniel Vetter > wrote: > > This was completely spamming dmesg on my i855gm. > > This comes from intel_disable_pll, which wants to turn the pll off, but > if the pipe is still active, it won't be able to. This seems bad to me. I honestly can't reconcile your comment with the code&patch. Afaics - the pll disable code checks for the pipe a quirk and does an early exit before mucking around with the hw and calling assert_pipe. - assert_pipe only does a WARN and the patch only changes whether we hit that WARN. All reg reads/writes should be unchanged. - the backtrace I'm seeing goes through crtc_disable. Yours, Daniel -- Daniel Vetter Mail: dan...@ffwll.ch Mobile: +41 (0)79 365 57 48 ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH] drm/i915: fixup assert_pipe to take the pipe A quirk into account
On Sun, 22 Jan 2012 01:36:48 +0100, Daniel Vetter wrote: > This was completely spamming dmesg on my i855gm. This comes from intel_disable_pll, which wants to turn the pll off, but if the pipe is still active, it won't be able to. This seems bad to me. -- keith.pack...@intel.com pgpcpe8pKoTIq.pgp Description: PGP signature ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/intel-gfx
[Intel-gfx] [PATCH] drm/i915: fixup assert_pipe to take the pipe A quirk into account
This was completely spamming dmesg on my i855gm. Signed-Off-by: Daniel Vetter --- drivers/gpu/drm/i915/intel_display.c |4 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 5ba19df..1709e67 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -936,6 +936,10 @@ void assert_pipe(struct drm_i915_private *dev_priv, u32 val; bool cur_state; + /* if we need the pipe A quirk it must be always on */ + if (pipe == PIPE_A && dev_priv->quirks & QUIRK_PIPEA_FORCE) + state = true; + reg = PIPECONF(pipe); val = I915_READ(reg); cur_state = !!(val & PIPECONF_ENABLE); -- 1.7.8.3 ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/intel-gfx
