public inbox for intel-gfx@lists.freedesktop.org
 help / color / mirror / Atom feed
From: Paulo Zanoni <przanoni@gmail.com>
To: intel-gfx@lists.freedesktop.org
Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
Subject: [PATCH 8/3] drm/i915: WARN in case we're enabling the pipe and it's enabled
Date: Fri, 17 Jan 2014 13:51:13 -0200	[thread overview]
Message-ID: <1389973873-2005-5-git-send-email-przanoni@gmail.com> (raw)
In-Reply-To: <1389973873-2005-1-git-send-email-przanoni@gmail.com>

From: Paulo Zanoni <paulo.r.zanoni@intel.com>

... and QUIRK_PIPEA_FORCE is not present.

I initially thought that case was impossible and just added a WARN on
it, but then I was told this case is possible due to
QUIRK_PIPEA_FORCE. So let's add a WARN that serves two purposes:
  - tell us in case we have done something wrong;
  - document the only case where we expect this.

Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
---
 drivers/gpu/drm/i915/intel_display.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 9f356f9..e2df886 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -1791,8 +1791,11 @@ static void intel_enable_pipe(struct intel_crtc *crtc)
 
 	reg = PIPECONF(cpu_transcoder);
 	val = I915_READ(reg);
-	if (val & PIPECONF_ENABLE)
+	if (val & PIPECONF_ENABLE) {
+		WARN_ON(!(pipe == PIPE_A &&
+			  dev_priv->quirks & QUIRK_PIPEA_FORCE));
 		return;
+	}
 
 	I915_WRITE(reg, val | PIPECONF_ENABLE);
 	POSTING_READ(reg);
-- 
1.8.4.2

  parent reply	other threads:[~2014-01-17 15:51 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-12-19 21:12 [PATCH 1/3] drm/i915: add wait_for_vblank argument to intel_enable_pipe Paulo Zanoni
2013-12-19 21:12 ` [PATCH 2/3] drm/i915: don't wait for vblank after enabling pipe on HSW Paulo Zanoni
2014-01-15 18:26   ` Jesse Barnes
2013-12-19 21:12 ` [PATCH 3/3] drm/i915: remove the vblank_wait hack from HSW+ Paulo Zanoni
2013-12-19 21:17   ` Daniel Vetter
2013-12-20 14:32     ` Paulo Zanoni
2013-12-20 22:32       ` Lee, Chon Ming
2014-01-02 16:08         ` Paulo Zanoni
2014-01-15 18:28   ` Jesse Barnes
2014-02-12 11:13   ` Ville Syrjälä
2014-02-12 11:26     ` Ville Syrjälä
2014-02-12 17:02       ` Paulo Zanoni
2014-02-12 18:06         ` Ville Syrjälä
2014-02-12 18:35           ` Paulo Zanoni
2013-12-20  6:41 ` [PATCH 1/3] drm/i915: add wait_for_vblank argument to intel_enable_pipe Jani Nikula
2014-01-15 18:25 ` Jesse Barnes
2014-01-15 23:40   ` Daniel Vetter
2014-01-17 15:46     ` Paulo Zanoni
2014-01-17 15:51       ` [PATCH 4/3] drm/i915: pass intel_crtc as argument for intel_enable_pipe Paulo Zanoni
2014-01-17 15:51         ` [PATCH 5/3] drm/i915: remove pch_port argument form intel_enable_pipe Paulo Zanoni
2014-02-10 14:17           ` Damien Lespiau
2014-01-17 15:51         ` [PATCH 6/3] drm/i915: remove "dsi" " Paulo Zanoni
2014-02-10 14:21           ` Damien Lespiau
2014-02-10 17:19           ` Daniel Vetter
2014-01-17 15:51         ` [PATCH 7/3] drm/i915: remove wait_for_vblank " Paulo Zanoni
2014-02-10 14:33           ` Damien Lespiau
2014-02-10 14:59             ` Ville Syrjälä
2014-01-17 15:51         ` Paulo Zanoni [this message]
2014-02-10 14:34           ` [PATCH 8/3] drm/i915: WARN in case we're enabling the pipe and it's enabled Damien Lespiau
2014-02-10 14:17         ` [PATCH 4/3] drm/i915: pass intel_crtc as argument for intel_enable_pipe Damien Lespiau
2014-02-10 17:23           ` Daniel Vetter
2014-02-11 15:23             ` Paulo Zanoni
2014-02-11 15:44               ` Daniel Vetter
2014-02-11 17:09                 ` Paulo Zanoni
2014-02-11 17:20                   ` Paulo Zanoni
2014-02-11 21:54                     ` Daniel Vetter
2014-02-12 15:56                       ` Paulo Zanoni

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=1389973873-2005-5-git-send-email-przanoni@gmail.com \
    --to=przanoni@gmail.com \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=paulo.r.zanoni@intel.com \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox