From: Ben Widawsky <ben@bwidawsk.net>
To: intel-gfx@lists.freedesktop.org
Cc: Ben Widawsky <ben@bwidawsk.net>
Subject: [PATCH 07/10] drm/i915: Don't wait for PCH on reset
Date: Fri, 15 Mar 2013 11:17:52 -0700 [thread overview]
Message-ID: <1363371475-855-7-git-send-email-ben@bwidawsk.net> (raw)
In-Reply-To: <1363371475-855-1-git-send-email-ben@bwidawsk.net>
BIOS should be setting this, but in case it doesn't...
Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
---
drivers/gpu/drm/i915/i915_gem.c | 3 +++
drivers/gpu/drm/i915/i915_reg.h | 1 +
2 files changed, 4 insertions(+)
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 1417fc6..ee9c14c 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -3986,6 +3986,9 @@ i915_gem_init_hw(struct drm_device *dev)
if (IS_HASWELL(dev) && (I915_READ(0x120010) == 1))
I915_WRITE(0x9008, I915_READ(0x9008) | 0xf0000);
+ if (HAS_PCH_NOP(dev))
+ I915_WRITE(GEN7_MSG_CTL, 0);
+
i915_gem_l3_remap(dev);
i915_gem_init_swizzling(dev);
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index 4cf3ece..00b6a55 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -3481,6 +3481,7 @@
#define DISP_ARB_CTL 0x45000
#define DISP_TILE_SURFACE_SWIZZLING (1<<13)
#define DISP_FBC_WM_DIS (1<<15)
+#define GEN7_MSG_CTL 0x45010
/* GEN7 chicken */
#define GEN7_COMMON_SLICE_CHICKEN1 0x7010
--
1.8.1.5
next prev parent reply other threads:[~2013-03-15 18:16 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
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 02/10] drm/i915: Support PCH no display Ben Widawsky
2013-03-20 10:03 ` Ville Syrjälä
2013-03-15 18:17 ` [PATCH 03/10] drm/i915: PCH_NOP Ben Widawsky
2013-03-15 18:17 ` [PATCH 04/10] [v2] drm/i915: Don't touch South Display when PCH_NOP Ben Widawsky
2013-03-15 18:17 ` [PATCH 05/10] [v2] drm/i915: Don't initialize watermark stuff with PCH_NOP Ben Widawsky
2013-03-15 18:17 ` [PATCH 06/10] drm/i915: PCH_NOP suspend/resume Ben Widawsky
2013-03-15 18:17 ` Ben Widawsky [this message]
2013-03-15 18:17 ` [PATCH 08/10] drm/i915: Set PCH_NOP Ben Widawsky
2013-03-15 18:17 ` [PATCH 09/10] [v2] drm/i915: Introduce GEN7_FEATURES for device info Ben Widawsky
2013-03-19 23:23 ` Daniel Vetter
2013-03-15 18:17 ` [PATCH 10/10] [v2] drm/i915: Add a pipeless ivybridge configuration Ben Widawsky
2013-03-17 21:42 ` Daniel Vetter
2013-03-19 18:49 ` Ben Widawsky
2013-03-19 19:48 ` Jesse Barnes
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=1363371475-855-7-git-send-email-ben@bwidawsk.net \
--to=ben@bwidawsk.net \
--cc=intel-gfx@lists.freedesktop.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox