Skip to content

Commit

Permalink
drm/i915: Call intel_enable_plane from i9xx_crtc_mode_set (again)
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Keith Packard committed Jun 21, 2011
1 parent 5629937 commit efc2924
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions drivers/gpu/drm/i915/intel_display.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down Expand Up @@ -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);

Expand Down

0 comments on commit efc2924

Please sign in to comment.