diff options
| author | Jesse Barnes | 2011-02-02 21:28:02 +0100 |
|---|---|---|
| committer | Chris Wilson | 2011-02-07 13:06:13 +0100 |
| commit | 19ec135838f032ad1aa0610b173ad78c16d53d47 (patch) | |
| tree | 8d13a2ae8e9f2d7feb6499a4954061853f8f7679 /drivers/gpu/drm/i915/intel_display.c | |
| parent | drm/i915: Set the transcoder port to none when disabling DP. (diff) | |
| download | kernel-qcow2-linux-19ec135838f032ad1aa0610b173ad78c16d53d47.tar.gz kernel-qcow2-linux-19ec135838f032ad1aa0610b173ad78c16d53d47.tar.xz kernel-qcow2-linux-19ec135838f032ad1aa0610b173ad78c16d53d47.zip | |
drm/i915: don't check plane vs pipe enable on ILK+
These bits have a different meaning on ILK+, where planes are hardwired
to pipes. Fixing this avoid some spurious assertion failures.
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
| -rw-r--r-- | 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 b5f7acf5a9db..b14d88d841ee 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -1225,6 +1225,10 @@ static void assert_planes_disabled(struct drm_i915_private *dev_priv, u32 val; int cur_pipe; + /* Planes are fixed to pipes on ILK+ */ + if (HAS_PCH_SPLIT(dev_priv->dev)) + return; + /* Need to check both planes against the pipe */ for (i = 0; i < 2; i++) { reg = DSPCNTR(i); |