From: Ben Widawsky <ben@bwidawsk.net>
To: intel-gfx@lists.freedesktop.org
Cc: Ben Widawsky <ben@bwidawsk.net>,
"Mcallister, Jeffrey" <jeffrey.mcallister@intel.com>
Subject: [PATCH 05/10] [v2] drm/i915: Don't initialize watermark stuff with PCH_NOP
Date: Wed, 13 Mar 2013 14:06:12 -0700 [thread overview]
Message-ID: <1363208772-24714-1-git-send-email-ben@bwidawsk.net> (raw)
In-Reply-To: <1363198868-21787-6-git-send-email-ben@bwidawsk.net>
v2: Move check to the top (Chris)
Add BUG_ON for !ivybridge, since it's all we support for now (Ben)
Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
---
drivers/gpu/drm/i915/intel_pm.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index 52203fd..8e7908b 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -4153,7 +4153,12 @@ void intel_init_pm(struct drm_device *dev)
i915_ironlake_get_mem_freq(dev);
/* For FIFO watermark updates */
- if (HAS_PCH_SPLIT(dev)) {
+ if (HAS_PCH_NOP(dev)) {
+ BUG_ON(!IS_IVYBRIDGE(dev));
+ dev_priv->display.init_clock_gating = ivybridge_init_clock_gating;
+ dev_priv->display.update_wm = NULL;
+ dev_priv->display.update_sprite_wm = NULL;
+ } else if (HAS_PCH_SPLIT(dev)) {
if (IS_GEN5(dev)) {
if (I915_READ(MLTR_ILK) & ILK_SRLT_MASK)
dev_priv->display.update_wm = ironlake_update_wm;
@@ -4175,7 +4180,7 @@ void intel_init_pm(struct drm_device *dev)
dev_priv->display.init_clock_gating = gen6_init_clock_gating;
} else if (IS_IVYBRIDGE(dev)) {
/* FIXME: detect B0+ stepping and use auto training */
- if (SNB_READ_WM0_LATENCY()) {
+ if (SNB_READ_WM0_LATENCY() && !HAS_PCH_NOP(dev)) {
dev_priv->display.update_wm = ivybridge_update_wm;
dev_priv->display.update_sprite_wm = sandybridge_update_sprite_wm;
} else {
--
1.8.1.5
next prev parent reply other threads:[~2013-03-13 21:04 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-13 18:20 [PATCH 0/9] displayless PCH Ben Widawsky
2013-03-13 18:21 ` [PATCH 1/9] drm/i915: Move num_pipes to intel info Ben Widawsky
2013-03-13 18:31 ` Chris Wilson
2013-03-13 18:36 ` Ben Widawsky
2013-03-13 21:05 ` [PATCH 01/10] [v2] " Ben Widawsky
2013-03-19 19:25 ` [PATCH 1/9] " Jesse Barnes
2013-03-19 23:06 ` Daniel Vetter
2013-03-13 18:21 ` [PATCH 2/9] drm/i915: Support PCH no display Ben Widawsky
2013-03-17 21:13 ` Daniel Vetter
2013-03-13 18:21 ` [PATCH 3/9] drm/i915: PCH_NOP Ben Widawsky
2013-03-17 21:05 ` Daniel Vetter
2013-03-17 21:14 ` Daniel Vetter
2013-03-13 18:21 ` [PATCH 4/9] drm/i915: Don't touch South display when PCH_NOP Ben Widawsky
2013-03-14 11:44 ` Jani Nikula
2013-03-14 15:55 ` [PATCH 04/10] [v2] drm/i915: Don't touch South Display " Ben Widawsky
2013-03-17 21:21 ` Daniel Vetter
2013-03-18 23:05 ` Ben Widawsky
2013-03-13 18:21 ` [PATCH 5/9] drm/i915: Don't initialize watermark stuff with PCH_NOP Ben Widawsky
2013-03-13 18:47 ` Chris Wilson
2013-03-13 21:06 ` Ben Widawsky [this message]
2013-03-17 21:02 ` [PATCH 05/10] [v2] " Daniel Vetter
2013-03-19 0:45 ` Ben Widawsky
2013-03-13 18:21 ` [PATCH 6/9] drm/i915: PCH_NOP suspend/resume Ben Widawsky
2013-03-17 21:28 ` Daniel Vetter
2013-03-19 0:51 ` Ben Widawsky
2013-03-19 7:51 ` Daniel Vetter
2013-03-19 17:53 ` Ben Widawsky
2013-03-13 18:21 ` [PATCH 7/9] drm/i915: Don't wait for PCH on reset Ben Widawsky
2013-03-19 19:36 ` Jesse Barnes
2013-03-20 16:43 ` [PATCH] " Ben Widawsky
2013-03-20 16:58 ` Jesse Barnes
2013-03-13 18:21 ` [PATCH 8/9] drm/i915: Set PCH_NOP Ben Widawsky
2013-03-17 21:36 ` Daniel Vetter
2013-03-13 18:21 ` [PATCH 9/9] drm/i915: Add a pipeless ivybridge configuration Ben Widawsky
2013-03-13 18:52 ` Chris Wilson
2013-03-13 21:08 ` [PATCH 09/10] drm/i915: Introduce IVB_FEATURES for device definition Ben Widawsky
2013-03-13 21:08 ` [PATCH 10/10] [v2] drm/i915: Add a pipeless ivybridge configuration Ben Widawsky
2013-03-15 4:05 ` [PATCH 09/10] drm/i915: Introduce IVB_FEATURES for device definition Ben Widawsky
2013-03-13 18:58 ` [PATCH 0/9] displayless PCH Chris Wilson
2013-03-13 19:05 ` Ben Widawsky
2013-03-15 18:17 [PATCH 01/10] [v2] drm/i915: Move num_pipes to intel info Ben Widawsky
2013-03-15 18:17 ` [PATCH 05/10] [v2] drm/i915: Don't initialize watermark stuff with PCH_NOP Ben Widawsky
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=1363208772-24714-1-git-send-email-ben@bwidawsk.net \
--to=ben@bwidawsk.net \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jeffrey.mcallister@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 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.