All of lore.kernel.org
 help / color / mirror / Atom feed
From: Keith Packard <keithp@keithp.com>
To: Melchior FRANZ <melchior.franz@gmail.com>, linux-kernel@vger.kernel.org
Cc: Nick Bowler <nbowler@elliptictech.com>,
	dri-devel@lists.freedesktop.org,
	Chris Wilson <chris@chris-wilson.co.uk>,
	Linus Torvalds <torvalds@linux-foundation.org>
Subject: Re: Regression: Borked display on second output with Intel G45 in 3.0-rc2
Date: Mon, 06 Jun 2011 13:21:53 -0700	[thread overview]
Message-ID: <yunaadu1zj2.fsf@aiko.keithp.com> (raw)
In-Reply-To: <201106061920.07144@rk-nord.at>

[-- Attachment #1: Type: text/plain, Size: 1446 bytes --]

On Mon, 6 Jun 2011 19:20:06 +0200, Melchior FRANZ <melchior.franz@gmail.com> wrote:

> That's apparently the bug that I've submitted a patch for on 2011/5/31:
> https://lkml.org/lkml/2011/5/31/393
> I assume/hope it's still in someone's queue.

Yeah, we "shouldn't" need to call intel_enable_plane from
i9xx_crtc_mode_set as it is called immediately afterwards from
i9xx_crtc_enable.

In any case, there's a bogus call in ironlake_crtc_mode_set which
clearly belongs in i9xx_crtc_mode_set:

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 81a9059..aa43e7b 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -4687,6 +4687,7 @@ static int i9xx_crtc_mode_set(struct drm_crtc *crtc,
 
 	I915_WRITE(DSPCNTR(plane), dspcntr);
 	POSTING_READ(DSPCNTR(plane));
+	intel_enable_plane(dev_priv, plane, pipe);
 
 	ret = intel_pipe_set_base(crtc, x, y, old_fb);
 
@@ -5217,8 +5218,6 @@ static int ironlake_crtc_mode_set(struct drm_crtc *crtc,
 
 	I915_WRITE(DSPCNTR(plane), dspcntr);
 	POSTING_READ(DSPCNTR(plane));
-	if (!HAS_PCH_SPLIT(dev))
-		intel_enable_plane(dev_priv, plane, pipe);
 
 	ret = intel_pipe_set_base(crtc, x, y, old_fb);
 
We need to figure out why this call (in i9xx_crtc_mode_set) is required,
but that will require finding hardware that reproduces the bug and
fixing it there.

-- 
keith.packard@intel.com

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]

WARNING: multiple messages have this Message-ID (diff)
From: Keith Packard <keithp@keithp.com>
To: Melchior FRANZ <melchior.franz@gmail.com>, linux-kernel@vger.kernel.org
Cc: Nick Bowler <nbowler@elliptictech.com>,
	Linus Torvalds <torvalds@linux-foundation.org>,
	dri-devel@lists.freedesktop.org
Subject: Re: Regression: Borked display on second output with Intel G45 in 3.0-rc2
Date: Mon, 06 Jun 2011 13:21:53 -0700	[thread overview]
Message-ID: <yunaadu1zj2.fsf@aiko.keithp.com> (raw)
In-Reply-To: <201106061920.07144@rk-nord.at>


[-- Attachment #1.1: Type: text/plain, Size: 1446 bytes --]

On Mon, 6 Jun 2011 19:20:06 +0200, Melchior FRANZ <melchior.franz@gmail.com> wrote:

> That's apparently the bug that I've submitted a patch for on 2011/5/31:
> https://lkml.org/lkml/2011/5/31/393
> I assume/hope it's still in someone's queue.

Yeah, we "shouldn't" need to call intel_enable_plane from
i9xx_crtc_mode_set as it is called immediately afterwards from
i9xx_crtc_enable.

In any case, there's a bogus call in ironlake_crtc_mode_set which
clearly belongs in i9xx_crtc_mode_set:

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 81a9059..aa43e7b 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -4687,6 +4687,7 @@ static int i9xx_crtc_mode_set(struct drm_crtc *crtc,
 
 	I915_WRITE(DSPCNTR(plane), dspcntr);
 	POSTING_READ(DSPCNTR(plane));
+	intel_enable_plane(dev_priv, plane, pipe);
 
 	ret = intel_pipe_set_base(crtc, x, y, old_fb);
 
@@ -5217,8 +5218,6 @@ static int ironlake_crtc_mode_set(struct drm_crtc *crtc,
 
 	I915_WRITE(DSPCNTR(plane), dspcntr);
 	POSTING_READ(DSPCNTR(plane));
-	if (!HAS_PCH_SPLIT(dev))
-		intel_enable_plane(dev_priv, plane, pipe);
 
 	ret = intel_pipe_set_base(crtc, x, y, old_fb);
 
We need to figure out why this call (in i9xx_crtc_mode_set) is required,
but that will require finding hardware that reproduces the bug and
fixing it there.

-- 
keith.packard@intel.com

[-- Attachment #1.2: Type: application/pgp-signature, Size: 189 bytes --]

[-- Attachment #2: Type: text/plain, Size: 159 bytes --]

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

  parent reply	other threads:[~2011-06-06 20:22 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-06-06 17:12 Regression: Borked display on second output with Intel G45 in 3.0-rc2 Nick Bowler
2011-06-06 17:20 ` Melchior FRANZ
2011-06-06 18:00   ` Nick Bowler
2011-06-06 20:21   ` Keith Packard [this message]
2011-06-06 20:21     ` Keith Packard

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=yunaadu1zj2.fsf@aiko.keithp.com \
    --to=keithp@keithp.com \
    --cc=chris@chris-wilson.co.uk \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=melchior.franz@gmail.com \
    --cc=nbowler@elliptictech.com \
    --cc=torvalds@linux-foundation.org \
    /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: link
Be 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.