From: Ville Syrj?l? <[email protected]>
Check the active and primary_disabled flags and set the
DISPLAY_PLANE_ENABLE bit accordingly in calc_plane() hook for the
primary plane.
Signed-off-by: Ville Syrj?l? <ville.syrjala at linux.intel.com>
---
drivers/gpu/drm/i915/intel_display.c | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_display.c
b/drivers/gpu/drm/i915/intel_display.c
index 957907c..9903456 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -2068,6 +2068,11 @@ static int i9xx_calc_plane(struct drm_crtc *crtc, struct
drm_framebuffer *fb,
regs->cntr &= ~DISPPLANE_TILED;
}
+ if (intel_crtc->active && !intel_crtc->primary_disabled)
+ regs->cntr |= DISPLAY_PLANE_ENABLE;
+ else
+ regs->cntr &= ~DISPLAY_PLANE_ENABLE;
+
linear_offset = y * fb->pitches[0] + x * cpp;
if (INTEL_INFO(dev)->gen >= 4) {
@@ -2175,6 +2180,11 @@ static int ironlake_calc_plane(struct drm_crtc *crtc,
/* must disable */
regs->cntr |= DISPPLANE_TRICKLE_FEED_DISABLE;
+ if (intel_crtc->active && !intel_crtc->primary_disabled)
+ regs->cntr |= DISPLAY_PLANE_ENABLE;
+ else
+ regs->cntr &= ~DISPLAY_PLANE_ENABLE;
+
linear_offset = y * fb->pitches[0] + x * cpp;
intel_crtc->dspaddr_offset =
intel_gen4_compute_offset_xtiled(&x, &y,
--
1.7.8.6
