diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2011-04-19 21:14:14 +0100 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2011-05-09 09:13:20 -0700 |
| commit | 49183b2818de6899383bb82bc032f9344d6791ff (patch) | |
| tree | 772319c3c38dccb88e534665bb3a0f1e01c837d6 | |
| parent | 31acbcc408f412d1ba73765b846c38642be553c3 (diff) | |
| download | linux-49183b2818de6899383bb82bc032f9344d6791ff.tar.gz linux-49183b2818de6899383bb82bc032f9344d6791ff.tar.bz2 linux-49183b2818de6899383bb82bc032f9344d6791ff.zip | |
drm/i915: Only enable the plane after setting the fb base (pre-ILK)
When enabling the plane, it is helpful to have already pointed that
plane to valid memory or else we may incur the wrath of a PGTBL_ER.
This code preserved the behaviour from the bad old days for unknown
reasons...
Found by assert_fb_bound_for_plane().
References: https://bugs.freedesktop.org/show_bug.cgi?id=36246
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index aab06cfaf70f..967451e90dee 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -5154,8 +5154,6 @@ static int intel_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); |