diff options
| author | Ville Syrjälä | 2013-06-04 12:49:01 +0200 |
|---|---|---|
| committer | Daniel Vetter | 2013-06-06 13:45:08 +0200 |
| commit | f440eb1354bc92855bbbff08d3ac4a93029c3097 (patch) | |
| tree | 421f8e3e6eeacb591d8a3dcefbd3354cf5609f2a | |
| parent | drm/i915: Always enable the cursor right after the primary plane (diff) | |
| download | kernel-qcow2-linux-f440eb1354bc92855bbbff08d3ac4a93029c3097.tar.gz kernel-qcow2-linux-f440eb1354bc92855bbbff08d3ac4a93029c3097.tar.xz kernel-qcow2-linux-f440eb1354bc92855bbbff08d3ac4a93029c3097.zip | |
drm/i915: Enable the overlay right after primary and cursor planes
Again follow the same sequence for all generations, because doing
otherwise just doesn't make sense.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@gmail.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 532a4fa67bb2..bf8fe819cfbd 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -3622,11 +3622,11 @@ static void valleyview_crtc_enable(struct drm_crtc *crtc) intel_enable_plane(dev_priv, plane, pipe); intel_crtc_update_cursor(crtc, true); - intel_update_fbc(dev); - /* Give the overlay scaler a chance to enable if it's on this pipe */ intel_crtc_dpms_overlay(intel_crtc, true); + intel_update_fbc(dev); + mutex_unlock(&dev_priv->dpio_lock); } @@ -3664,11 +3664,11 @@ static void i9xx_crtc_enable(struct drm_crtc *crtc) if (IS_G4X(dev)) g4x_fixup_plane(dev_priv, pipe); - intel_update_fbc(dev); - /* Give the overlay scaler a chance to enable if it's on this pipe */ intel_crtc_dpms_overlay(intel_crtc, true); + intel_update_fbc(dev); + for_each_encoder_on_crtc(dev, crtc, encoder) encoder->enable(encoder); } |