diff options
| author | Keith Packard <keithp@keithp.com> | 2011-06-07 02:12:49 +0200 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2011-06-21 19:57:05 +0200 |
| commit | efc2924e733631a64c0afed8dbba2741d186998c (patch) | |
| tree | e3f73896fccfaa3c4790758efa08e67f73f173ee /drivers | |
| parent | Linux 3.0-rc4 (diff) | |
| download | linux-efc2924e733631a64c0afed8dbba2741d186998c.tar.xz linux-efc2924e733631a64c0afed8dbba2741d186998c.zip | |
drm/i915: Call intel_enable_plane from i9xx_crtc_mode_set (again)
This change got placed in the ironlake path instead of the 9xx path
during a recent code shuffle.
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 81a9059b6a94..aa43e7be6053 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -4687,6 +4687,7 @@ static int i9xx_crtc_mode_set(struct drm_crtc *crtc, I915_WRITE(DSPCNTR(plane), dspcntr); POSTING_READ(DSPCNTR(plane)); + intel_enable_plane(dev_priv, plane, pipe); ret = intel_pipe_set_base(crtc, x, y, old_fb); @@ -5217,8 +5218,6 @@ static int ironlake_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); |